Better Firmware version detection. Detect LAN mode while proxying. Get device_id from a better location

Author: jbatonnet

files/4-rinkhals/chroot-start.sh

@@ -45,6 +45,10 @@ mkdir -p /userdata/app/gk/printer_data
 umount /userdata/app/gk/printer_data 2> /dev/null
 mount --bind /home/rinkhals/printer_data /userdata/app/gk/printer_data
 
+mkdir -p /userdata/app/gk/printer_data/gcodes
+umount /userdata/app/gk/printer_data/gcodes 2> /dev/null
+mount --bind /useremain/app/gk/gcodes /userdata/app/gk/printer_data/gcodes
+
 kill_by_name moonraker.py
 HOME=/userdata/app/gk /usr/bin/python /usr/share/moonraker/moonraker/moonraker.py >> /moonraker.log &
 check_by_name moonraker.py

files/4-rinkhals/start.sh

@@ -61,7 +61,7 @@ echo "    ██░░░░░░░░░░░░░░░░░░███
 echo "      ██████████████████    ██    "
 echo
 
-export KOBRA_VERSION=`cat /userdata/app/gk/version_log.txt | grep version | awk '{print $2}'`
+export KOBRA_VERSION=`cat /useremain/dev/version`
 export RINKHALS_VERSION=`cat .version`
 export RINKHALS_ROOT=`pwd`
 
@@ -72,11 +72,17 @@ log "| Rinkhals root: $RINKHALS_ROOT"
 log " --------------------------------------------------"
 echo
 
-if [[ "$KOBRA_VERSION" != "2.3.5.3" ]]; then
-    log This Rinkhals version is only compatible with Kobra firmware 2.3.5.3, stopping startup
+if [ "$KOBRA_VERSION" != "2.3.5.3" ]; then
+    log "This Rinkhals version is only compatible with Kobra firmware 2.3.5.3, stopping startup"
     exit 1
 fi
 
+REMOTE_MODE=`cat /useremain/dev/remote_ctrl_mode`
+if [ "$REMOTE_MODE" != "lan" ]; then
+    log "LAN mode is disabled, some functions might not work properly"
+fi
+
+
 export INTERPRETER=$RINKHALS_ROOT/lib/ld-linux-armhf.so.3
 touch /useremain/rinkhals/.disable-rinkhals
 
@@ -182,6 +188,10 @@ mkdir -p /userdata/app/gk/printer_data
 umount /userdata/app/gk/printer_data 2> /dev/null
 mount --bind ./home/rinkhals/printer_data /userdata/app/gk/printer_data
 
+mkdir -p /userdata/app/gk/printer_data/gcodes
+umount /userdata/app/gk/printer_data/gcodes 2> /dev/null
+mount --bind /useremain/app/gk/gcodes /userdata/app/gk/printer_data/gcodes
+
 chmod +x chroot-start.sh
 chroot $(pwd) /bin/ash chroot-start.sh
 

files/4-rinkhals/stop.sh

@@ -11,7 +11,7 @@ function kill_by_name() {
 
         if echo "$CMDLINE" | grep -q "${*}"; then
             log "Killing $PID ($CMDLINE)"
-            kill $PID
+            kill -9 $PID
         fi
     done
 }
@@ -32,6 +32,8 @@ kill_by_name moonraker-proxy.py
 kill_by_name nginx
 kill_by_name mjpg_streamer
 
+sleep 5
+
 
 ################
 log "> Cleaning chroot..."

files/4-rinkhals/usr/share/scripts/moonraker-proxy.py

@@ -21,6 +21,7 @@
 PRINTER_ID = os.getenv('MOONRAKER_PROXY_PRINTER_ID')
 MQTT_USERNAME = os.getenv('MOONRAKER_PROXY_MQTT_USERNAME')
 MQTT_PASSWORD = os.getenv('MOONRAKER_PROXY_MQTT_PASSWORD')
+REMOTE_MODE = 'lan'
 
 # Constants
 CORS_HEADERS = {
@@ -63,7 +64,7 @@ async def client_loop():
                         if "method" in data:
                             #print(data["method"]) 
 
-                            if data["method"] == "printer.print.start":
+                            if data["method"] == "printer.print.start" and REMOTE_MODE == 'lan':
 
                                 payload = """{{
                                     "type": "print",
@@ -118,20 +119,27 @@ async def start_server():
 
 if __name__ == "__main__":
 
+    # We should use internal MQTT only if LAN mode is enabled
+    with open('/useremain/dev/remote_ctrl_mode', 'r') as f:
+        REMOTE_MODE = f.read().strip()
+
     # Retrieve printer information
-    if not PRINTER_ID or not MQTT_USERNAME or not MQTT_PASSWORD:
+    if not MQTT_USERNAME or not MQTT_PASSWORD:
 
         with open('/userdata/app/gk/config/device_account.json', 'r') as f:
             json_data = f.read()
             data = json.loads(json_data)
 
-            if not PRINTER_ID:
-                PRINTER_ID = data['deviceId']
             if not MQTT_USERNAME:
                 MQTT_USERNAME = data['username']
             if not MQTT_PASSWORD:
                 MQTT_PASSWORD = data['password']
 
+    if not PRINTER_ID:
+
+        with open('/useremain/dev/device_id', 'r') as f:
+            PRINTER_ID = f.read().strip()
+
     # Start asynchonous server
     loop = asyncio.get_event_loop()
     loop.run_until_complete(start_server())

files/update.sh

@@ -64,7 +64,7 @@ progress 0
 
 
 # Make sure we install on the right compatible version
-KOBRA_VERSION=`cat /userdata/app/gk/version_log.txt | grep version | awk '{print $2}'`
+KOBRA_VERSION=`cat /useremain/dev/version`
 
 if [[ "$KOBRA_VERSION" != "2.3.5.3" ]]; then
     log "This Rinkhals version is only compatible with Kobra firmware 2.3.5.3, stopping installation"