From 2766c2c95236167562689d9d918b2405eafc25b0 Mon Sep 17 00:00:00 2001 From: Richard Meadows Date: Fri, 29 Jul 2016 11:25:23 +0100 Subject: [PATCH] [ubseds16] set cycle time to always be 30 seconds --- firmware/inc/hw_config/main-aaa-uhf.h | 4 ++-- firmware/src/main.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/firmware/inc/hw_config/main-aaa-uhf.h b/firmware/inc/hw_config/main-aaa-uhf.h index 68eb700..2a158b3 100644 --- a/firmware/inc/hw_config/main-aaa-uhf.h +++ b/firmware/inc/hw_config/main-aaa-uhf.h @@ -123,8 +123,8 @@ /** * Cycle Times */ -#define CYCLE_TIME_FAST (0) /* shortest hibernate */ -#define CYCLE_TIME_SLOW (100) /* once every two minutes */ +#define CYCLE_TIME_FAST (30) /* always 30 seconds */ +#define CYCLE_TIME_SLOW (30) /** * Radio diff --git a/firmware/src/main.c b/firmware/src/main.c index 7103e1a..ac56bab 100644 --- a/firmware/src/main.c +++ b/firmware/src/main.c @@ -76,7 +76,7 @@ uint16_t format_telemetry_string(char* string, struct tracker_datapoint* dp, 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,%.2f,%.1f", + "%s,%02u:%02u:%02u,%02u%02u%02u,%02.4f,%03.4f,%ld,%u,%.2f,%.1f,%ld", 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 */ @@ -85,7 +85,8 @@ uint16_t format_telemetry_string(char* string, struct tracker_datapoint* dp, dp->battery, /* 1+1+2+1 = 5 */ // dp->solar, /* 1+1+2+1 = 5 */ // dp->thermistor_temperature, /* 3+1+1+1 = 6 */ - dp->radio_die_temperature); /* 3+1+1+1 = 6 */ + dp->radio_die_temperature, /* 3+1+1+1 = 6 */ + dp->xosc_error); /* sum = 80 (must be less than or equal to 114) */ if (reduce_char_set) {