projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
src
/
telegps-v3.0
/
ao_pins.h
diff --git
a/src/telegps-v3.0/ao_pins.h
b/src/telegps-v3.0/ao_pins.h
index 03989141244e3fe2945adca58385ba8360c192a2..e8103813803c7181e36ab74c1381f16a6a61aba8 100644
(file)
--- a/
src/telegps-v3.0/ao_pins.h
+++ b/
src/telegps-v3.0/ao_pins.h
@@
-23,6
+23,8
@@
#define IS_FLASH_LOADER 0
#define IS_FLASH_LOADER 0
+#define LPC_EEPROM_BYTES 2048
+
/* Crystal on the board */
#define AO_LPC_CLKIN 12000000
/* Crystal on the board */
#define AO_LPC_CLKIN 12000000
@@
-43,6
+45,9
@@
#define HAS_EEPROM 1
#define USE_INTERNAL_FLASH 0
#define HAS_EEPROM 1
#define USE_INTERNAL_FLASH 0
+#define USE_EEPROM_CONFIG 1
+#define USE_STORAGE_CONFIG 0
+#define LOG_ERASE_MARK 0
#define HAS_USB 1
#define HAS_BEEP 0
#define HAS_RADIO 1
#define HAS_USB 1
#define HAS_BEEP 0
#define HAS_RADIO 1
@@
-63,6
+68,7
@@
#define LED_0_PIN 25
#define AO_LED_GREEN (1 << 0)
#define AO_LED_PANIC AO_LED_GREEN
#define LED_0_PIN 25
#define AO_LED_GREEN (1 << 0)
#define AO_LED_PANIC AO_LED_GREEN
+#define AO_LED_GPS_LOCK AO_LED_GREEN
/* Radio */
#define HAS_SPI_0 1
/* Radio */
#define HAS_SPI_0 1
@@
-74,7
+80,6
@@
#define SPI_SCK1_P1_20 1
#define SPI_MISO1_P0_22 1
#define SPI_MOSI1_P1_22 1
#define SPI_SCK1_P1_20 1
#define SPI_MISO1_P0_22 1
#define SPI_MOSI1_P1_22 1
-#define SPI_1_OSPEEDR AO_SPI_OSPEED_12MHz
#define HAS_GPS 1
#define HAS_FLIGHT 0
#define HAS_GPS 1
#define HAS_FLIGHT 0
@@
-90,6
+95,7
@@
*/
#define AO_SERIAL_SPEED_UBLOX AO_SERIAL_SPEED_9600
*/
#define AO_SERIAL_SPEED_UBLOX AO_SERIAL_SPEED_9600
+#define AO_UBLOX_VERSION 10
/*
* Radio (cc1200)
/*
* Radio (cc1200)
@@
-102,7
+108,7
@@
#define AO_FEC_DEBUG 0
#define AO_CC1200_SPI_CS_PORT 1
#define AO_CC1200_SPI_CS_PIN 27
#define AO_FEC_DEBUG 0
#define AO_CC1200_SPI_CS_PORT 1
#define AO_CC1200_SPI_CS_PIN 27
-#define AO_CC1200_SPI_BUS
1
+#define AO_CC1200_SPI_BUS
0
#define AO_CC1200_SPI 1
#define AO_CC1200_INT_PORT 1
#define AO_CC1200_SPI 1
#define AO_CC1200_INT_PORT 1
@@
-119,7
+125,7
@@
#define M25_MAX_CHIPS 1
#define AO_M25_SPI_CS_PORT 0
#define AO_M25_SPI_CS_MASK (1 << 23)
#define M25_MAX_CHIPS 1
#define AO_M25_SPI_CS_PORT 0
#define AO_M25_SPI_CS_MASK (1 << 23)
-#define AO_M25_SPI_BUS
0
+#define AO_M25_SPI_BUS
1
#define PACKET_HAS_SLAVE 0
#define PACKET_HAS_SLAVE 0