diff --git a/.modbus_door.py.swp b/.modbus_door.py.swp deleted file mode 100644 index 702c781..0000000 Binary files a/.modbus_door.py.swp and /dev/null differ diff --git a/gps001.py b/gps001.py index 1a80641..ed3050d 100755 --- a/gps001.py +++ b/gps001.py @@ -12,7 +12,7 @@ from datetime import datetime GPIO.setmode(GPIO.BCM) GPIO.setwarnings(False) -ser = serial.Serial('/dev/ttyS0', 115200) +ser = serial.Serial('/dev/ttyUSB3', 115200) ser.flushInput() rec_buff = '' diff --git a/gps01.py b/gps01.py index 57a64ef..b1d7ed7 100755 --- a/gps01.py +++ b/gps01.py @@ -11,7 +11,7 @@ from datetime import datetime GPIO.setmode(GPIO.BCM) GPIO.setwarnings(False) -ser = serial.Serial('/dev/ttyS0',115200) +ser = serial.Serial('/dev/ttyUSB3',115200) ser.flushInput() rec_buff = '' diff --git a/gps_data_raspberrypi.csv b/gps_data_raspberrypi.csv index 28d73ee..3619008 100644 --- a/gps_data_raspberrypi.csv +++ b/gps_data_raspberrypi.csv @@ -9800,3 +9800,47 @@ Timestamp,Latitude,Longitude 2024-07-24 19:01:27,9.939978,-84.104878 2024-07-24 19:01:53,9.939978,-84.104878 2024-07-24 19:02:08,9.939978,-84.104878 +2024-07-24 19:16:54,9.938575,84.100955 +2024-07-24 19:17:09,9.939665,-84.104121 +2024-07-24 19:17:24,9.939742,-84.104358 +2024-07-24 19:17:39,9.939858,-84.104587 +2024-07-24 19:17:54,9.939880,-84.104724 +2024-07-24 19:18:09,9.939890,-84.104747 +2024-07-24 19:18:23,9.939891,-84.104748 +2024-07-24 19:18:24,9.939891,-84.104749 +2024-07-24 19:18:38,9.939891,-84.104750 +2024-07-24 19:18:39,9.939891,-84.104750 +2024-07-24 19:18:53,9.939891,-84.104751 +2024-07-24 19:18:54,9.939891,-84.104751 +2024-07-24 19:19:08,9.939891,-84.104752 +2024-07-24 19:19:09,9.939892,-84.104752 +2024-07-24 19:19:24,9.939892,-84.104754 +2024-07-24 19:19:39,9.939892,-84.104755 +2024-07-24 19:19:54,9.939892,-84.104757 +2024-07-24 19:20:09,9.939894,-84.104768 +2024-07-24 19:20:24,9.939907,-84.104795 +2024-07-24 19:20:39,9.939919,-84.104824 +2024-07-24 19:20:54,9.939921,-84.104825 +2024-07-24 19:21:09,9.939921,-84.104825 +2024-07-24 19:21:25,9.939921,-84.104826 +2024-07-24 19:21:40,9.939921,-84.104826 +2024-07-24 19:21:55,9.939921,-84.104826 +2024-07-24 19:22:10,9.939921,-84.104827 +2024-07-24 19:22:25,9.939921,-84.104827 +2024-07-24 19:24:21,9.939949,-84.105015 +2024-07-24 19:24:36,9.939950,-84.104943 +2024-07-24 19:24:51,9.939949,-84.104944 +2024-07-24 19:25:06,9.939949,-84.104943 +2024-07-24 19:25:21,9.939949,-84.104941 +2024-07-24 19:25:36,9.939949,-84.104940 +2024-07-24 19:31:49,9.939910,-84.104871 +2024-07-24 19:32:04,9.939921,-84.104881 +2024-07-24 19:32:19,9.939922,-84.104880 +2024-07-24 19:32:34,9.939922,-84.104880 +2024-07-24 19:32:49,9.939922,-84.104880 +2024-07-24 19:33:04,9.939922,-84.104880 +2024-07-24 19:33:19,9.939922,-84.104880 +2024-07-24 19:33:20,9.939922,-84.104880 +2024-07-24 19:33:34,9.939922,-84.104880 +2024-07-24 19:33:49,9.939921,-84.104880 +2024-07-24 19:34:04,9.939921,-84.104879 diff --git a/modbus_door.py b/modbus_door.py index 0d778bd..8be1e62 100644 --- a/modbus_door.py +++ b/modbus_door.py @@ -12,8 +12,8 @@ myhost = os.uname()[1] client = mqtt.Client(myhost) client.connect(mqttBroker, 1883) -preferred_device = '/dev/ttyUSB0' -fallback_device = '/dev/ttyUSB5' +preferred_device = '/dev/ttyUSB5' +fallback_device = '/dev/ttyUSB0' device_path = preferred_device if os.path.exists(preferred_device) else fallback_device