Merge branch 'master' of https://github.com/dexterind/RFR_Tools

DexterInd · Nov 9, 2021 · 77c0f1c · 77c0f1c
2 parents 1bbe628 + 12b4a89
commit 77c0f1c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/Scratch_GUI/Scratch_Start.desktop b/Scratch_GUI/Scratch_Start.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Version=1.0
 Type=Application
-Exec=python /home/pi/Dexter/lib/Dexter/Scratch_GUI/Scratch_Start.py
+Exec=/usr/bin/python2 /home/pi/Dexter/lib/Dexter/Scratch_GUI/Scratch_Start.py
 Icon=/usr/share/scratch/Media/Costumes/Animals/cat1-b.gif
 Terminal=false
 Name=Scratch for Robots

diff --git a/Troubleshooting_GUI/Troubleshooting_Start.desktop b/Troubleshooting_GUI/Troubleshooting_Start.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Version=1.0
 Type=Application
 Exec=xhost +
-Exec=python /home/pi/Dexter/lib/Dexter/Troubleshooting_GUI/troubleshoot.py
+Exec=/usr/bin/python2 /home/pi/Dexter/lib/Dexter/Troubleshooting_GUI/troubleshoot.py
 Icon=/home/pi/Dexter/lib/Dexter/RFR_Tools/icons/DXT_Icon_64x64_Test.png
 Terminal=false
 Name=Test and Troubleshoot

diff --git a/advanced_communication_options/advanced_comms_options.desktop b/advanced_communication_options/advanced_comms_options.desktop
@@ -4,5 +4,5 @@ Type=Application
 Name=Advanced Communication Options
 Comment=Line Follower Calibration
 Icon=/usr/share/icons/gnome/256x256/status/gnome-netstatus-tx.png
-Exec=sudo python /home/pi/Dexter/lib/Dexter/advanced_communication_options/advanced_communication_options.py
-NoDisplay=true
+Exec=sudo /usr/bin/python2 /home/pi/Dexter/lib/Dexter/advanced_communication_options/advanced_communication_options.py
+NoDisplay=true
diff --git a/miscellaneous/auto_detect_rpi.py b/miscellaneous/auto_detect_rpi.py
@@ -86,23 +86,30 @@
 "a22082" : ["Pi 3 Model B v1.2", "RPI3"],
 "a32082" : ["Pi 3 Model B v1.2", "RPI3"],
 "a52082" : ["Pi 3 Model B v1.2", "RPI3"],
-
 "a22083" : ["Pi 3 Model B v1.3", "RPI3"],
 
-"a020a0" : ["Compute Module 3 v1.0", "RPI-COMPUTE-MODULE3"],
-
 "a020d3" : ["Pi 3 Model B+ v1.3", "RPI3B+"],
 
 "9020e0" : ["Pi 3 Model A+ v1.0", "RPI3A+"],
 
+"a03111" : ["Pi 4 Model B 1G v1.1", "RPI4"],
+"b03111" : ["Pi 4 Model B 2G v1.1", "RPI4"],
+"b03112" : ["Pi 4 Model B 2G v1.2", "RPI4"],
+"b03114" : ["Pi 4 Model B 2G v1.4", "RPI4"],
+"c03111" : ["Pi 4 Model B 4G v1.1", "RPI4"],
+"c03112" : ["Pi 4 Model B 4G v1.2", "RPI4"],
+"c03114" : ["Pi 4 Model B 4G v1.4", "RPI4"],
+"d03114" : ["Pi 4 Model B 8G v1.4", "RPI4"],
+
+"c03130" : ["Pi 400 v1.0", "RPI400"],
+
+"a020a0" : ["Compute Module 3 v1.0", "RPI-COMPUTE-MODULE3"],
 "a02100" : ["Compute Module 3+ v1.0", "RPI-COMPUTE-MODULE3"],
-
-"a03111" : ["Pi 4 Model B 1G", "RPI4"],
-"b03111" : ["Pi 4 Model B 2G", "RPI4"],
-"b03112" : ["Pi 4 Model B 2G", "RPI4"],
-"c03111" : ["Pi 4 Model B 4G", "RPI4"],
-"c03112" : ["Pi 4 Model B 4G", "RPI4"],
-"d03114" : ["Pi 4 Model B 8G", "RPI4"]
+
+"a03140" : ["Compute Module 4 1G v1.0", "RPI-COMPUTE-MODULE4"],
+"b03140" : ["Compute Module 4 2G v1.0", "RPI-COMPUTE-MODULE4"],
+"c03140" : ["Compute Module 4 4G v1.0", "RPI-COMPUTE-MODULE4"],
+"d03140" : ["Compute Module 4 8G v1.0", "RPI-COMPUTE-MODULE4"]
 }
 
 # represents indexes for each corresponding key in the above dictionary