dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2025-03-13 17:43:08 +01:00
Code Releases Activity

Fixed constructor

Browse Source
This commit is contained in:
Gregor Baues 2021-05-19 15:33:08 +02:00
parent b5520f13ba
commit be5ca00b7e
2 changed files with 117 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
CommandStation-EX.ino.cpp Normal file
View File

@ -0,0 +1,115 @@
# 1 "/var/folders/3z/5trn2qms2h75fpmtlsywh1c80000gn/T/tmplx9j4cov"
#include <Arduino.h>
# 1 "/Users/gregor/Projects/CommandStation-EX/CommandStation-EX.ino"
# 19 "/Users/gregor/Projects/CommandStation-EX/CommandStation-EX.ino"
#if __has_include("config.h")
#include "config.h"
#else
#warning config.h not found. Using defaults from config.example.h
#include "config.example.h"
#endif
# 45 "/Users/gregor/Projects/CommandStation-EX/CommandStation-EX.ino"
#include "DCCEX.h"
DCCEXParser serialParser;
void setup();
void loop();
#line 52 "/Users/gregor/Projects/CommandStation-EX/CommandStation-EX.ino"
void setup()
{
Serial.begin(115200);
CONDITIONAL_LCD_START
{
LCD(0, F("DCC++ EX v%S"), F(VERSION));
LCD(1, F("Starting"));
}
#if WIFI_ON
WifiInterface::setup(WIFI_SERIAL_LINK_SPEED, F(WIFI_SSID), F(WIFI_PASSWORD), F(WIFI_HOSTNAME), IP_PORT, WIFI_CHANNEL);
#endif
#if ETHERNET_ON
EthernetInterface::setup();
#endif
#if MQTT_ON
MQTTInterface::setup();
#endif
# 88 "/Users/gregor/Projects/CommandStation-EX/CommandStation-EX.ino"
DCC::begin(MOTOR_SHIELD_TYPE);
#if defined(RMFT_ACTIVE)
RMFT::begin();
#endif
#if __has_include("mySetup.h")
#define SETUP(cmd) serialParser.parse(F(cmd))
#include "mySetup.h"
#undef SETUP
#endif
#if defined(LCN_SERIAL)
LCN_SERIAL.begin(115200);
LCN::init(LCN_SERIAL);
#endif
LCD(1, F("Ready"));
}
void loop()
{
DCC::loop();
serialParser.loop(Serial);
#if WIFI_ON
WifiInterface::loop();
#endif
#if ETHERNET_ON
EthernetInterface::loop();
#endif
#if MQTT_ON
MQTTInterface::loop();
#endif
#if defined(RMFT_ACTIVE)
RMFT::loop();
#endif
#if defined(LCN_SERIAL)
LCN::loop();
#endif
LCDDisplay::loop();
static int ramLowWatermark = __INT_MAX__;
int freeNow = minimumFreeMemory();
if (freeNow < ramLowWatermark)
{
ramLowWatermark = freeNow;
LCD(2, F("Free RAM=%5db"), ramLowWatermark);
}
}

4
MQTTInterface.h
View File

@ -99,9 +99,9 @@ struct MQTTBroker
};
// port & ip & prefix
MQTTBroker(int p, IPAddress i, const FSH *uid, const FSH *pass, const FSH *pfix) : port(p), ip(i), prefix(pfix), cType(1){};
MQTTBroker(int p, IPAddress i, const FSH *pfix) : port(p), ip(i), prefix(pfix), cType(1){};
// port & domain & prefix
MQTTBroker(int p, const FSH *d, const FSH *uid, const FSH *pass, const FSH *pfix) : port(p), domain(d), prefix(pfix), cType(1)
MQTTBroker(int p, const FSH *d, const FSH *pfix) : port(p), domain(d), prefix(pfix), cType(1)
{
ip = resovleBroker(d);
};