projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Make telemini-v1.0 compile with new ao_data structure
[fw/altos]
/
src
/
cc1111
/
ao_pins.h
diff --git
a/src/cc1111/ao_pins.h
b/src/cc1111/ao_pins.h
index a18c74c81ce50597312a64dfb1e48feafc90957e..4f6edd373a9a7d91b64a5cd269e26e3d987a0770 100644
(file)
--- a/
src/cc1111/ao_pins.h
+++ b/
src/cc1111/ao_pins.h
@@
-25,7
+25,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
+57,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
+80,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
+93,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
+116,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
+128,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
@@
-161,7
+157,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
+183,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
+208,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
+237,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
@@
-273,7
+265,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
@@
-301,7
+292,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
@@
-339,7
+331,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
+351,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
@@
-379,7
+372,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
+450,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
+460,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