Merge branch 'main' of https://git.cardiff.ac.uk/c23072833/cm2305

physical/lcd_display.py

 #!/usr/bin/env python3
 import time
 import sys
-import smbus
+import smbus2 as smbus
 import RPi.GPIO as GPIO
 
 # Determine the Raspberry Pi revision and assign the correct I2C bus.

physical/node-red/node-red-flow.json

@@ -113,7 +113,7 @@
         "z": "82313dad63d1abd7",
         "name": "",
         "pauseType": "delay",
-        "timeout": "3",
+        "timeout": "3.5",
         "timeoutUnits": "seconds",
         "rate": "1",
         "nbRateUnits": "1",
@@ -124,7 +124,7 @@
         "drop": false,
         "allowrate": false,
         "outputs": 1,
-        "x": 1260,
+        "x": 1270,
         "y": 220,
         "wires": [
             [
@@ -368,7 +368,7 @@
         "z": "82313dad63d1abd7",
         "name": "",
         "pauseType": "delay",
-        "timeout": "3",
+        "timeout": "3.5",
         "timeoutUnits": "seconds",
         "rate": "1",
         "nbRateUnits": "1",
@@ -379,7 +379,7 @@
         "drop": false,
         "allowrate": false,
         "outputs": 1,
-        "x": 1260,
+        "x": 1270,
         "y": 460,
         "wires": [
             [
@@ -757,7 +757,7 @@
         "type": "function",
         "z": "82313dad63d1abd7",
         "name": "StopSensingCommand",
-        "func": "// Send \"SERVO [angle]\" to Arduino\nmsg.payload = \"STOP SENSING\\n\";\nreturn msg;\n",
+        "func": "// Send command to stop motion sensing\nmsg.payload = \"STOP SENSING\\n\";\nreturn msg;\n",
         "outputs": 1,
         "timeout": 0,
         "noerr": 0,
@@ -787,7 +787,7 @@
         "type": "function",
         "z": "82313dad63d1abd7",
         "name": "StopSensingCommand",
-        "func": "// Send \"SERVO [angle]\" to Arduino\nmsg.payload = \"STOP SENSING\\n\";\nreturn msg;\n",
+        "func": "// Send command to stop motion sensing\nmsg.payload = \"STOP SENSING\\n\";\nreturn msg;\n",
         "outputs": 1,
         "timeout": 0,
         "noerr": 0,
@@ -807,7 +807,7 @@
         "type": "function",
         "z": "82313dad63d1abd7",
         "name": "StartSensingCommand",
-        "func": "// Send \"SERVO [angle]\" to Arduino\nmsg.payload = \"START SENSING\\n\";\nreturn msg;\n",
+        "func": "// Send command to start motion sensing\nmsg.payload = \"START SENSING\\n\";\nreturn msg;\n",
         "outputs": 1,
         "timeout": 0,
         "noerr": 0,
@@ -838,7 +838,7 @@
         "z": "82313dad63d1abd7",
         "name": "",
         "pauseType": "delay",
-        "timeout": "5",
+        "timeout": "3.5",
         "timeoutUnits": "seconds",
         "rate": "1",
         "nbRateUnits": "1",
@@ -849,7 +849,7 @@
         "drop": false,
         "allowrate": false,
         "outputs": 1,
-        "x": 380,
+        "x": 390,
         "y": 420,
         "wires": [
             [

pi/requirements.txt

@@ -37,3 +37,5 @@ typing-inspect==0.9.0
 typing_extensions==4.13.0
 urllib3==2.3.0
 yarl==1.18.3
+smbus2=0.5.0
+RPi.GPIO==0.7.1