mirror
/
pico-tracker
kopia lustrzana https://github.com/bristol-seds/pico-tracker
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

[ubseds18] config changes

main-solar-only
Richard Meadows 2016-08-16 19:52:52 +01:00
rodzic f105547daf
commit 54f313ed3e
2 zmienionych plików z 36 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

16
firmware/inc/hw_config/main-solar-only.h
Wyświetl plik

@ -98,11 +98,11 @@
/**
* External Thermistor ADC
*/
#define THERMISTOR_ADC 0
#define THERMISTOR_ADC 1
#define THERMISTOR_ADC_PIN PIN_PA03
#define THERMISTOR_ADC_PINMUX PINMUX_PA03
#define THERMISTOR_ADC_CHANNEL ADC_POSITIVE_INPUT_PIN1
#define THERMISTOR_ADC_CHANNEL_DIV 1
#define THERMISTOR_ADC_CHANNEL_DIV 1.48
#define THERMISTOR_ADC_REFERENCE ADC_REFERENCE_INTVCC0 /* internal 1/1.48 VCC reference */
/**
@ -120,11 +120,19 @@
*/
#define RECHARGABLE_BATTERY 0
/**
* Cold out
*/
#define COLD_OUT_BATTERY_V (2.2)
#define COLD_OUT_SECONDS (5*60) /* 5 minutes */
#define COLD_OUT_COUNT_MAX (12) /* up to 1 hour */
/**
* Cycle Times
*/
#define CYCLE_TIME_FAST (30) /* always 30 seconds */
#define CYCLE_TIME_SLOW (30)
#define CYCLE_TIME_FAST (60) /* always 60 seconds */
#define CYCLE_TIME_SLOW (60)
/**
* Radio

26
firmware/tools/aprs/telemetry_format.py
Wyświetl plik

@ -8,7 +8,7 @@ class telemetry_format_ssid:
if ssid == '11':
self.flight_nr = 15
if ssid == '12':
self.flight_nr = 17
self.flight_nr = 18
else:
raise ValueError("Telemetry format does not know about this ssid!")
@ -32,6 +32,11 @@ class telemetry_format_ssid:
"EQNS.0,.001,0,0,.001,0,0,.1,-273.2,0,.1,-273.2"]
elif self.flight_nr in [18]:
return ["PARM.Battery,External Temperature,Internal Temperature,GPS Satellites",
"UNIT.Volts,Celsius,Celcius",
"EQNS.0,.001,0,0,.1,-273.2,0,.1,-273.2"]
elif self.flight_nr in [19]:
return ["PARM.Battery,Internal Temperature,GPS Satellites,BTRFS Errors",
"UNIT.Volts,Celcius",
"EQNS.0,.001,0,0,.1,-273.2"]
@ -51,6 +56,8 @@ class telemetry_format_ssid:
return 10 # 5 analogue values
elif self.flight_nr in [18]:
return 8 # 4 analogue values
elif self.flight_nr in [19]:
return 8 # 4 analogue values
else:
raise ValueError("baseb91_encode_len does not know about this flight!")
@ -74,7 +81,14 @@ class telemetry_format_ssid:
'temperature_i': (values[3] / 10.0) - 273.2, # dK -> degC
'ttff': (values[4])
}
if self.flight_nr in [18]:
elif self.flight_nr in [18]:
self.datum = {
'battery': (values[0] / 1000.0), # mV -> V
'temperature_e': (values[1] / 10.0) - 273.2, # dK -> degC
'temperature_i': (values[2] / 10.0) - 273.2, # dK -> degC
'satellites': (values[3]),
}
elif self.flight_nr in [19]:
self.datum = {
'battery': (values[0] / 1000.0), # mV -> V
'temperature_i': (values[1] / 10.0) - 273.2, # dK -> degC
@ -101,6 +115,10 @@ class telemetry_format_ssid:
"{temperature_e},{temperature_i}").format(**datum)
elif self.flight_nr in [18]:
return ("{satellites},{battery},"
"{temperature_e},{temperature_i},-1,-1").format(**datum)
elif self.flight_nr in [19]:
return ("{satellites},{battery},"
"{temperature_i},{btrfs_errors}").format(**datum)
else:
@ -121,6 +139,10 @@ class telemetry_format_ssid:
"ttff {ttff}").format(**datum)
elif self.flight_nr in [18]:
return ("{battery}V {temperature_e}C {temperature_i}C "
"sats {satellites}").format(**datum)
elif self.flight_nr in [19]:
return ("{battery}V {temperature_i}C "
"sats {satellites} btrfs {btrfs_errors}").format(**datum)
else: