diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cc1111/ao_pins.h | 5 | ||||
| -rw-r--r-- | src/easymega-v1.0/ao_pins.h | 4 | ||||
| -rw-r--r-- | src/kernel/ao_cmd.c | 2 | ||||
| -rw-r--r-- | src/teleballoon-v2.0/ao_pins.h | 1 | ||||
| -rw-r--r-- | src/telegps-v0.3/ao_pins.h | 1 | ||||
| -rw-r--r-- | src/telegps-v1.0/ao_pins.h | 1 | ||||
| -rw-r--r-- | src/telegps-v2.0/ao_pins.h | 1 | ||||
| -rw-r--r-- | src/telemega-v0.1/ao_pins.h | 1 | ||||
| -rw-r--r-- | src/telemega-v1.0/ao_pins.h | 1 | ||||
| -rw-r--r-- | src/telemega-v2.0/ao_pins.h | 1 | ||||
| -rw-r--r-- | src/telemetrum-v2.0/ao_pins.h | 1 | ||||
| -rw-r--r-- | src/telemetrum-v3.0/ao_pins.h | 1 | ||||
| -rw-r--r-- | src/telescience-v0.2/ao_pins.h | 1 | ||||
| -rw-r--r-- | src/teleterra-v0.2/ao_pins.h | 2 | 
14 files changed, 21 insertions, 2 deletions
| diff --git a/src/cc1111/ao_pins.h b/src/cc1111/ao_pins.h index 10b1f802..9d6e1c1d 100644 --- a/src/cc1111/ao_pins.h +++ b/src/cc1111/ao_pins.h @@ -63,6 +63,7 @@  	#define HAS_RADIO_RATE		0	/* not enough space for this */  	#define HAS_MUTEX_TRY		0  	#define HAS_TASK_INFO		0	/* not enough space for this either */ +	#define AO_LOG_FORMAT		AO_LOG_FORMAT_FULL  #endif  #if defined(TELEMETRUM_V_1_1) @@ -106,6 +107,7 @@  	#define HAS_TELEMETRY		1  	#define HAS_RADIO_RATE		0	/* not enough space for this */  	#define HAS_MUTEX_TRY		0 +	#define AO_LOG_FORMAT		AO_LOG_FORMAT_FULL  #endif  #if defined(TELEMETRUM_V_1_2) @@ -149,6 +151,7 @@  	#define HAS_TELEMETRY		1  	#define HAS_RADIO_RATE		0	/* not enough space for this */  	#define HAS_MUTEX_TRY		0 +	#define AO_LOG_FORMAT		AO_LOG_FORMAT_FULL  #endif  #if defined(TELEDONGLE_V_0_2) @@ -210,6 +213,7 @@  	#define HAS_MONITOR		0  	#define HAS_TELEMETRY		1  	#define HAS_RADIO_RATE		0	/* not enough space for this */ +	#define AO_LOG_FORMAT 		AO_LOG_FORMAT_TINY  #endif  #if defined(TELENANO_V_0_1) @@ -274,6 +278,7 @@  	#define HAS_TELEMETRY		1  	#define HAS_RADIO_RATE		0	/* not enough space for this */  	#define AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX	((uint32_t) 127 * (uint32_t) 1024) +	#define AO_LOG_FORMAT		AO_LOG_FORMAT_FULL  #endif  #if defined(TELEDONGLE_V_0_1) diff --git a/src/easymega-v1.0/ao_pins.h b/src/easymega-v1.0/ao_pins.h index 42a8b09c..b8016478 100644 --- a/src/easymega-v1.0/ao_pins.h +++ b/src/easymega-v1.0/ao_pins.h @@ -69,6 +69,8 @@  #define AO_CONFIG_MAX_SIZE                     1024  #define LOG_ERASE_MARK                         0x55  #define LOG_MAX_ERASE                          128 +#define AO_LOG_FORMAT				AO_LOG_FORMAT_TELEMEGA +  #define HAS_EEPROM		1  #define USE_INTERNAL_FLASH	0  #define USE_EEPROM_CONFIG	1 @@ -84,7 +86,7 @@  #define HAS_SPI_1		1  #define SPI_1_PA5_PA6_PA7	1	/* Barometer */  #define SPI_1_PB3_PB4_PB5	1	/* Accelerometer, Gyro */ -#define SPI_1_PE13_PE14_PE15	0	 +#define SPI_1_PE13_PE14_PE15	0  #define SPI_1_OSPEEDR		STM_OSPEEDR_10MHz  #define HAS_SPI_2		1 diff --git a/src/kernel/ao_cmd.c b/src/kernel/ao_cmd.c index 881f3500..c1e9cef2 100644 --- a/src/kernel/ao_cmd.c +++ b/src/kernel/ao_cmd.c @@ -304,7 +304,7 @@ version(void)  	       , ao_flight_number  #endif  #if HAS_LOG -	       , ao_log_format +	       , AO_LOG_FORMAT  #if !DISABLE_LOG_SPACE  	       , (unsigned long) ao_storage_log_max  #endif diff --git a/src/teleballoon-v2.0/ao_pins.h b/src/teleballoon-v2.0/ao_pins.h index 746bb3ee..d98e85d7 100644 --- a/src/teleballoon-v2.0/ao_pins.h +++ b/src/teleballoon-v2.0/ao_pins.h @@ -64,6 +64,7 @@  #define AO_CONFIG_MAX_SIZE			1024  #define LOG_ERASE_MARK				0x55  #define LOG_MAX_ERASE				128 +#define AO_LOG_FORMAT				AO_LOG_FORMAT_TELEMETRUM  #define HAS_EEPROM		1  #define USE_INTERNAL_FLASH	0 diff --git a/src/telegps-v0.3/ao_pins.h b/src/telegps-v0.3/ao_pins.h index 28ae30a4..873474bb 100644 --- a/src/telegps-v0.3/ao_pins.h +++ b/src/telegps-v0.3/ao_pins.h @@ -75,6 +75,7 @@  #define AO_CONFIG_DEFAULT_APRS_INTERVAL		0  #define AO_CONFIG_DEFAULT_RADIO_POWER		0xc0  #define AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX	496 * 1024 +#define AO_LOG_FORMAT				AO_LOG_FORMAT_TELEGPS  /*   * GPS diff --git a/src/telegps-v1.0/ao_pins.h b/src/telegps-v1.0/ao_pins.h index 9672ab03..f3bdc0ac 100644 --- a/src/telegps-v1.0/ao_pins.h +++ b/src/telegps-v1.0/ao_pins.h @@ -77,6 +77,7 @@  #define AO_CONFIG_DEFAULT_APRS_INTERVAL		0  #define AO_CONFIG_DEFAULT_RADIO_POWER		0xc0 +#define AO_LOG_FORMAT				AO_LOG_FORMAT_TELEGPS  /*   * GPS diff --git a/src/telegps-v2.0/ao_pins.h b/src/telegps-v2.0/ao_pins.h index fa175371..a2e812fa 100644 --- a/src/telegps-v2.0/ao_pins.h +++ b/src/telegps-v2.0/ao_pins.h @@ -136,6 +136,7 @@ struct ao_adc {  #define AO_CONFIG_DEFAULT_APRS_INTERVAL		0  #define AO_CONFIG_DEFAULT_RADIO_POWER		0xc0 +#define AO_LOG_FORMAT				AO_LOG_FORMAT_TELEGPS  /*   * GPS diff --git a/src/telemega-v0.1/ao_pins.h b/src/telemega-v0.1/ao_pins.h index 11c4267c..94e77f98 100644 --- a/src/telemega-v0.1/ao_pins.h +++ b/src/telemega-v0.1/ao_pins.h @@ -69,6 +69,7 @@  #define AO_CONFIG_MAX_SIZE			1024  #define LOG_ERASE_MARK				0x55  #define LOG_MAX_ERASE				128 +#define AO_LOG_FORMAT				AO_LOG_FORMAT_TELEMEGA  #define HAS_EEPROM		1  #define USE_INTERNAL_FLASH	0 diff --git a/src/telemega-v1.0/ao_pins.h b/src/telemega-v1.0/ao_pins.h index 4decbbf7..d44394f0 100644 --- a/src/telemega-v1.0/ao_pins.h +++ b/src/telemega-v1.0/ao_pins.h @@ -69,6 +69,7 @@  #define AO_CONFIG_MAX_SIZE			1024  #define LOG_ERASE_MARK				0x55  #define LOG_MAX_ERASE				128 +#define AO_LOG_FORMAT				AO_LOG_FORMAT_TELEMEGA  #define HAS_EEPROM		1  #define USE_INTERNAL_FLASH	0 diff --git a/src/telemega-v2.0/ao_pins.h b/src/telemega-v2.0/ao_pins.h index c7c8ad19..42c00c94 100644 --- a/src/telemega-v2.0/ao_pins.h +++ b/src/telemega-v2.0/ao_pins.h @@ -69,6 +69,7 @@  #define AO_CONFIG_MAX_SIZE			1024  #define LOG_ERASE_MARK				0x55  #define LOG_MAX_ERASE				128 +#define AO_LOG_FORMAT				AO_LOG_FORMAT_TELEMEGA  #define HAS_EEPROM		1  #define USE_INTERNAL_FLASH	0 diff --git a/src/telemetrum-v2.0/ao_pins.h b/src/telemetrum-v2.0/ao_pins.h index d9063173..d26a5193 100644 --- a/src/telemetrum-v2.0/ao_pins.h +++ b/src/telemetrum-v2.0/ao_pins.h @@ -64,6 +64,7 @@  #define AO_CONFIG_MAX_SIZE			1024  #define LOG_ERASE_MARK				0x55  #define LOG_MAX_ERASE				128 +#define AO_LOG_FORMAT				AO_LOG_FORMAT_TELEMETRUM  #define HAS_EEPROM		1  #define USE_INTERNAL_FLASH	0 diff --git a/src/telemetrum-v3.0/ao_pins.h b/src/telemetrum-v3.0/ao_pins.h index b937b422..6d4369c9 100644 --- a/src/telemetrum-v3.0/ao_pins.h +++ b/src/telemetrum-v3.0/ao_pins.h @@ -64,6 +64,7 @@  #define AO_CONFIG_MAX_SIZE			1024  #define LOG_ERASE_MARK				0x55  #define LOG_MAX_ERASE				128 +#define AO_LOG_FORMAT				AO_LOG_FORMAT_TELEMETRUM  #define HAS_EEPROM		1  #define USE_INTERNAL_FLASH	0 diff --git a/src/telescience-v0.2/ao_pins.h b/src/telescience-v0.2/ao_pins.h index c78766cd..29f16114 100644 --- a/src/telescience-v0.2/ao_pins.h +++ b/src/telescience-v0.2/ao_pins.h @@ -111,6 +111,7 @@  #define HAS_ADC			1  #define HAS_ADC_TEMP		1  #define HAS_LOG			1 +#define AO_LOG_FORMAT		AO_LOG_FORMAT_TELESCIENCE  /*   * SPI Flash memory diff --git a/src/teleterra-v0.2/ao_pins.h b/src/teleterra-v0.2/ao_pins.h index 8d9f7a2f..5bcf2c8a 100644 --- a/src/teleterra-v0.2/ao_pins.h +++ b/src/teleterra-v0.2/ao_pins.h @@ -75,6 +75,8 @@  	#define HAS_TELEMETRY		0  	#define AO_VALUE_32		0 + +	#define AO_LOG_FORMAT		AO_LOG_FORMAT_TELEMETRY  #endif  #if DBG_ON_P1 | 
