Merge pull request #2 from GJKrupa/mqtt-versions

Mqtt versions
GJKrupa · Jun 4, 2022 · 83060ad · 83060ad
2 parents e1cabbc + ce5b70d
commit 83060ad
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git a/platformio.ini b/platformio.ini
@@ -19,8 +19,8 @@ upload_port = /dev/cu.usbserial-0001
 upload_speed = 921600
 monitor_port = /dev/cu.usbserial-0001
 monitor_speed = 115200
-lib_deps =
+lib_deps = 
     enviromonitor/BME280_Light @ 0.0.0-alpha+sha.600667f3a6
-    arduino-libraries/NTPClient @ ^3.2.1
-    ottowinter/AsyncMqttClient-esphome @ ^0.8.6
-    arcao/Syslog @ ^2.0.0
+	arduino-libraries/NTPClient @ ^3.2.1
+	ottowinter/AsyncMqttClient-esphome @ ^0.8.6
+	arcao/Syslog @ ^2.0.0
diff --git a/src/bme_sensor.cpp b/src/bme_sensor.cpp
@@ -64,7 +64,7 @@ void BMEHomeSensor::switchOn()
 {
     if (pwr_pin > 0)
     {
-        digitalWrite(32, HIGH);
+        digitalWrite(pwr_pin, HIGH);
     }
     is_on = true;
 }
@@ -73,7 +73,7 @@ void BMEHomeSensor::switchOff()
 {
     if (pwr_pin > 0)
     {
-        digitalWrite(32, LOW);
+        digitalWrite(pwr_pin, LOW);
     }
     is_on = false;
 }
diff --git a/src/main.cpp b/src/main.cpp
@@ -32,12 +32,6 @@
 #define RAIN_MONITOR 0
 #endif
 
-RTC_DATA_ATTR double lastExecutionTime;
-
-
-esp_sleep_wakeup_cause_t wakeupCause;
-long executionStart;
-
 MQTTSubmitter submitter(ROOM, MQTT_SERVER, MQTT_PORT);
 std::list<HomeSensor*> sensors;
 
@@ -59,15 +53,12 @@ void goToSleep(long microSeconds) {
 
 void setup(void)
 {
-    executionStart = esp_timer_get_time();
-    wakeupCause = esp_sleep_get_wakeup_cause();
-
     log_init();
 
     logf("Connecting to wifi %s\n", WIFI_SSID);
     WiFi.begin(WIFI_SSID, WIFI_PASSPHRASE);
 
-    sensors.push_back(new BMEHomeSensor(25, 26, -1));
+    sensors.push_back(new BMEHomeSensor(25, 26, 32));
 #if RAIN_MONITOR == 1
     sensors.push_back(new RainHomeSensor(34, 27));
 #endif