integrated pio libraries

wassfila · wassfila · commit df4723e10e31 · 2020-09-29T21:03:36.000+02:00
diff --git a/09_esp_now_broadcast/.gitignore b/09_esp_now_broadcast/.gitignore
diff --git a/09_esp_now_broadcast/README.md b/09_esp_now_broadcast/README.md
diff --git a/09_esp_now_broadcast/data/.gitignore b/09_esp_now_broadcast/data/.gitignore
diff --git a/09_esp_now_broadcast/data/config.json b/09_esp_now_broadcast/data/config.json
@@ -0,0 +1,14 @@
+{
+    "wifi":{
+        "mode":"AP",
+        "channel":8
+    },
+    "espnow":{
+        "gateway":true
+    },
+    "mqtt" : {
+        "host":"10.0.0.42",
+        "port":1883,
+        "client_id":"esp_now_g"
+    }
+}
diff --git a/09_esp_now_broadcast/data/secret_template.json b/09_esp_now_broadcast/data/secret_template.json
diff --git a/09_esp_now_broadcast/platformio.ini b/09_esp_now_broadcast/platformio.ini
@@ -5,11 +5,13 @@ lib_deps =
     ArduinoJson@6.16.1
     ConfigUtils@1.0.0
     617@2.4.7   #MQTT 256dpi/arduino-mqtt
+    ESPStringUtils@1.0.0
+    ESPNowWrapper@1.0.0
 lib_ldf_mode = deep+
 [env:esp32dev]
 platform = espressif32@2.0.0
 platform_packages       = 
     framework-arduinoespressif32@3.10004.200129
 monitor_speed = 115200
 upload_speed = 460800
-upload_port = COM11
+upload_port = COM17
diff --git a/09_esp_now_broadcast/src/main.cpp b/09_esp_now_broadcast/src/main.cpp
@@ -5,6 +5,7 @@
 
 #include <ConfigUtils.h>
 #include <EspNowWrapper.h>
+#include <ESPStringUtils.h>
 
 DynamicJsonDocument config(5*1024);//5 KB
 DynamicJsonDocument secret(1*1024);//1 KB
@@ -14,8 +15,13 @@ NowApp espnow;
 
 uint32_t cycle_count = 0;
 
+//https://esp32.com/viewtopic.php?t=12992
+
+String topic;
+
 void meshMessage(String &payload,String from){
   Serial.printf("RX> from(%s) => [%s]\n",from.c_str(),payload.c_str());
+  mqtt.publish("espnow/"+from,payload);
 }
 
 void mqtt_start(DynamicJsonDocument &config){
@@ -25,6 +31,7 @@ void mqtt_start(DynamicJsonDocument &config){
   }
 }
 
+
 void setup() {
   
   Serial.begin(115200);
@@ -36,19 +43,19 @@ void setup() {
 
   String ssid = secret["wifi"]["access_point"];
   String pass = secret["wifi"]["password"];
-  WiFi.begin(ssid.c_str(),pass.c_str());
-  while (WiFi.status() != WL_CONNECTED) {
-    Serial.print(".");
-    delay(1000);
-  }
+  WiFi.mode(WIFI_MODE_STA);
   timelog("config loaded");
-  mqtt_start(config);
-  mqtt.publish("espnow","test");
-  mqtt.loop();
+
+
+  byte mac[6];
+  WiFi.macAddress(mac);
+  topic = "espnow/"+hextab_to_string(mac);
 
   espnow.start(config,secret);
   espnow.onMessage(meshMessage);
 
+  espnow.set_channel(config["wifi"]["channel"]);
+
   timelog("setup() done");
 
 }
@@ -57,8 +64,6 @@ void loop() {
   cycle_count++;
   Serial.printf("\n\n");
   timelog("loop start cycle ("+String(cycle_count)+")");
-  mqtt.publish("espnow","Mqtt("+String(cycle_count)+")");
-  delay(1000);
   espnow.print_info();
   espnow.broadcast("Hello Everyone ("+String(cycle_count)+")");
   delay(5000);
diff --git a/10_esp_now_mqtt_gateway/.gitignore b/10_esp_now_mqtt_gateway/.gitignore
@@ -0,0 +1,4 @@
+.pio
+.vscode
+*.log
+lib
diff --git a/10_esp_now_mqtt_gateway/README.md b/10_esp_now_mqtt_gateway/README.md
@@ -0,0 +1,13 @@
+## Usage
+in terminal
+```console
+> pio lib install
+> pio run
+> pio run -t upload
+> pio run -t uploadfs
+> pio run -t monitor
+```
+
+# References
+* [docs.espressif esp32 api-reference esp-now](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/network/esp_now.html)
+
diff --git a/10_esp_now_mqtt_gateway/data/.gitignore b/10_esp_now_mqtt_gateway/data/.gitignore
@@ -0,0 +1 @@
+secret.json
diff --git a/10_esp_now_mqtt_gateway/data/config.json b/10_esp_now_mqtt_gateway/data/config.json
@@ -1,13 +1,13 @@
 {
     "wifi":{
         "mode":"AP",
-        "channel":1
+        "channel":8
     },
     "espnow":{
     },
     "mqtt" : {
         "host":"10.0.0.42",
         "port":1883,
-        "client_id":"esp_test3_now"
+        "client_id":"esp_now_gateway"
     }
 }
diff --git a/10_esp_now_mqtt_gateway/data/secret_template.json b/10_esp_now_mqtt_gateway/data/secret_template.json
@@ -0,0 +1,9 @@
+{
+    "wifi":{
+        "access_point":"",
+        "password":""
+    },
+    "espnow":{
+        "primary_key":""
+    }
+}
diff --git a/10_esp_now_mqtt_gateway/platformio.ini b/10_esp_now_mqtt_gateway/platformio.ini
@@ -0,0 +1,17 @@
+[env]
+board = esp32dev
+framework = arduino
+lib_deps =
+    ArduinoJson@6.16.1
+    ConfigUtils@1.0.0
+    617@2.4.7   #MQTT 256dpi/arduino-mqtt
+    ESPStringUtils@1.0.0
+    ESPNowWrapper@1.0.0
+lib_ldf_mode = deep+
+[env:esp32dev]
+platform = espressif32@2.0.0
+platform_packages       = 
+    framework-arduinoespressif32@3.10004.200129
+monitor_speed = 115200
+upload_speed = 460800
+upload_port = COM17
diff --git a/10_esp_now_mqtt_gateway/src/main.cpp b/10_esp_now_mqtt_gateway/src/main.cpp
@@ -0,0 +1,75 @@
+#include <Arduino.h>
+#include <ArduinoJson.h>
+#include <WiFi.h>
+#include <MQTT.h>
+
+#include <ConfigUtils.h>
+#include <EspNowWrapper.h>
+#include <ESPStringUtils.h>
+
+DynamicJsonDocument config(5*1024);//5 KB
+DynamicJsonDocument secret(1*1024);//1 KB
+MQTTClient mqtt(1*1024);
+WiFiClient wifi;//needed to stay on global scope
+NowApp espnow;
+
+uint32_t cycle_count = 0;
+
+//https://esp32.com/viewtopic.php?t=12992
+
+String topic;
+
+void meshMessage(String &payload,String from){
+  Serial.printf("RX> from(%s) => [%s]\n",from.c_str(),payload.c_str());
+  mqtt.publish("espnow/"+from,payload);
+}
+
+void mqtt_start(DynamicJsonDocument &config){
+  mqtt.begin(config["mqtt"]["host"],config["mqtt"]["port"], wifi);
+  if(mqtt.connect(config["mqtt"]["client_id"])){
+    Serial.println("mqtt>connected");
+  }
+}
+
+
+void setup() {
+  
+  Serial.begin(115200);
+  timelog("Boot ready");
+
+  load_json(config,"/config.json");
+  load_json(secret,"/secret.json");
+  timelog("config loaded");
+
+  String ssid = secret["wifi"]["access_point"];
+  String pass = secret["wifi"]["password"];
+  WiFi.begin(ssid.c_str(),pass.c_str());
+  while (WiFi.status() != WL_CONNECTED) {
+    Serial.print(".");
+    delay(1000);
+  }
+  timelog("config loaded");
+
+
+  byte mac[6];
+  WiFi.macAddress(mac);
+  topic = "espnow/"+hextab_to_string(mac);
+
+  espnow.start(config,secret);
+  espnow.onMessage(meshMessage);
+
+  mqtt_start(config);
+  mqtt.publish(topic,"gateway (start)");
+  mqtt.loop();
+  timelog("setup() done");
+
+}
+
+void loop() {
+  cycle_count++;
+  Serial.printf("\n\n");
+  timelog("loop start cycle ("+String(cycle_count)+")");
+  mqtt.publish(topic,"gateway("+String(cycle_count)+")");
+  Serial.print(WiFi.channel());
+  delay(5000);
+}

-Original file line number
+Diff line change
     [email protected]
     [email protected]
     [email protected]   #MQTT 256dpi/arduino-mqtt
 +    [email protected]
 +    [email protected]
 lib_ldf_mode = deep+
 [env:esp32dev]
 platform = [email protected]
 platform_packages       =
     [email protected]
 monitor_speed = 115200
 upload_speed = 460800
 -upload_port = COM11
 +upload_port = COM17