Fixed typ-o in MQTT topic for temperature and moved voltage bootup check into compiler option SELF_POWERED

Fixed build file
Fixed page title on reboot page
2026-03-11 13:05:31 +00:00 · 2020-04-10 08:52:56 +02:00 · 2020-04-09 08:58:56 +02:00 · 2020-04-09 08:56:50 +02:00
3 changed files with 5 additions and 2 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,6 +15,7 @@ jobs:
    - name: Check out code from repo
      uses: actions/checkout@v1
    - name: Get release version for filenames
+      id: release_tag
      env:
        GITHUB_REF: ${{ github.ref }}
      run: echo ::set-output name=tag::$(echo ${GITHUB_REF:11})
--- a/src/AmsToMqttBridge.ino
+++ b/src/AmsToMqttBridge.ino
@@ -86,6 +86,7 @@ void setup() {
 		debugI("Voltage: %.2fV", vcc);
 	}

+#if SELF_POWERED
 	if (vcc > 2.5 && vcc < 3.25) { // Only sleep if voltage is realistic and too low
 		if(Debug.isActive(RemoteDebug::INFO)) {
 			debugI("Votltage is too low, sleeping");
@@ -93,6 +94,7 @@ void setup() {
 		}
 		ESP.deepSleep(10000000);    //Deep sleep to allow output cap to charge up
 	}  
+#endif

 	#if HAS_RGB_LED
 		// Initialize RGB LED pins
@@ -705,7 +707,7 @@ void sendSystemStatusToMqtt() {
 	}
 	mqtt.publish(config.getMqttPublishTopic() + "/rssi", String(hw.getWifiRssi()));
    if(temperature != DEVICE_DISCONNECTED_C) {
-		mqtt.publish(config.getMqttPublishTopic() + "/vcc", String(temperature, 2));
+		mqtt.publish(config.getMqttPublishTopic() + "/temperature", String(temperature, 2));
    }
 }

--- a/web/restartwait.html
+++ b/web/restartwait.html
@@ -2,7 +2,7 @@
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>AMS reader - Meter configuration</title>
+    <title>AMS reader - Restarting, please wait</title>
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <link rel="stylesheet" type="text/css" href="boot.css"/>
    <script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
Author	SHA1	Message	Date
Gunnar Skjold	398407350c	Fixed typ-o in MQTT topic for temperature and moved voltage bootup check into compiler option SELF_POWERED	2020-04-10 08:52:56 +02:00
Gunnar Skjold	5e33a15e85	Fixed build file	2020-04-09 08:58:56 +02:00
Gunnar Skjold	7f51534e91	Fixed page title on reboot page	2020-04-09 08:56:50 +02:00