[ubseds16] set callsign, telemetry format

main-solar-only
Richard Meadows 2016-07-18 18:10:32 +01:00
rodzic 638aae26bd
commit f41936c8de
3 zmienionych plików z 9 dodań i 7 usunięć

Wyświetl plik

@ -28,7 +28,7 @@ PROJECT_NAME := pico
# The exact chip being built for.
#
TARGET_CHIP := SAMD20E18
TARGET_CHIP := SAMD20E17
# Compiliation Flags
#

Wyświetl plik

@ -162,7 +162,7 @@
*
* Disable this when there's no antenna connected
*/
#define RF_TX_ENABLE 0
#define RF_TX_ENABLE 1
/**
* LF Clock
@ -181,8 +181,9 @@
/**
* Telemetry
*/
#define TELEMETRY_ENABLE 1
#define TELEMETRY_USE_GEOFENCE 0
#define TELEMETRY_FREQUENCY 434602000
#define TELEMETRY_FREQUENCY 434612500
#define TELEMETRY_POWER RF_POWER_8dBm
/**

Wyświetl plik

@ -75,15 +75,16 @@ uint16_t format_telemetry_string(char* string, struct tracker_datapoint* dp,
/* sprintf - full string (approx 90 chars) */
len += sprintf(string + len,
// "%s,%02u:%02u:%02u,%02u%02u%02u,%02.4f,%03.4f,%ld,%u,%u,%.2f,%.1f,%.1f",
"%s,%02u:%02u:%02u,%02u%02u%02u,%02.4f,%03.4f,%ld,%u,%u,%.2f,%.2f,%.1f,%.1f",
// "%s,%02u:%02u:%02u,%02u%02u%02u,%02.4f,%03.4f,%ld,%u,%u,%.2f,%.2f,%.1f,%.1f",
"%s,%02u:%02u:%02u,%02u%02u%02u,%02.4f,%03.4f,%ld,%u,%.2f,%.1f",
CALLSIGN, /* 2+6+2+1=11 */
dp->time.hour, dp->time.minute, dp->time.second, /* 2+1+2+1+2+1=9 */
dp->time.year%100, dp->time.month, dp->time.day, /* 2+2+2+1=7 */
lat_fmt, lon_fmt, altitude, dp->satillite_count, /* 3+1+4+1 + 4+1+4+1 + 5+1 + 2+1 = 28 */
dp->time_to_first_fix, /* 2+1 = 3 */
// dp->time_to_first_fix, /* 2+1 = 3 */
dp->battery, /* 1+1+2+1 = 5 */
dp->solar, /* 1+1+2+1 = 5 */
dp->thermistor_temperature, /* 3+1+1+1 = 6 */
// dp->solar, /* 1+1+2+1 = 5 */
// dp->thermistor_temperature, /* 3+1+1+1 = 6 */
dp->radio_die_temperature); /* 3+1+1+1 = 6 */
/* sum = 80 (must be less than or equal to 114) */