Update Nextion

Alert is not stoppable from display
WLANThermo · Jun 9, 2018 · b6adb66 · b6adb66
1 parent 2a9011f
commit b6adb66
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 11 deletions.
diff --git a/nextion/NX3224T028_v2.11.HMI b/nextion/NX3224T028_v2.11.HMI
diff --git a/nextion/NX3224T028_v2.10.HMI → nextion/old/NX3224T028_v2.10.HMI b/nextion/NX3224T028_v2.10.HMI → nextion/old/NX3224T028_v2.10.HMI
diff --git a/software/usr/sbin/sende_whatsapp.sh b/software/usr/sbin/sende_whatsapp.sh
diff --git a/software/usr/sbin/wlt_2_nextion.py b/software/usr/sbin/wlt_2_nextion.py
@@ -972,7 +972,7 @@ def NX_display():
     global temps_event, channels_event, pitmaster_event, pitmasterconfig_event
     global Config
 
-    nextion_versions = ['v2.10']
+    nextion_versions = ['v2.11']
 
     # Version des Displays prüfen
     display_version = str(NX_getvalue('main.version.txt'))
@@ -1292,16 +1292,16 @@ def NX_display():
                 if event['data']['area'] == 5:
                     if event['data']['id'] == 0:
                         if event['data']['action'] == 0:
-                            logger.debug(_(u'Shutting down...'))
+                            logger.info(_(u'Shutting down...'))
                             todo_setvalues(pi_down = 1)
                     elif event['data']['id'] == 1:
                         if event['data']['action'] == 0:
-                            logger.debug(_(u'Rebooting...'))
+                            logger.info(_(u'Rebooting...'))
                             todo_setvalues(pi_reboot = 1)
                     elif event['data']['id'] == 3:
                         if event['data']['action'] == 0:
                             # WLAN scannen
-                            logger.debug(_(u'Scanning WLANs'))
+                            logger.info(_(u'Scanning WLANs'))
                             ssids = wlan_getssids()
                             ssids_i = 0
                             logger.debug('SSIDs:' + str(ssids))
@@ -1327,12 +1327,12 @@ def NX_display():
                             NX_sendvalues({'main.ssid.txt:35': ssids[ssids_i]})
                     elif event['data']['id'] == 4:
                         if event['data']['action'] == 0:
-                            logger.debug(_(u'Create new logfile!'))
+                            logger.info(_(u'Create new logfile!'))
                             todo_setvalues(create_new_log = 1)
                 elif event['data']['area'] == 6:
                     if event['data']['id'] == 0:
                         if event['data']['action'] == 0:
-                            logger.debug(_(u'Alert acknowledged!'))
+                            logger.info(_(u'Alert acknowledged!'))
                             alert_setack()
             NX_eventq.task_done()
         elif temps_event.is_set():

diff --git a/software/usr/share/WLANThermo/nextion/NX3224K024_0.tft b/software/usr/share/WLANThermo/nextion/NX3224K024_0.tft
diff --git a/software/usr/share/WLANThermo/nextion/NX3224K024_180.tft b/software/usr/share/WLANThermo/nextion/NX3224K024_180.tft
diff --git a/software/usr/share/WLANThermo/nextion/NX3224K028_0.tft b/software/usr/share/WLANThermo/nextion/NX3224K028_0.tft
diff --git a/software/usr/share/WLANThermo/nextion/NX3224K028_180.tft b/software/usr/share/WLANThermo/nextion/NX3224K028_180.tft
diff --git a/software/usr/share/WLANThermo/nextion/NX3224T024_0.tft b/software/usr/share/WLANThermo/nextion/NX3224T024_0.tft
diff --git a/software/usr/share/WLANThermo/nextion/NX3224T024_180.tft b/software/usr/share/WLANThermo/nextion/NX3224T024_180.tft
diff --git a/software/usr/share/WLANThermo/nextion/NX3224T028_0.tft b/software/usr/share/WLANThermo/nextion/NX3224T028_0.tft
diff --git a/software/usr/share/WLANThermo/nextion/NX3224T028_180.tft b/software/usr/share/WLANThermo/nextion/NX3224T028_180.tft
diff --git a/software/var/www/control/config.php b/software/var/www/control/config.php
@@ -713,6 +713,7 @@
 	echo "  <head> <meta http-equiv=\"refresh\" content=\"1;URL='config.php'\"></head>
 		<body> <h2>" . gettext("Update flag has been set...") . "</h2></body>";
 	echo "</div>";
+    $_SESSION["nextionupdate"] = True;
 } elseif(isset($_GET["calibrate-display"]) && $_GET["calibrate-display"] == "true") {
 	$ini['ToDo']['calibrate_display'] = 'True';
 	write_ini($inipath, $ini);