Merge branch 'master'

[fw/altos] / src / easymotor-v3 / ao_pins.h

diff --git a/src/easymotor-v3/ao_pins.h b/src/easymotor-v3/ao_pins.h
index 89d9db0ed09e0b9d81a111656a0d762973bd0094..856c763946d1b6dcd7aedd15e0b1e2a661656e2b 100644 (file)
--- a/src/easymotor-v3/ao_pins.h
+++ b/src/easymotor-v3/ao_pins.h
@@ -45,11 +45,6 @@
 #define PACKET_HAS_SLAVE       0
 
 #define HAS_SERIAL             0
-#define USE_SERIAL_0_STDIN     1
-#define SERIAL_0_18_19          1
-#define SERIAL_0_14_15          0
-#define SERIAL_0_17_18          0
-#define SERIAL_0_26_27          0
 
 #define AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX       (1984 * 1024)
 #define AO_CONFIG_MAX_SIZE                     1024
@@ -67,10 +62,10 @@
 #define HAS_PAD_REPORT         1
 
 /* Beeper is on pio0_1 ct32b0_mat2 */
-#define BEEPER_PORT            0
-#define BEEPER_PIN             1
-#define BEEPER_TIMER           0
-#define BEEPER_OUTPUT          2
+#define AO_LPC_BEEP_PORT       0
+#define AO_LPC_BEEP_PIN                1
+#define AO_LPC_BEEP_TIMER      0
+#define AO_LPC_BEEP_CHANNEL    2
 
 #define HAS_RADIO              0
 #define HAS_TELEMETRY          0
@@ -126,11 +121,13 @@ struct ao_adc {
 /* SPI */
 
 #define HAS_SPI_0              1
+#define SPI_0_MODE             ((0 << LPC_SSP_CR0_CPOL) | (0 << LPC_SSP_CR0_CPHA))
 #define SPI_SCK0_P0_6           1
 #define HAS_SPI_1               1
 #define SPI_SCK1_P1_15          1
 #define SPI_MISO1_P0_22         1
 #define SPI_MOSI1_P0_21         1
+#define SPI_1_MODE             ((1 << LPC_SSP_CR0_CPOL) | (1 << LPC_SSP_CR0_CPHA))
 
 /*
  * SPI Flash memory