From c7cc9c622d76c316e8b871094d1eec8ef7b038ae Mon Sep 17 00:00:00 2001
From: Catamine <kirsa@riseup.net>
Date: Thu, 4 Aug 2022 09:45:52 -0400
Subject: [PATCH] test
---
examples/lora_rangefinder/gps.py | 2 +-
examples/lora_rangefinder/lora.py | 10 +++++-----
examples/lora_rangefinder/main.py | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/examples/lora_rangefinder/gps.py b/examples/lora_rangefinder/gps.py
index c579d35..2b77aef 100644
--- a/examples/lora_rangefinder/gps.py
+++ b/examples/lora_rangefinder/gps.py
@@ -37,7 +37,7 @@ def getGPS(gpsModule = gpsModule, outtime = 8):
parts = buff.split(',')
if (parts[0] == "b'$GPGGA" and len(parts) == 15):
if(parts[1] and parts[2] and parts[3] and parts[4] and parts[5] and parts[6] and parts[7]):
-# print(buff)
+ print(buff)
parts[2] = convertToDegree(parts[2])
parts[4] = convertToDegree(parts[4])
altitude = parts[6]
diff --git a/examples/lora_rangefinder/lora.py b/examples/lora_rangefinder/lora.py
index ee55832..48de2f4 100644
--- a/examples/lora_rangefinder/lora.py
+++ b/examples/lora_rangefinder/lora.py
@@ -5,12 +5,12 @@ from sx127x import SX127x
import time
lora_default = {
- 'frequency': 418500000,
+ 'frequency': 417500000,
'frequency_offset':0,
- 'tx_power_level': 1,
+ 'tx_power_level': 15,
'signal_bandwidth': 250e3,
- 'spreading_factor': 9,
- 'coding_rate': 8,
+ 'spreading_factor': 7,
+ 'coding_rate': 6,
'preamble_length': 8,
'implicitHeader': False,
'sync_word': 0x12,
@@ -41,7 +41,7 @@ def loraRX():
payload = lora.readPayload().decode()
rssi = lora.packetRssi()
snr = lora.packetSnr()
- #print("RX: {} | RSSI: {} | SNR: {}".format(payload, rssi, snr))
+ print("RX: {} | RSSI: {} | SNR: {}".format(payload, rssi, snr))
parts = payload.split()
rx = {'time': curTime, 'team': parts[0],'name': parts[1],'long': parts[3],'lat': parts[2], 'alt': parts[4],'sats': parts[5], 'err': parts[6], 'seq': parts[7], 'rssi': rssi, 'snr': snr}
return rx
diff --git a/examples/lora_rangefinder/main.py b/examples/lora_rangefinder/main.py
index 3c54887..a4d5ab6 100644
--- a/examples/lora_rangefinder/main.py
+++ b/examples/lora_rangefinder/main.py
@@ -15,8 +15,8 @@ display = ssd1306.SSD1306_I2C(128, 64, i2c)
fix = {'time': 0, 'long':0.0, 'lat':0.0, 'alt':0.0, 'sats':0, 'err':0}
maxStale = 60
-team = 'green'
-name = 'fox'
+team = 'animals'
+name = 'crab'
seq = 0
lastTX = 0
rx = {'time': 0, 'team':'', 'name':'','long':'','lat':'', 'alt':'','sats':'', 'err':'', 'seq':'', 'rssi':'', 'snr':''}
@@ -28,13 +28,13 @@ def get_sec(time_str):
time = rtc.datetime()
h = time[0][3]
m = time[0][4]
- s = time[0][5]
+ s = time[0 ][5]
return int(h) * 3600 + int(m) * 60 + int(s)
def gps():
global fix
while True:
- parts = getGPS()
+ parts = getGPS(outtime = 16)
if type(parts) is list and float(parts[8]) <= 10.0:
fix['time'] = time.time()
fix['lat'] = parts[2]
--
GitLab