dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-23 08:06:13 +01:00
Code Releases Activity

MQ Init

Browse Source
This commit is contained in:
Gregor Baues 2021-04-27 15:03:15 +02:00
parent 7442e3452e
commit 4efa260003
4 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DCCEXParser.cpp
View File

@ -56,6 +56,7 @@ const int16_t HASH_KEYWORD_LCN = 15137;
const int16_t HASH_KEYWORD_RESET = 26133; const int16_t HASH_KEYWORD_RESET = 26133;
const int16_t HASH_KEYWORD_SPEED28 = -17064; const int16_t HASH_KEYWORD_SPEED28 = -17064;
const int16_t HASH_KEYWORD_SPEED128 = 25816; const int16_t HASH_KEYWORD_SPEED128 = 25816;
const int16_t HASH_KEYWORD_MQTT = 11111;
int16_t DCCEXParser::stashP[MAX_COMMAND_PARAMS]; int16_t DCCEXParser::stashP[MAX_COMMAND_PARAMS];
bool DCCEXParser::stashBusy; bool DCCEXParser::stashBusy;

11
DccMQTT.cpp
View File

@ -33,6 +33,8 @@
#include <DccMQTT.h> #include <DccMQTT.h>
DccMQTT DccMQTT::singleton;
void DccMQTT::setup() void DccMQTT::setup()
{ {
@ -43,11 +45,12 @@ void DccMQTT::setup()
// PubSubClient mqttClient(ethClient); // PubSubClient mqttClient(ethClient);
// PubSubClient *DccMQTT::mqClient = &mqttClient; // PubSubClient *DccMQTT::mqClient = &mqttClient;
server = IPAddress(MQTT_BROKER_ADDRESS); // get a eth client session
ethClient = EthernetInterface::get()->getServer()->available();
// char _csidMsg[64]{'\0'}; //!< string buffer for the serialized message to return
// mqttClient.setServer(server, MQTT_BROKER_PORT); // Initalize MQ broker
// initalize MQ Broker
mqttClient = PubSubClient(ethClient);
mqttClient.setServer(IPAddress(MQTT_BROKER_ADDRESS), MQTT_BROKER_PORT);
// DBG(F("MQTT Client : Server ok ...")); // DBG(F("MQTT Client : Server ok ..."));
// mqttClient.setCallback(mqttCallback); // Initalize callback function for incomming messages // mqttClient.setCallback(mqttCallback); // Initalize callback function for incomming messages

1
DccMQTT.h
View File

@ -62,7 +62,6 @@ public:
void loop(); void loop();
~DccMQTT() = default; ~DccMQTT() = default;
DccMQTT()
}; };

14
EthernetInterface.h
View File

@ -54,11 +54,23 @@ class EthernetInterface {
static void setup(); static void setup();
static void loop(); static void loop();
bool isConnected() { return connected; };
static EthernetInterface *get() { return singleton; };
EthernetClient *getClient(int socket) { return &clients[socket]; };
EthernetServer *getServer() { return server; };
~EthernetInterface() = default;
private: private:
EthernetInterface();
EthernetInterface(const EthernetInterface&); // non construction-copyable
EthernetInterface& operator=( const EthernetInterface& ); // non copyable
static EthernetInterface * singleton; static EthernetInterface * singleton;
bool connected; bool connected;
EthernetInterface();
void loop2(); void loop2();
EthernetServer * server; EthernetServer * server;
EthernetClient clients[MAX_SOCK_NUM]; // accept up to MAX_SOCK_NUM client connections at the same time; This depends on the chipset used on the Shield EthernetClient clients[MAX_SOCK_NUM]; // accept up to MAX_SOCK_NUM client connections at the same time; This depends on the chipset used on the Shield
uint8_t buffer[MAX_ETH_BUFFER+1]; // buffer used by TCP for the recv uint8_t buffer[MAX_ETH_BUFFER+1]; // buffer used by TCP for the recv