MQTT last will and Improved RFM69

Thaks Thierry
couin3 · Sep 12, 2020 · 30c9ae6 · 30c9ae6
1 parent c9fd765
commit 30c9ae6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/RFLink/1_Radio.cpp b/RFLink/1_Radio.cpp
@@ -45,7 +45,11 @@ void set_Radio_mode(Radio_State new_State)
     case Radio_OFF:
       PIN_RF_RX_DATA = NOT_A_PIN;
       PIN_RF_TX_DATA = NOT_A_PIN;
+      radio.reset();
       radio.initialize();
+      radio.setFrequency(433920000);
+      Serial.print("Freq = "); Serial.println(radio.getFrequency());
+      //Serial.print("Temp = "); Serial.println(radio.readTemperature());
       radio.setHighPower(true); // for RFM69HW
       // radio.sleep();
       break;

diff --git a/RFLink/6_Credentials.h b/RFLink/6_Credentials.h
@@ -15,11 +15,14 @@
 String WIFI_SSID = "your_AP_ssid";
 String WIFI_PSWD = "your_AP_passwd";
 
-// static IP
+// DHCP or Static IP
+#define USE_DHCP
+#ifndef USE_DHCP
 String WIFI_IP = "192.168.0.199";
 String WIFI_DNS = "8.8.8.8";
 String WIFI_GATEWAY = "192.168.0.1";
 String WIFI_SUBNET = "255.255.255.0";
+#endif
 
 // MQTT Server
 String MQTT_SERVER = "raspberrypi.local";
@@ -33,4 +36,4 @@ String MQTT_TOPIC_OUT = "/RFLink/msg";
 String MQTT_TOPIC_IN = "/RFLink/cmd";
 
 #endif
-#endif
+#endif
diff --git a/RFLink/6_WiFi_MQTT.cpp b/RFLink/6_WiFi_MQTT.cpp
@@ -55,8 +55,10 @@ void setup_WIFI()
 #endif // ESP8266
   WiFi.mode(WIFI_STA);
 
-  // Comment out for Dynamic IP
+  // For Static IP
+#ifndef USE_DHCP
   WiFi.config(ipaddr_addr(WIFI_IP.c_str()), ipaddr_addr(WIFI_GATEWAY.c_str()), ipaddr_addr(WIFI_SUBNET.c_str()));
+#endif // USE_DHCP
 
   // We start by connecting to a WiFi network
   Serial.print(F("WiFi SSID :\t\t"));
@@ -108,13 +110,20 @@ void reconnect()
     Serial.println(MQTT_SERVER.c_str());
     Serial.print(F("MQTT Connection :\t"));
 
+  #ifdef MQTT_LWT
+    if (MQTTClient.connect(MQTT_ID.c_str(), MQTT_USER.c_str(), MQTT_PSWD.c_str(), (MQTT_TOPIC_OUT+"/LWT").c_str(), 2, true, "Offline"))
+  #else
     if (MQTTClient.connect(MQTT_ID.c_str(), MQTT_USER.c_str(), MQTT_PSWD.c_str()))
+  #endif
     {
       Serial.println(F("Established"));
       Serial.print(F("MQTT ID :\t\t"));
       Serial.println(MQTT_ID.c_str());
       Serial.print(F("MQTT Username :\t\t"));
       Serial.println(MQTT_USER.c_str());
+    #ifdef MQTT_LWT
+      MQTTClient.publish((MQTT_TOPIC_OUT+"/LWT").c_str(), "Online", true);
+    #endif
     }
     else
     {

diff --git a/RFLink/RFLink.h b/RFLink/RFLink.h
@@ -27,6 +27,7 @@
 #define MQTT_ENABLED          // Send RFLink messages over MQTT
 #define MQTT_LOOP_MS 1000     // MQTTClient.loop(); call period (in mSec)
 #define MQTT_RETAINED_0 false // Retained option
+#define MQTT_LWT              // Let know if Module is Online or Offline via MQTT Last Will message
 #endif
 
 // Debug default