fix code

Universite-Gustave-Eiffel · Jul 3, 2024 · da3b7cd · da3b7cd
1 parent 2dd45e9
commit da3b7cd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/services/pixljs_alert/pixljs_ble.js b/services/pixljs_alert/pixljs_ble.js
@@ -1,5 +1,5 @@
 // force timezone to UTC+0200
-const CODE_VERSION=3;
+const CODE_VERSION=4;
 E.setTimeZone(2);
 const BUZZING_TIME = 60000; // buzzer time ms
 const RESET_NO_ANSWER = 60000;
@@ -196,16 +196,15 @@ function installScreen() {
   if (mode == 1) {
     g.clear();
     g.setFontAlign(0.5, -1);
-    let text = "Installation mode\nPixl.js " + NRF.getAddress().substr(12, 5).replace(":", "");
-    g.drawString(text, g.getWidth() / 2, 0);
+    let text = "Installation mode\nPixl.js " + NRF.getAddress().substr(12, 5).replace(":", "")+"\n";
     let diff = Date().valueOf() - lastSeen.valueOf();
     if (diff > TIMEOUT_RPI) {
-      text = "No Rpi Connection";
+      text += "No Rpi Connection\n";
     } else {
-      text = "Vu il y a " + parseInt(diff / 1000) + " secondes\nRSSI: " + rssi + " dB (" + rssiPowerHint() + ")";
+      text += "Vu il y a " + parseInt(diff / 1000) + " secondes\nRSSI: " + rssi + " dB (" + rssiPowerHint() + ")\n";
     }
-    g.setFontAlign(0.5, 0.5);
-    g.drawString(text, g.getWidth() / 2 , g.getHeight() / 2);
+    text+=rpi_status
+    g.drawString(text, g.getWidth() / 2, 0);
     g.flip();
     setTimeout(installScreen, 500);
   } else {

diff --git a/services/pixljs_alert/zero_ble.py b/services/pixljs_alert/zero_ble.py
@@ -103,8 +103,6 @@ def get_rpi_status():
     rpi_status = "Mic: %s\nVpn: %s\nBat: %s\nGps: %s" % (mic, vpn, battery, gpdsdout)
     return rpi_status
 
-print(get_rpi_status())
-
 
 class BleTrackingDaemon:
     known_devices = {}