X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcc1111%2Fao_arch.h;h=a97515a7547509d31b1a4328d2f272fa7bd0e28e;hb=6e0d672b8a516a604d8ea1abd2bed113c608143f;hp=9d0643b4ba4f0f7d0135b7b81b4a45859d619a60;hpb=040a6eb119451026e1ec7c3a6a8e76b439c632d5;p=fw%2Faltos

diff --git a/src/cc1111/ao_arch.h b/src/cc1111/ao_arch.h
index 9d0643b4..a97515a7 100644
--- a/src/cc1111/ao_arch.h
+++ b/src/cc1111/ao_arch.h
@@ -59,10 +59,12 @@
 
 #define AO_ROMCONFIG_VERSION	2
 
-extern __code __at (0x00a0) uint16_t ao_romconfig_version;
-extern __code __at (0x00a2) uint16_t ao_romconfig_check;
-extern __code __at (0x00a4) uint16_t ao_serial_number;
-extern __code __at (0x00a6) uint32_t ao_radio_cal;
+#define AO_ROMCONFIG_SYMBOL(a) __code __at(a)
+
+extern AO_ROMCONFIG_SYMBOL(0x00a0) uint16_t ao_romconfig_version;
+extern AO_ROMCONFIG_SYMBOL(0x00a2) uint16_t ao_romconfig_check;
+extern AO_ROMCONFIG_SYMBOL(0x00a4) uint16_t ao_serial_number;
+extern AO_ROMCONFIG_SYMBOL(0x00a6) uint32_t ao_radio_cal;
 
 #ifndef HAS_USB
 #error Please define HAS_USB
@@ -198,17 +200,7 @@ extern __code __at (0x00a6) uint32_t ao_radio_cal;
 
 #define ao_arch_critical(b) __critical { b }
 
-struct ao_adc {
-	uint16_t	tick;		/* tick when the sample was read */
-	int16_t		accel;		/* accelerometer */
-	int16_t		pres;		/* pressure sensor */
-	int16_t		temp;		/* temperature sensor */
-	int16_t		v_batt;		/* battery voltage */
-	int16_t		sense_d;	/* drogue continuity sense */
-	int16_t		sense_m;	/* main continuity sense */
-};
-
-#define AO_ADC_RING	32
+#define AO_DATA_RING	32
 
 /* ao_button.c */
 #ifdef HAS_BUTTON