Update to publish MQTT angle

ClassicDIY · Jan 24, 2024 · ff7320b · ff7320b
1 parent f5f9b36
commit ff7320b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 1 deletion.
diff --git a/code/ESP32/.vscode/settings.json b/code/ESP32/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "typeinfo": "cpp"
+    }
+}
diff --git a/code/ESP32/include/LinearActuatorNoPot.h b/code/ESP32/include/LinearActuatorNoPot.h
@@ -3,13 +3,16 @@
 #include <ThreadController.h>
 #include <Thread.h>
 #include "Enumerations.h"
+#include "IOT.h"
 
 #define noise 2
 #define histeresis 2
 #define shortCheckInterval 100
 #define longCheckInterval 5000
 #define POSITIONINTERVAL 5 // Move array when sun moves 5 degrees past current position
 
+extern SkyeTracker::IOT _iot;
+
 namespace SkyeTracker
 {
 

diff --git a/code/ESP32/src/IOT.cpp b/code/ESP32/src/IOT.cpp
@@ -21,7 +21,7 @@ char _mqttServer[IOTWEBCONF_WORD_LEN];
 char _mqttPort[5];
 char _mqttUserName[IOTWEBCONF_WORD_LEN];
 char _mqttUserPassword[IOTWEBCONF_WORD_LEN];
-u_int _uniqueId = 0;
+u_int32_t _uniqueId = ESP.getEfuseMac() & 0xFFFFFFFF;
 IotWebConfSeparator seperatorParam = IotWebConfSeparator("MQTT");
 IotWebConfParameter mqttServerParam = IotWebConfParameter("MQTT server", "mqttServer", _mqttServer, IOTWEBCONF_WORD_LEN);
 IotWebConfParameter mqttPortParam = IotWebConfParameter("MQTT port", "mqttSPort", _mqttPort, 5, "text", NULL, "1883");

diff --git a/code/ESP32/src/LinearActuatorNoPot.cpp b/code/ESP32/src/LinearActuatorNoPot.cpp
@@ -187,6 +187,11 @@ namespace SkyeTracker
 			setInterval(shortCheckInterval);
 			_requestedAngle = angle;
 			enabled = true;
+			char angle[16];
+			sprintf(angle, "%.0f", _requestedAngle);
+			char subtopic[32];
+			sprintf(subtopic, "%sAngle", _name);
+			_iot.publish(subtopic, angle, false);
 		}
 	}
 

diff --git a/code/ESP32/src/Tracker.cpp b/code/ESP32/src/Tracker.cpp
@@ -169,6 +169,7 @@ namespace SkyeTracker
 
 	void Tracker::setState(TrackerState state)
 	{
+		logd("setState: %d", state);
 		if (_trackerState != state) {
 			_trackerState = state;
 			_config.SendConfiguration();