1
0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2025-07-30 10:53:44 +02:00

Compare commits

..

3 Commits

Author SHA1 Message Date
Harald Barth
dfba6c6fc1 version tag 2023-06-23 13:55:34 +02:00
Harald Barth
f3cb263aaa convert mac addr hex chars to lower case to be compatible with AT software 2023-06-23 13:54:25 +02:00
pmantoine
ec6e730559 ESP32 mDNS registration for throttle autodiscovery 2023-06-23 18:08:05 +08:00
4 changed files with 22 additions and 20 deletions

View File

@@ -1 +1 @@
#define GITHUB_SHA "devel-202306222129Z"
#define GITHUB_SHA "devel-202306231154Z"

View File

@@ -89,27 +89,10 @@
// EX 8874 based shield connected to a 3.3V system (like ESP32) and 12bit (4096) ADC
// numbers are GPIO numbers. comments are UNO form factor shield pin numbers
#define EX8874_SHIELD F("EX-8874"),\
#define EX8874_SHIELD F("EX8874"),\
new MotorDriver(25/* 3*/, 19/*12*/, UNUSED_PIN, 13/*9*/, 35/*A2*/, 1.27, 5000, 36 /*A4*/), \
new MotorDriver(23/*11*/, 18/*13*/, UNUSED_PIN, 12/*8*/, 34/*A3*/, 1.27, 5000, 39 /*A5*/)
// EX-CSB1 motor shield definition - note it is different from ESPduino32 pins!
#define EX_CSB1 F("EX-CSB1"),\
new MotorDriver(25, 0, UNUSED_PIN, -14, 34, 1.27, 5000, 19), \
new MotorDriver(27, 15, UNUSED_PIN, -2, 35, 1.27, 5000, 23)
// EX-CSB1 with EX-8874 stacked on top for 4 outputs
#define EX_CSB1_STACK F("EX-CSB1 Stacked"),\
new MotorDriver(25, 0, UNUSED_PIN, -14, 34, 1.27, 5000, 19), \
new MotorDriver(27, 15, UNUSED_PIN, -2, 35, 1.27, 5000, 23), \
new MotorDriver(26, 5, UNUSED_PIN, 13, 36, 1.27, 5000, 18), \
new MotorDriver(16, 4, UNUSED_PIN, 12, 39, 1.27, 5000, 17)
// BOOSTER PIN INPUT ON ESP32
// On ESP32 you have the possibility to define a pin as booster input
// Arduino pin D2 is GPIO 26 on ESPDuino32, and GPIO 32 on EX-CSB1
#define BOOSTER_INPUT 32
#else
// STANDARD shield on any Arduino Uno or Mega compatible with the original specification.
#define STANDARD_MOTOR_SHIELD F("STANDARD_MOTOR_SHIELD"), \

View File

@@ -20,6 +20,7 @@
#if defined(ARDUINO_ARCH_ESP32)
#include <vector>
#include "defines.h"
#include "ESPmDNS.h"
#include <WiFi.h>
#include "esp_wifi.h"
#include "WifiESP32.h"
@@ -105,6 +106,12 @@ void wifiLoop(void *){
}
#endif
char asciitolower(char in) {
if (in <= 'Z' && in >= 'A')
return in - ('Z' - 'z');
return in;
}
bool WifiESP::setup(const char *SSid,
const char *password,
const char *hostname,
@@ -182,6 +189,8 @@ bool WifiESP::setup(const char *SSid,
strMac.remove(0,9);
strMac.replace(":","");
strMac.replace(":","");
// convert mac addr hex chars to lower case to be compatible with AT software
std::transform(strMac.begin(), strMac.end(), strMac.begin(), asciitolower);
strSSID.concat(strMac);
strPass.concat(strMac);
@@ -209,6 +218,15 @@ bool WifiESP::setup(const char *SSid,
// no idea to go on
return false;
}
// Now Wifi is up, register the mDNS service
if(!MDNS.begin(hostname)) {
DIAG(F("Wifi setup failed to start mDNS"));
}
if(!MDNS.addService("withrottle", "tcp", 2560)) {
DIAG(F("Wifi setup failed to add withrottle service to mDNS"));
}
server = new WiFiServer(port); // start listening on tcp port
server->begin();
// server started here

View File

@@ -4,7 +4,8 @@
#include "StringFormatter.h"
#define VERSION "4.2.59"
#define VERSION "4.2.60"
// 4.2.60 - Add mDNS capability to ESP32 for autodiscovery
// 4.2.59 - Fix: AP SSID was DCC_ instead of DCCEX_
// 4.2.58 - Start motordriver as soon as possible but without waveform
// 4.2.57 - New overload handling (faster and handles commonFaultPin again)