projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Remove unused AES code from teledongle and tidongle
[fw/altos]
/
src
/
cc1111
/
ao_pins.h
diff --git
a/src/cc1111/ao_pins.h
b/src/cc1111/ao_pins.h
index a18c74c81ce50597312a64dfb1e48feafc90957e..0923e75de146a16dda07a1719277de53a7548a3c 100644
(file)
--- a/
src/cc1111/ao_pins.h
+++ b/
src/cc1111/ao_pins.h
@@
-18,6
+18,8
@@
#ifndef _AO_PINS_H_
#define _AO_PINS_H_
#ifndef _AO_PINS_H_
#define _AO_PINS_H_
+#define HAS_RADIO 1
+
#if defined(TELEMETRUM_V_1_0)
#define HAS_FLIGHT 1
#define HAS_USB 1
#if defined(TELEMETRUM_V_1_0)
#define HAS_FLIGHT 1
#define HAS_USB 1
@@
-25,7
+27,6
@@
#define HAS_GPS 1
#define HAS_SERIAL_1 1
#define HAS_ADC 1
#define HAS_GPS 1
#define HAS_SERIAL_1 1
#define HAS_ADC 1
- #define USE_SERIAL_STDIN 0
#define HAS_EEPROM 1
#define HAS_LOG 1
#define USE_INTERNAL_FLASH 0
#define HAS_EEPROM 1
#define HAS_LOG 1
#define USE_INTERNAL_FLASH 0
@@
-58,7
+59,6
@@
#define HAS_BEEP 1
#define HAS_GPS 1
#define HAS_SERIAL_1 1
#define HAS_BEEP 1
#define HAS_GPS 1
#define HAS_SERIAL_1 1
- #define USE_SERIAL_STDIN 0
#define HAS_ADC 1
#define HAS_EEPROM 1
#define HAS_LOG 1
#define HAS_ADC 1
#define HAS_EEPROM 1
#define HAS_LOG 1
@@
-82,7
+82,7
@@
#define HAS_ACCEL_REF 1
#define SPI_CS_ON_P1 1
#define SPI_CS_ON_P0 0
#define HAS_ACCEL_REF 1
#define SPI_CS_ON_P1 1
#define SPI_CS_ON_P0 0
- #define
M25_CS_MASK
0x02 /* CS0 is P1_1 */
+ #define
AO_M25_SPI_CS_MASK
0x02 /* CS0 is P1_1 */
#define M25_MAX_CHIPS 1
#define HAS_ACCEL 1
#define HAS_IGNITE 1
#define M25_MAX_CHIPS 1
#define HAS_ACCEL 1
#define HAS_IGNITE 1
@@
-95,7
+95,6
@@
#define HAS_BEEP 1
#define HAS_GPS 1
#define HAS_SERIAL_1 1
#define HAS_BEEP 1
#define HAS_GPS 1
#define HAS_SERIAL_1 1
- #define USE_SERIAL_STDIN 0
#define HAS_ADC 1
#define HAS_EEPROM 1
#define HAS_LOG 1
#define HAS_ADC 1
#define HAS_EEPROM 1
#define HAS_LOG 1
@@
-119,7
+118,7
@@
#define HAS_ACCEL_REF 1
#define SPI_CS_ON_P1 1
#define SPI_CS_ON_P0 0
#define HAS_ACCEL_REF 1
#define SPI_CS_ON_P1 1
#define SPI_CS_ON_P0 0
- #define
M25_CS_MASK
0x02 /* CS0 is P1_1 */
+ #define
AO_M25_SPI_CS_MASK
0x02 /* CS0 is P1_1 */
#define M25_MAX_CHIPS 1
#define HAS_ACCEL 1
#define HAS_IGNITE 1
#define M25_MAX_CHIPS 1
#define HAS_ACCEL 1
#define HAS_IGNITE 1
@@
-131,7
+130,6
@@
#define HAS_USB 1
#define HAS_BEEP 0
#define HAS_SERIAL_1 0
#define HAS_USB 1
#define HAS_BEEP 0
#define HAS_SERIAL_1 0
- #define USE_SERIAL_STDIN 0
#define HAS_ADC 0
#define HAS_DBG 1
#define HAS_EEPROM 0
#define HAS_ADC 0
#define HAS_DBG 1
#define HAS_EEPROM 0
@@
-152,7
+150,7
@@
#define HAS_MONITOR 1
#define LEGACY_MONITOR 1
#define HAS_RSSI 1
#define HAS_MONITOR 1
#define LEGACY_MONITOR 1
#define HAS_RSSI 1
- #define HAS_AES
1
+ #define HAS_AES
0
#endif
#if defined(TELEMINI_V_1_0)
#endif
#if defined(TELEMINI_V_1_0)
@@
-161,7
+159,6
@@
#define HAS_BEEP 0
#define HAS_GPS 0
#define HAS_SERIAL_1 0
#define HAS_BEEP 0
#define HAS_GPS 0
#define HAS_SERIAL_1 0
- #define USE_SERIAL_STDIN 0
#define HAS_ADC 1
#define HAS_EEPROM 1
#define HAS_LOG 1
#define HAS_ADC 1
#define HAS_EEPROM 1
#define HAS_LOG 1
@@
-188,7
+185,6
@@
#define HAS_BEEP 0
#define HAS_GPS 0
#define HAS_SERIAL_1 0
#define HAS_BEEP 0
#define HAS_GPS 0
#define HAS_SERIAL_1 0
- #define USE_SERIAL_STDIN 0
#define HAS_ADC 1
#define HAS_EEPROM 1
#define HAS_LOG 1
#define HAS_ADC 1
#define HAS_EEPROM 1
#define HAS_LOG 1
@@
-214,7
+210,6
@@
#define HAS_BEEP 1
#define HAS_GPS 1
#define HAS_SERIAL_1 1
#define HAS_BEEP 1
#define HAS_GPS 1
#define HAS_SERIAL_1 1
- #define USE_SERIAL_STDIN 0
#define HAS_ADC 1
#define HAS_DBG 0
#define HAS_EEPROM 1
#define HAS_ADC 1
#define HAS_DBG 0
#define HAS_EEPROM 1
@@
-244,7
+239,6
@@
#define HAS_USB 1
#define HAS_BEEP 0
#define HAS_SERIAL_1 0
#define HAS_USB 1
#define HAS_BEEP 0
#define HAS_SERIAL_1 0
- #define USE_SERIAL_STDIN 0
#define HAS_ADC 0
#define HAS_DBG 0
#define HAS_EEPROM 0
#define HAS_ADC 0
#define HAS_DBG 0
#define HAS_EEPROM 0
@@
-265,7
+259,7
@@
#define HAS_MONITOR 1
#define LEGACY_MONITOR 1
#define HAS_RSSI 1
#define HAS_MONITOR 1
#define LEGACY_MONITOR 1
#define HAS_RSSI 1
- #define HAS_AES
1
+ #define HAS_AES
0
#endif
#if defined(TIDONGLE)
#endif
#if defined(TIDONGLE)
@@
-273,7
+267,6
@@
#define HAS_USB 1
#define HAS_BEEP 0
#define HAS_SERIAL_1 0
#define HAS_USB 1
#define HAS_BEEP 0
#define HAS_SERIAL_1 0
- #define USE_SERIAL_STDIN 0
#define HAS_ADC 0
#define HAS_DBG 1
#define HAS_EEPROM 0
#define HAS_ADC 0
#define HAS_DBG 1
#define HAS_EEPROM 0
@@
-293,7
+286,7
@@
#define HAS_MONITOR 1
#define LEGACY_MONITOR 1
#define HAS_RSSI 1
#define HAS_MONITOR 1
#define LEGACY_MONITOR 1
#define HAS_RSSI 1
- #define HAS_AES
1
+ #define HAS_AES
0
#endif
#if defined(TELEBT_V_0_0)
#endif
#if defined(TELEBT_V_0_0)
@@
-301,7
+294,8
@@
#define HAS_USB 1
#define HAS_BEEP 0
#define HAS_SERIAL_1 1
#define HAS_USB 1
#define HAS_BEEP 0
#define HAS_SERIAL_1 1
- #define USE_SERIAL_STDIN 1
+ #define USE_SERIAL_1_STDIN 1
+ #define DELAY_SERIAL_1_STDIN 1
#define HAS_ADC 0
#define HAS_DBG 1
#define HAS_EEPROM 0
#define HAS_ADC 0
#define HAS_DBG 1
#define HAS_EEPROM 0
@@
-328,7
+322,7
@@
#define HAS_MONITOR 1
#define LEGACY_MONITOR 1
#define HAS_RSSI 0
#define HAS_MONITOR 1
#define LEGACY_MONITOR 1
#define HAS_RSSI 0
- #define HAS_AES
1
+ #define HAS_AES
0
#endif
#if defined(TELEBT_V_0_1)
#endif
#if defined(TELEBT_V_0_1)
@@
-339,7
+333,8
@@
#define HAS_SERIAL_1_ALT_1 1
#define HAS_SERIAL_1_ALT_2 0
#define HAS_SERIAL_1_HW_FLOW 1
#define HAS_SERIAL_1_ALT_1 1
#define HAS_SERIAL_1_ALT_2 0
#define HAS_SERIAL_1_HW_FLOW 1
- #define USE_SERIAL_STDIN 1
+ #define USE_SERIAL_1_STDIN 1
+ #define DELAY_SERIAL_1_STDIN 1
#define HAS_ADC 0
#define HAS_DBG 1
#define HAS_EEPROM 1
#define HAS_ADC 0
#define HAS_DBG 1
#define HAS_EEPROM 1
@@
-358,7
+353,7
@@
#define LEDS_AVAILABLE (AO_LED_RED|AO_LED_GREEN)
#define SPI_CS_ON_P1 1
#define SPI_CS_ON_P0 0
#define LEDS_AVAILABLE (AO_LED_RED|AO_LED_GREEN)
#define SPI_CS_ON_P1 1
#define SPI_CS_ON_P0 0
- #define
M25_CS_MASK
0x04 /* CS0 is P1_2 */
+ #define
AO_M25_SPI_CS_MASK
0x04 /* CS0 is P1_2 */
#define M25_MAX_CHIPS 1
#define HAS_ACCEL 0
#define HAS_IGNITE 0
#define M25_MAX_CHIPS 1
#define HAS_ACCEL 0
#define HAS_IGNITE 0
@@
-370,7
+365,7
@@
#define HAS_MONITOR 1
#define LEGACY_MONITOR 1
#define HAS_RSSI 0
#define HAS_MONITOR 1
#define LEGACY_MONITOR 1
#define HAS_RSSI 0
- #define HAS_AES
1
+ #define HAS_AES
0
#endif
#if defined(TELELAUNCH_V_0_1)
#endif
#if defined(TELELAUNCH_V_0_1)
@@
-379,7
+374,6
@@
#define HAS_BEEP 1
#define HAS_GPS 0
#define HAS_SERIAL_1 1
#define HAS_BEEP 1
#define HAS_GPS 0
#define HAS_SERIAL_1 1
- #define USE_SERIAL_STDIN 0
#define HAS_ADC 1
#define HAS_DBG 0
#define HAS_EEPROM 1
#define HAS_ADC 1
#define HAS_DBG 0
#define HAS_EEPROM 1
@@
-458,6
+452,8
@@
#define SPI_CS_DIR P0DIR
#endif
#define SPI_CS_DIR P0DIR
#endif
+#define AO_M25_SPI_CS_PORT SPI_CS_PORT
+
#ifndef IGNITE_ON_P2
#error Please define IGNITE_ON_P2
#endif
#ifndef IGNITE_ON_P2
#error Please define IGNITE_ON_P2
#endif
@@
-466,14
+462,6
@@
#error Please define IGNITE_ON_P0
#endif
#error Please define IGNITE_ON_P0
#endif
-#ifndef HAS_SERIAL_1
-#error Please define HAS_SERIAL_1
-#endif
-
-#ifndef USE_SERIAL_STDIN
-#error Please define USE_SERIAL_STDIN
-#endif
-
#ifndef HAS_ADC
#error Please define HAS_ADC
#endif
#ifndef HAS_ADC
#error Please define HAS_ADC
#endif