From 6608a05d01a071aeede67719dac2c6eb124a796e Mon Sep 17 00:00:00 2001 From: Bennett L Date: Sat, 21 Mar 2020 13:16:55 -0600 Subject: [PATCH 1/5] Added Service And Modified Temp script --- Services/ArduinoTemp.service | 10 ++++++++++ TemperatureSensor/ArduinoTemp.py | 10 +++++----- 2 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 Services/ArduinoTemp.service mode change 100644 => 100755 TemperatureSensor/ArduinoTemp.py diff --git a/Services/ArduinoTemp.service b/Services/ArduinoTemp.service new file mode 100644 index 0000000..9360b96 --- /dev/null +++ b/Services/ArduinoTemp.service @@ -0,0 +1,10 @@ +#The Temperature Service +[Unit] +Description=Temperature Reading And Logging Script + +[Service] +Type=simple +Restart=always +User=pi +ExecStart=/home/pi/USST/New-Member-Project/TemperatureSensor/ArduinoTemp.py + diff --git a/TemperatureSensor/ArduinoTemp.py b/TemperatureSensor/ArduinoTemp.py old mode 100644 new mode 100755 index 787446e..b1d9dbd --- a/TemperatureSensor/ArduinoTemp.py +++ b/TemperatureSensor/ArduinoTemp.py @@ -1,8 +1,8 @@ +#!/usr/bin/env python3 import serial from datetime import datetime def parse(line): - inside1 = float(line[0]) inside2 = float(line[1]) inside3 = float(line[2]) @@ -32,10 +32,10 @@ def parse(line): while True: ready = False - read_serial = ser.readline() + read_serial = ser.readline() try: - decoded_serial = read_serial.decode('utf-8') - except Exception as e: + decoded_serial = read_serial.decode('utf-8') + except Exception as e: file = open("logFile.csv", "a") print(e) file.write(str(datetime.now()) + ", EXCEPTION OCCURRED: "+str(e) + "\n") @@ -43,7 +43,7 @@ def parse(line): continue serialHex = str(decoded_serial) line = serialHex.rstrip() - newLine = line.rsplit(",") + newLine = line.rsplit(",") ready = (len(newLine)==12) if ready: parse(newLine) From 7684a713c296ec1a606709ed5fb0f00d1d196963 Mon Sep 17 00:00:00 2001 From: Bennett L Date: Sat, 21 Mar 2020 14:00:59 -0600 Subject: [PATCH 2/5] Modified service and Script --- Services/ArduinoTemp.service | 3 +-- TemperatureSensor/ArduinoTemp.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Services/ArduinoTemp.service b/Services/ArduinoTemp.service index 9360b96..843ccba 100644 --- a/Services/ArduinoTemp.service +++ b/Services/ArduinoTemp.service @@ -1,4 +1,3 @@ -#The Temperature Service [Unit] Description=Temperature Reading And Logging Script @@ -6,5 +5,5 @@ Description=Temperature Reading And Logging Script Type=simple Restart=always User=pi -ExecStart=/home/pi/USST/New-Member-Project/TemperatureSensor/ArduinoTemp.py +ExecStart=/usr/bin/env python3 /home/pi/USST/New-Member-Project/TemperatureSensor/ArduinoTemp.py diff --git a/TemperatureSensor/ArduinoTemp.py b/TemperatureSensor/ArduinoTemp.py index b1d9dbd..f741072 100755 --- a/TemperatureSensor/ArduinoTemp.py +++ b/TemperatureSensor/ArduinoTemp.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python3 import serial from datetime import datetime From d904a0b1d6820125e717b9f896f304245c7435fb Mon Sep 17 00:00:00 2001 From: Bennett L Date: Sat, 21 Mar 2020 15:09:57 -0600 Subject: [PATCH 3/5] Added working temp service and updated logs to go to an absolute location --- Services/ArduinoTemp.service | 6 +++++- TemperatureSensor/ArduinoTemp.py | 9 +++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Services/ArduinoTemp.service b/Services/ArduinoTemp.service index 843ccba..32c1332 100644 --- a/Services/ArduinoTemp.service +++ b/Services/ArduinoTemp.service @@ -4,6 +4,10 @@ Description=Temperature Reading And Logging Script [Service] Type=simple Restart=always +RestartSec=10 User=pi -ExecStart=/usr/bin/env python3 /home/pi/USST/New-Member-Project/TemperatureSensor/ArduinoTemp.py +ExecStart=/home/pi/USST/New-Member-Project/TemperatureSensor/ArduinoTemp.py + +[Install] +WantedBy=multi-user.target diff --git a/TemperatureSensor/ArduinoTemp.py b/TemperatureSensor/ArduinoTemp.py index f741072..b5e65c7 100755 --- a/TemperatureSensor/ArduinoTemp.py +++ b/TemperatureSensor/ArduinoTemp.py @@ -1,7 +1,12 @@ #!/usr/bin/env python3 import serial +import os from datetime import datetime +HOME = os.path.expanduser('~') +LOGFILEPATH= HOME + "/Logs/tempLog.csv" + + def parse(line): inside1 = float(line[0]) inside2 = float(line[1]) @@ -22,7 +27,7 @@ def parse(line): log = str(timeStamp) + "," + str(inside1) + "," + str(inside2) + "," + str(inside3) + "," + str(inside4) + "," + str(outside1) + "," + str(outside2) + "," + str(outside3) + "," + str(outside4) + "," + str(insideAverage) + "," + str(outsideAverage) + "," + str(difference) + "," + str(concerning) + "\n" - file = open("logFile.csv", "a") + file = open(LOGFILEPATH, "a") file.write(log) file.close() @@ -36,7 +41,7 @@ def parse(line): try: decoded_serial = read_serial.decode('utf-8') except Exception as e: - file = open("logFile.csv", "a") + file = open(LOGFILEPATH, "a") print(e) file.write(str(datetime.now()) + ", EXCEPTION OCCURRED: "+str(e) + "\n") file.close() From eee4ed05ab53cc6d72043647480329fd8d5d950d Mon Sep 17 00:00:00 2001 From: Bennett L Date: Sat, 21 Mar 2020 15:13:23 -0600 Subject: [PATCH 4/5] Added Rover Controlling service --- Services/RoverControler.service | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 Services/RoverControler.service diff --git a/Services/RoverControler.service b/Services/RoverControler.service new file mode 100644 index 0000000..3a45ae4 --- /dev/null +++ b/Services/RoverControler.service @@ -0,0 +1,13 @@ +[Unit] +Description=Rover Controlling script + +[Service] +Type=simple +Restart=always +RestartSec=10 +User=pi +ExecStart=/home/pi/USST/New-Member-Project/Controller/MiniRoverController.py + +[Install] +WantedBy=multi-user.target + From 118e4076b71cc9e1490f0d5c09721dc31939745f Mon Sep 17 00:00:00 2001 From: Bennett L Date: Sat, 21 Mar 2020 15:19:38 -0600 Subject: [PATCH 5/5] Changed exe flag to py3 on controller script --- Controller/MiniRoverController.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 Controller/MiniRoverController.py diff --git a/Controller/MiniRoverController.py b/Controller/MiniRoverController.py old mode 100644 new mode 100755 index 399f061..7b67a9d --- a/Controller/MiniRoverController.py +++ b/Controller/MiniRoverController.py @@ -1,4 +1,4 @@ -#! /usr/bin/python +#!/usr/bin/env python3 from evdev import InputDevice, categorize, ecodes import RPi.GPIO as GPIO #setup of pins and config