fixed scripts for Moduline Display

GOcontroll · Apr 8, 2024 · 6872754 · 6872754
1 parent dda1092
commit 6872754
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/etc/controller_update/controller_update.sh b/etc/controller_update/controller_update.sh
@@ -40,7 +40,7 @@ case $hw in
 		patch /usr/node-red-gocontroll/nodes/can_receive.html /patch/can_receive_html.patch > /dev/null
 		patch /usr/node-red-gocontroll/nodes/can_send.html /patch/can_send_html.patch > /dev/null
 		;;
-	*Screen*)
+	*Display*)
 		sed -i "s/controllerType/2/g" /lib/systemd/system/go-auto-shutdown.service
 		sed -i "s/WWAN_SETTINGS=True/WWAN_SETTINGS=False/g" /usr/moduline/python/rfcommServerConfig.py
 esac

diff --git a/etc/controller_update/current-release.txt b/etc/controller_update/current-release.txt
@@ -1,3 +1,3 @@
-0.7.1
-repo ver V1.17.1
+0.7.2
+repo ver V1.17.2
 for changelog see version.txt or the github page for the release.
diff --git a/installer/gocontroll-first-install b/installer/gocontroll-first-install
@@ -211,8 +211,8 @@ case $hw in
 		patch /usr/node-red-gocontroll/nodes/can_send.html ~/GOcontroll/GOcontroll*/patch/can_send_html.patch > /dev/null
 		patch /etc/network/interfaces ~/GOcontroll/GOcontroll*/patch/interfaces.patch > /dev/null
 		;;
-	*Screen*)
-		echo PRETTY_HOSTNAME="GOcontroll-Moduline Screen $mod" > /etc/machine-info
+	*Display*)
+		echo PRETTY_HOSTNAME="GOcontroll-Moduline Display $mod" > /etc/machine-info
 		sed -i "s/controllerType/2/g" /lib/systemd/system/go-auto-shutdown.service
 		sed -i "s/WWAN_SETTINGS=True/WWAN_SETTINGS=False/g" /usr/moduline/python/rfcommServerConfig.py
 		nmcli con delete GO-cellular

diff --git a/usr/moduline/bash/go-bluetooth-start.sh b/usr/moduline/bash/go-bluetooth-start.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-if [[ $(tr -d '\0' < /sys/firmware/devicetree/base/hardware) == "Moduline Screen"* ]]; then
+if [[ $(tr -d '\0' < /sys/firmware/devicetree/base/hardware) == "Moduline Display"* ]]; then
 
-echo -e "${YELLOW}-Setting up bluetooth for the Moduline screen ${NORMAL}"
+echo -e "${YELLOW}-Setting up bluetooth for the Moduline Display ${NORMAL}"
 
 hciattach /dev/ttymxc1 bcm43xx 921600 flow nosleep macplaceholder
 

diff --git a/usr/moduline/nodejs/testcan.js b/usr/moduline/nodejs/testcan.js
@@ -3,7 +3,7 @@ const fs = require('fs');
 const i2c = require('i2c-bus');
 
 //check what type of controller?
-var controllerType, hardwareFile;
+var hardwareFile;
 var canBusCount = 0;
 var thread_can0, thread_can2;
 var thread_can0_count, thread_can2_count;
@@ -40,20 +40,17 @@ try {
 console.error(err);
 }
 if (hardwareFile.includes("Moduline IV")) {
-    controllerType = "IV"
     canBusCount = 4;
     set_led(0, "blue");
     set_led(1, "blue");
     set_led(2, "blue");
     set_led(3, "blue");
 
 } else if (hardwareFile.includes("Moduline Mini")) {
-    controllerType = "mini"
     canBusCount = 2;
     set_led(0, "blue");
     set_led(1, "blue");
-} else if (hardwareFile.includes("Moduline Screen")) {
-    controllerType = "screen"
+} else if (hardwareFile.includes("Moduline Display")) {
     canBusCount = 2;
     error_log =  "error log:\n";
 }

diff --git a/version.txt b/version.txt
@@ -1,7 +1,10 @@
-V1.17.1
+V1.17.2
 
 ########
-25-3-2024 V1.17.1
+8-4-2024 V1.17.2 Release 0.7.2
+Fixed some scripts for the Moduline Display
+
+25-3-2024 V1.17.1 Release 0.7.1
 Fixed the go-modules application for the Moduline Display
 
 12-3-2024 V1.17.0