From 19045654e7e980782dcd3dd423d96615142b2db5 Mon Sep 17 00:00:00 2001 From: cyberman54 Date: Mon, 28 Dec 2020 16:41:07 +0100 Subject: [PATCH] move mqtt settings to paxcounter_orig.conf --- include/mqttclient.h | 10 ---------- src/paxcounter_orig.conf | 12 ++++++++++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/include/mqttclient.h b/include/mqttclient.h index 5e595cca..a4fe4ac1 100644 --- a/include/mqttclient.h +++ b/include/mqttclient.h @@ -6,16 +6,6 @@ #include #include -#define MQTT_ETHERNET 0 // select PHY: set 0 for Wifi, 1 for ethernet -#define MQTT_INTOPIC "paxin" -#define MQTT_OUTTOPIC "paxout" -#define MQTT_PORT 1883 -#define MQTT_SERVER "paxcounter.cloud.shiftr.io" -#define MQTT_USER "public" -#define MQTT_PASSWD "public" -#define MQTT_RETRYSEC 20 // retry reconnect every 20 seconds -#define MQTT_KEEPALIVE 10 // keep alive interval in seconds - #ifndef MQTT_CLIENTNAME #define MQTT_CLIENTNAME clientId #endif diff --git a/src/paxcounter_orig.conf b/src/paxcounter_orig.conf index 4c1a7225..14481f22 100644 --- a/src/paxcounter_orig.conf +++ b/src/paxcounter_orig.conf @@ -121,3 +121,15 @@ #define CAYENNE_DEVICECONFIG 11 // device period configuration #define CAYENNE_SENSORREAD 13 // sensor period configuration #define CAYENNE_SENSORENABLE 14 // sensor enable configuration + +// MQTT settings, only needed if MQTT is used (#define HAS_MQTT in board hal file) +#define MQTT_ETHERNET 0 // select PHY: set 0 for Wifi, 1 for ethernet +#define MQTT_INTOPIC "paxin" +#define MQTT_OUTTOPIC "paxout" +#define MQTT_PORT 1883 +#define MQTT_SERVER "public.cloud.shiftr.io" +#define MQTT_USER "public" +#define MQTT_PASSWD "public" +#define MQTT_RETRYSEC 20 // retry reconnect every 20 seconds +#define MQTT_KEEPALIVE 10 // keep alive interval in seconds +//#define MQTT_CLIENTNAME "my_paxcounter" // generated by default