projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Use new USB driver in megametrum-v0.1 product
[fw/altos]
/
src
/
cc1111
/
ao_pins.h
diff --git
a/src/cc1111/ao_pins.h
b/src/cc1111/ao_pins.h
index a18c74c81ce50597312a64dfb1e48feafc90957e..5c0cb7dfe73e1f5c283c1da10c5a5d429c307fc1 100644
(file)
--- a/
src/cc1111/ao_pins.h
+++ b/
src/cc1111/ao_pins.h
@@
-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
@@
-119,7
+119,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
@@
-358,7
+358,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
@@
-458,6
+458,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