diff options
| author | Keith Packard <keithp@keithp.com> | 2013-04-22 17:20:51 -0500 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-04-22 17:20:51 -0500 |
| commit | 33c3b2c57d0d4285b75d4dcf7ca67ad19da08c86 (patch) | |
| tree | a9ff47afab29fe141dcd1da0ca276b367f911cb6 /src/teleshield-v0.1 | |
| parent | 1a84db819a359be39be51c9105039ab28c9fc894 (diff) | |
| parent | 90b0db1ae53182c94bf12d661446fc369d916366 (diff) | |
Merge branch 'master' into stm-flash
Conflicts:
ao-tools/ao-stmload/ao-stmload.c
Diffstat (limited to 'src/teleshield-v0.1')
| -rw-r--r-- | src/teleshield-v0.1/ao_pins.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/teleshield-v0.1/ao_pins.h b/src/teleshield-v0.1/ao_pins.h index 701e25fc..30239afc 100644 --- a/src/teleshield-v0.1/ao_pins.h +++ b/src/teleshield-v0.1/ao_pins.h @@ -46,6 +46,7 @@ #define AO_LED_RED 1 #define AO_LED_GREEN 2 #define AO_MONITOR_LED AO_LED_RED + #define AO_BT_LED AO_LED_GREEN #define LEDS_AVAILABLE (AO_LED_RED|AO_LED_GREEN) #define SPI_CS_ON_P1 1 #define SPI_CS_ON_P0 0 @@ -60,6 +61,7 @@ #define LEGACY_MONITOR 0 #define HAS_RSSI 0 #define HAS_AES 0 + #define HAS_RADIO 1 #endif #if DBG_ON_P1 |