CommandStation-EX.ino

@@ -78,12 +78,6 @@ void setup()
 // Initialise HAL layer before reading EEprom or setting up MotorDrivers 
   IODevice::begin();
 
-  // As the setup of a motor shield may require a read of the current sense input from the ADC,
-  // let's make sure to initialise the ADCee class!
-  ADCee::begin();
-  // Set up MotorDrivers early to initialize all pins
-  TrackManager::Setup(MOTOR_SHIELD_TYPE);
-
   DISPLAY_START (
     // This block is still executed for DIAGS if display not in use
     LCD(0,F("DCC-EX v%S"),F(VERSION));
@@ -106,8 +100,15 @@ void setup()
   EthernetInterface::setup();
 #endif // ETHERNET_ON
   
+  // As the setup of a motor shield may require a read of the current sense input from the ADC,
+  // let's make sure to initialise the ADCee class!
+  ADCee::begin();
   // Responsibility 3: Start the DCC engine.
-  DCC::begin();
+  // Note: this provides DCC with two motor drivers, main and prog, which handle the motor shield(s)
+  // Standard supported devices have pre-configured macros but custome hardware installations require
+  //  detailed pin mappings and may also require modified subclasses of the MotorDriver to implement specialist logic.
+  // STANDARD_MOTOR_SHIELD, POLOLU_MOTOR_SHIELD, FIREBOX_MK1, FIREBOX_MK1S are pre defined in MotorShields.h
+  TrackManager::Setup(MOTOR_SHIELD_TYPE);
 
   // Start RMFT aka EX-RAIL (ignored if no automnation)
   RMFT::begin();

DCC.cpp

@@ -60,7 +60,8 @@ const byte FN_GROUP_5=0x10;
 FSH* DCC::shieldName=NULL;
 byte DCC::globalSpeedsteps=128;
 
-void DCC::begin() {
+void DCC::begin(const FSH * motorShieldName) {
+  shieldName=(FSH *)motorShieldName;
   StringFormatter::send(&USB_SERIAL,F("<iDCC-EX V-%S / %S / %S G-%S>\n"), F(VERSION), F(ARDUINO_TYPE), shieldName, F(GITHUB_SHA));
 #ifndef DISABLE_EEPROM
   // Load stuff from EEprom

DCC.h

@@ -51,10 +51,7 @@ const byte MAX_LOCOS = 30;
 class DCC
 {
 public:
-  static inline void setShieldName(const FSH * motorShieldName) {
-    shieldName=(FSH *)motorShieldName;
-  };
-  static void begin();
+  static void begin(const FSH * motorShieldName);
   static void loop();
 
   // Public DCC API functions

GITHUB_SHA.h

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

TrackManager.cpp

@@ -134,7 +134,7 @@ void TrackManager::Setup(const FSH * shieldname,
       }
     }
   }
-  DCC::setShieldName(shieldname);
+  DCC::begin(shieldname);   
 }
 
 void TrackManager::addTrack(byte t, MotorDriver* driver) {

WifiESP32.cpp

@@ -176,7 +176,7 @@ bool WifiESP::setup(const char *SSid,
   }
   if (!haveSSID) {
     // prepare all strings
-    String strSSID("DCCEX_");
+    String strSSID("DCC_");
     String strPass("PASS_");
     String strMac = WiFi.macAddress();
     strMac.remove(0,9);

version.h

@@ -4,9 +4,7 @@
 #include "StringFormatter.h"
 
 
-#define VERSION "4.2.59"
-// 4.2.59 - Fix: AP SSID was DCC_ instead of DCCEX_
-// 4.2.58 - Start motordriver as soon as possible but without waveform
+#define VERSION "4.2.57"
 // 4.2.57 - New overload handling (faster and handles commonFaultPin again)
 //        - Optimize analog read STM32
 // 4.2.56 - Update IO_RotaryEncoder.h: