From 0d367fc24bfd0377db6f3b00a888a18245616767 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 5 Apr 2014 00:18:57 -0700 Subject: altos: Report battery voltage instead of S at startup This works on everything with a beeper except TeleMetrum v1.0 which just doesn't have enough flash space for the code. Signed-off-by: Keith Packard --- src/telemega-v1.0/ao_pins.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/telemega-v1.0') diff --git a/src/telemega-v1.0/ao_pins.h b/src/telemega-v1.0/ao_pins.h index fe97c684..7f0b1f94 100644 --- a/src/telemega-v1.0/ao_pins.h +++ b/src/telemega-v1.0/ao_pins.h @@ -71,6 +71,7 @@ #define USE_STORAGE_CONFIG 0 #define HAS_USB 1 #define HAS_BEEP 1 +#define HAS_BATTERY_REPORT 1 #define HAS_RADIO 1 #define HAS_TELEMETRY 1 #define HAS_APRS 1 -- cgit v1.2.3 From b278a73cb54ba2f107bf91089f87c11528f017ab Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 21 May 2014 01:41:38 -0700 Subject: altos/stm: Make stm applications depend on ao_boot.h This should make sure they get recompiled when boot stuff changes. Signed-off-by: Keith Packard --- src/easymega-v0.1/Makefile | 1 + src/megadongle-v0.1/Makefile | 1 + src/stm-demo/Makefile | 1 + src/stm-flash/Makefile | 1 + src/teleballoon-v2.0/Makefile | 1 + src/telegps-v0.1/Makefile | 1 + src/telelco-v0.1/Makefile | 1 + src/telelco-v0.2/Makefile | 1 + src/telemega-v1.0/Makefile | 1 + src/telemetrum-v2.0/Makefile | 1 + 10 files changed, 10 insertions(+) (limited to 'src/telemega-v1.0') diff --git a/src/easymega-v0.1/Makefile b/src/easymega-v0.1/Makefile index 6e440fe4..66619852 100644 --- a/src/easymega-v0.1/Makefile +++ b/src/easymega-v0.1/Makefile @@ -9,6 +9,7 @@ INC = \ ao.h \ ao_arch.h \ ao_arch_funcs.h \ + ao_boot.h \ ao_companion.h \ ao_data.h \ ao_sample.h \ diff --git a/src/megadongle-v0.1/Makefile b/src/megadongle-v0.1/Makefile index 6035c348..ade8e496 100644 --- a/src/megadongle-v0.1/Makefile +++ b/src/megadongle-v0.1/Makefile @@ -9,6 +9,7 @@ INC = \ ao.h \ ao_arch.h \ ao_arch_funcs.h \ + ao_boot.h \ ao_pins.h \ ao_product.h \ ao_cc1120_CC1120.h \ diff --git a/src/stm-demo/Makefile b/src/stm-demo/Makefile index 8260abee..869fb32f 100644 --- a/src/stm-demo/Makefile +++ b/src/stm-demo/Makefile @@ -9,6 +9,7 @@ INC = \ ao.h \ ao_arch.h \ ao_arch_funcs.h \ + ao_boot.h \ ao_pins.h \ ao_product.h diff --git a/src/stm-flash/Makefile b/src/stm-flash/Makefile index 5c0699e1..568ab85a 100644 --- a/src/stm-flash/Makefile +++ b/src/stm-flash/Makefile @@ -9,6 +9,7 @@ INC = \ ao.h \ ao_arch.h \ ao_arch_funcs.h \ + ao_boot.h \ ao_pins.h \ ao_product.h diff --git a/src/teleballoon-v2.0/Makefile b/src/teleballoon-v2.0/Makefile index a17a06d6..28588778 100644 --- a/src/teleballoon-v2.0/Makefile +++ b/src/teleballoon-v2.0/Makefile @@ -9,6 +9,7 @@ INC = \ ao.h \ ao_arch.h \ ao_arch_funcs.h \ + ao_boot.h \ ao_companion.h \ ao_data.h \ ao_sample.h \ diff --git a/src/telegps-v0.1/Makefile b/src/telegps-v0.1/Makefile index 77ef9c4a..46eb0ac5 100644 --- a/src/telegps-v0.1/Makefile +++ b/src/telegps-v0.1/Makefile @@ -9,6 +9,7 @@ INC = \ ao.h \ ao_arch.h \ ao_arch_funcs.h \ + ao_boot.h \ ao_pins.h \ ao_product.h \ ao_task.h \ diff --git a/src/telelco-v0.1/Makefile b/src/telelco-v0.1/Makefile index 44d9237f..f7628c30 100644 --- a/src/telelco-v0.1/Makefile +++ b/src/telelco-v0.1/Makefile @@ -9,6 +9,7 @@ INC = \ ao.h \ ao_arch.h \ ao_arch_funcs.h \ + ao_boot.h \ ao_companion.h \ ao_data.h \ ao_sample.h \ diff --git a/src/telelco-v0.2/Makefile b/src/telelco-v0.2/Makefile index f28bdd32..7a21f099 100644 --- a/src/telelco-v0.2/Makefile +++ b/src/telelco-v0.2/Makefile @@ -9,6 +9,7 @@ INC = \ ao.h \ ao_arch.h \ ao_arch_funcs.h \ + ao_boot.h \ ao_companion.h \ ao_data.h \ ao_sample.h \ diff --git a/src/telemega-v1.0/Makefile b/src/telemega-v1.0/Makefile index 7a0c1195..46c768e4 100644 --- a/src/telemega-v1.0/Makefile +++ b/src/telemega-v1.0/Makefile @@ -9,6 +9,7 @@ INC = \ ao.h \ ao_arch.h \ ao_arch_funcs.h \ + ao_boot.h \ ao_companion.h \ ao_data.h \ ao_sample.h \ diff --git a/src/telemetrum-v2.0/Makefile b/src/telemetrum-v2.0/Makefile index 83a364dc..d77e9585 100644 --- a/src/telemetrum-v2.0/Makefile +++ b/src/telemetrum-v2.0/Makefile @@ -9,6 +9,7 @@ INC = \ ao.h \ ao_arch.h \ ao_arch_funcs.h \ + ao_boot.h \ ao_companion.h \ ao_data.h \ ao_sample.h \ -- cgit v1.2.3 From 62aa51f0b785bea146d1e9331e6253de2d547c94 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 7 Jun 2014 11:01:14 -0700 Subject: altos/telemega-v1.0: Adjust config params to make flight erase work Flight erase records are supposed to be written after the ao_config to eeprom in telemega. They were getting written in the middle of one of the pyro channel config blocks. Put a bunch of space between the two by making the config max 1024 bytes instead of 128 bytes. Set the log erase marker to 0x55 -- eeprom comes from the factory as 0x00, so we use any value other than 0x55 to indicate 'unused' erase slots. Save space for more flight erase blocks; we've got plenty. Signed-off-by: Keith Packard --- src/telemega-v1.0/ao_pins.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/telemega-v1.0') diff --git a/src/telemega-v1.0/ao_pins.h b/src/telemega-v1.0/ao_pins.h index 7f0b1f94..77b753d1 100644 --- a/src/telemega-v1.0/ao_pins.h +++ b/src/telemega-v1.0/ao_pins.h @@ -65,6 +65,10 @@ #define ao_gps_fifo (ao_stm_usart3.rx_fifo) #define AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX (1024 * 1024) +#define AO_CONFIG_MAX_SIZE 1024 +#define LOG_ERASE_MARK 0x55 +#define LOG_MAX_ERASE 128 + #define HAS_EEPROM 1 #define USE_INTERNAL_FLASH 0 #define USE_EEPROM_CONFIG 1 -- cgit v1.2.3