mirror
/
pecanpico10
kopia lustrzana https://github.com/DL7AD/pecanpico10
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Add more commentary to config.c & only allow DIGI BCN when RX & DIGI

pull/4/head
bob 2018-06-22 18:45:26 +10:00
rodzic e20c1bc582
commit 12d6931a62
2 zmienionych plików z 14 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

14
tracker/software/source/config/config.c
Wyświetl plik

@ -16,7 +16,7 @@ const conf_t conf_flash_default = {
.active = true,
.cycle = TIME_S2I(60 * 5),
.init_delay = TIME_S2I(60),
.fixed = false
.fixed = false // Add lat, lon alt fields if enabling fixed
},
.radio_conf = {
.pwr = 0x7F,
@ -28,7 +28,7 @@ const conf_t conf_flash_default = {
.call = "VK2GJ-12",
.path = "WIDE1-1",
.symbol = SYM_ANTENNA,
.aprs_msg = true,
.aprs_msg = true, // Set true to enable APRS messages to be accepted on this call sign
},
// Secondary position app
@ -37,7 +37,7 @@ const conf_t conf_flash_default = {
.active = false,
.cycle = TIME_S2I(180),
.init_delay = TIME_S2I(60),
.fixed = false
.fixed = false // Add lat, lon alt fields if enabling fixed
},
.radio_conf = {
.pwr = 0x7F,
@ -49,7 +49,7 @@ const conf_t conf_flash_default = {
.call = "VK2GJ-15",
.path = "",
.symbol = SYM_BALLOON,
.aprs_msg = true,
.aprs_msg = true,// Set true to enable APRS messages to be accepted on this call sign
},
// Primary image app
@ -140,7 +140,8 @@ const conf_t conf_flash_default = {
},
// APRS identity used in message responses if digipeat is not enabled
.call = "VK2GJ-4",
.symbol = SYM_ANTENNA
.symbol = SYM_ANTENNA,
.aprs_msg = false,
},
.digi = true,
.tx = {
@ -155,7 +156,6 @@ const conf_t conf_flash_default = {
.call = "VK2GJ-5",
.path = "WIDE2-1",
.symbol = SYM_DIGIPEATER,
.aprs_msg = true,
.beacon = {
// The telemetry beacon service is enabled if true when RX and DIGI are enabled
// Receive is resumed after any transmission
@ -175,7 +175,7 @@ const conf_t conf_flash_default = {
// Power control
.keep_cam_switched_on = false,
.gps_on_vbat = 3800, // mV
.gps_off_vbat = 3600, // mV
.gps_off_vbat = 3400, // mV
.gps_onper_vbat = 4000, // mV
// GPS altitude model control (air pressure determined by on-board BME280)

12
tracker/software/source/threads/collector.c
Wyświetl plik

@ -483,7 +483,7 @@ THD_FUNCTION(collectorThread, arg) {
* Update set fixed position.
* Time will be set in data below.
*/
TRACE_INFO("COLL > Using fixed location");
TRACE_INFO("COLL > Using fixed location for %s", config->call);
tp->gps_alt = config->beacon.alt;
tp->gps_lat = config->beacon.lat;
tp->gps_lon = config->beacon.lon;
@ -503,16 +503,18 @@ THD_FUNCTION(collectorThread, arg) {
"%s Time %04d-%02d-%02d %02d:%02d:%02d\r\n"
"%s Pos %d.%05d %d.%05d Alt %dm\r\n"
"%s Sats %d TTFF %dsec\r\n"
"%s ADC Vbat=%d.%03dV Vsol=%d.%03dV Pbat=%dmW\r\n"
"%s AIR p=%d.%01dPa T=%d.%02ddegC phi=%d.%01d%%\r\n"
"%s IOP IO1=%d IO2=%d IO3=%d IO4=%d",
"%s ADC Vbat=%d.%03dV Vsol=%d.%03dV Pbat=%dmW\r\n"
"%s AIR p=%d.%01dPa T=%d.%02ddegC phi=%d.%01d%%\r\n"
"%s IOP IO1=%d IO2=%d IO3=%d IO4=%d\r\n"
"%s STN %s",
tp->id, tp->gps_state,
TRACE_TAB, time.year, time.month, time.day, time.hour, time.minute, time.day,
TRACE_TAB, tp->gps_lat/10000000, (tp->gps_lat > 0 ? 1:-1)*(tp->gps_lat/100)%100000, tp->gps_lon/10000000, (tp->gps_lon > 0 ? 1:-1)*(tp->gps_lon/100)%100000, tp->gps_alt,
TRACE_TAB, tp->gps_sats, tp->gps_ttff,
TRACE_TAB, tp->adc_vbat/1000, (tp->adc_vbat%1000), tp->adc_vsol/1000, (tp->adc_vsol%1000), tp->pac_pbat,
TRACE_TAB, tp->sen_i1_press/10, tp->sen_i1_press%10, tp->sen_i1_temp/100, tp->sen_i1_temp%100, tp->sen_i1_hum/10, tp->sen_i1_hum%10,
TRACE_TAB, tp->gpio & 1, (tp->gpio >> 1) & 1, (tp->gpio >> 2) & 1, (tp->gpio >> 3) & 1
TRACE_TAB, tp->gpio & 1, (tp->gpio >> 1) & 1, (tp->gpio >> 2) & 1, (tp->gpio >> 3) & 1,
TRACE_TAB, config->call
);
// Write data point to Flash memory