altos: Require SPI speed to be declared for cc1200

The cc1200 can't run SPI faster than 10MHz, so make sure every device
picks a SPI clock slower than that.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/drivers/ao_cc1200.c b/src/drivers/ao_cc1200.c
index 2bc997348b8b47375f258842a96a3067f9e2aff6..de282000ad95eeefd5a48d93ba3f5b717092ba61 100644 (file)
--- a/src/drivers/ao_cc1200.c
+++ b/src/drivers/ao_cc1200.c
@@ -51,7 +51,11 @@ extern const uint32_t        ao_radio_cal;
 #define FOSC   40000000
 #endif
 
-#define ao_radio_select()      ao_spi_get_mask(AO_CC1200_SPI_CS_PORT,(1 << AO_CC1200_SPI_CS_PIN),AO_CC1200_SPI_BUS,AO_SPI_SPEED_FAST)
+#ifndef AO_CC1200_SPI_SPEED
+#error AO_CC1200_SPI_SPEED undefined
+#endif
+
+#define ao_radio_select()      ao_spi_get_mask(AO_CC1200_SPI_CS_PORT,(1 << AO_CC1200_SPI_CS_PIN),AO_CC1200_SPI_BUS,AO_CC1200_SPI_SPEED)
 #define ao_radio_deselect()    ao_spi_put_mask(AO_CC1200_SPI_CS_PORT,(1 << AO_CC1200_SPI_CS_PIN),AO_CC1200_SPI_BUS)
 #define ao_radio_spi_send(d,l) ao_spi_send((d), (l), AO_CC1200_SPI_BUS)
 #define ao_radio_spi_send_fixed(d,l) ao_spi_send_fixed((d), (l), AO_CC1200_SPI_BUS)
@@ -1323,7 +1327,7 @@ static void ao_radio_packet(void) {
 void
 ao_radio_test_recv(void)
 {
-       uint8_t bytes[34];
+       static uint8_t  bytes[34];
        uint8_t b;
 
        if (ao_radio_recv(bytes, 34, 0)) {

diff --git a/src/telebt-v3.0/ao_pins.h b/src/telebt-v3.0/ao_pins.h
index 61cbe9bba62fa2a9ffea5b0844fd52b4a3e1907a..1f7af41bd2e983e4c28cbae05da00992542b8207 100644 (file)
--- a/src/telebt-v3.0/ao_pins.h
+++ b/src/telebt-v3.0/ao_pins.h
@@ -197,6 +197,7 @@ struct ao_adc {
 #define AO_CC1200_SPI_CS_PIN   10
 #define AO_CC1200_SPI_BUS      AO_SPI_1_PA5_PA6_PA7
 #define AO_CC1200_SPI          stm_spi1
+#define AO_CC1200_SPI_SPEED    AO_SPI_SPEED_FAST
 
 #define AO_CC1200_INT_PORT             (&stm_gpiob)
 #define AO_CC1200_INT_PIN              (11)

diff --git a/src/teledongle-v3.0/ao_pins.h b/src/teledongle-v3.0/ao_pins.h
index effc2322028e23733c806ba545abcb6b6157c837..be710aef3ca17a10458822e30ce8ddac68a11dfe 100644 (file)
--- a/src/teledongle-v3.0/ao_pins.h
+++ b/src/teledongle-v3.0/ao_pins.h
@@ -96,6 +96,7 @@
 #define AO_CC1200_SPI_CS_PIN   3
 #define AO_CC1200_SPI_BUS      0
 #define AO_CC1200_SPI          0
+#define AO_CC1200_SPI_SPEED    AO_SPI_SPEED_8MHz
 
 #define AO_CC1200_INT_PORT     0
 #define AO_CC1200_INT_PIN      2

diff --git a/src/telefiretwo-v0.1/ao_pins.h b/src/telefiretwo-v0.1/ao_pins.h
index f56061b2d2fa5bac7b93d68e328aa1c535b6dcf3..1e5c0d09bac5c943979c0341b37431e32532faa2 100644 (file)
--- a/src/telefiretwo-v0.1/ao_pins.h
+++ b/src/telefiretwo-v0.1/ao_pins.h
@@ -110,6 +110,7 @@
 #define AO_CC1200_SPI_CS_PIN   7
 #define AO_CC1200_SPI_BUS      AO_SPI_2_PB13_PB14_PB15
 #define AO_CC1200_SPI          stm_spi2
+#define AO_CC1200_SPI_SPEED    AO_SPI_SPEED_FAST
 
 #define AO_CC1200_INT_PORT             (&stm_gpiob)
 #define AO_CC1200_INT_PIN              (11)

diff --git a/src/telelco-v0.3/ao_pins.h b/src/telelco-v0.3/ao_pins.h
index d874a19b6646c0ee5be12e85e713c6e261ce4e31..dd4aaafbbdd8b3b7c8ee4101f38d9841ce062789 100644 (file)
--- a/src/telelco-v0.3/ao_pins.h
+++ b/src/telelco-v0.3/ao_pins.h
@@ -89,6 +89,7 @@
 #define AO_CC1200_SPI_CS_PIN   0
 #define AO_CC1200_SPI_BUS      AO_SPI_2_PD1_PD3_PD4
 #define AO_CC1200_SPI          stm_spi2
+#define AO_CC1200_SPI_SPEED    AO_SPI_SPEED_FAST
 
 #define AO_CC1200_INT_PORT             (&stm_gpioc)
 #define AO_CC1200_INT_PIN              (15)

diff --git a/src/telelcotwo-v0.1/ao_pins.h b/src/telelcotwo-v0.1/ao_pins.h
index 714a5c3a02c40d0c5c2fc206bbd33bb01a14a8c8..60e94c67eac90136988365ccc4bdd7c15c3cc4b4 100644 (file)
--- a/src/telelcotwo-v0.1/ao_pins.h
+++ b/src/telelcotwo-v0.1/ao_pins.h
@@ -91,6 +91,7 @@
 #define AO_CC1200_SPI_CS_PIN   7
 #define AO_CC1200_SPI_BUS      AO_SPI_2_PB13_PB14_PB15
 #define AO_CC1200_SPI          stm_spi2
+#define AO_CC1200_SPI_SPEED    AO_SPI_SPEED_FAST
 
 #define AO_CC1200_INT_PORT             (&stm_gpiob)
 #define AO_CC1200_INT_PIN              (11)

diff --git a/src/telemega-v2.0/ao_pins.h b/src/telemega-v2.0/ao_pins.h
index b1c472da822520a62a4010fd3fc4f91df1a89280..c7c8ad1931610aa11a265cd16536f4ed95e65b03 100644 (file)
--- a/src/telemega-v2.0/ao_pins.h
+++ b/src/telemega-v2.0/ao_pins.h
@@ -309,6 +309,7 @@ struct ao_adc {
 #define AO_CC1200_SPI_CS_PIN   5
 #define AO_CC1200_SPI_BUS      AO_SPI_2_PB13_PB14_PB15
 #define AO_CC1200_SPI          stm_spi2
+#define AO_CC1200_SPI_SPEED    AO_SPI_SPEED_FAST
 
 #define AO_CC1200_INT_PORT             (&stm_gpioe)
 #define AO_CC1200_INT_PIN              1

diff --git a/src/telemetrum-v3.0/ao_pins.h b/src/telemetrum-v3.0/ao_pins.h
index ccf2f18f9f4b227b20c447a3db97040203e6e7bc..b937b4222f3c8f4e482910613540adf3ba9b606c 100644 (file)
--- a/src/telemetrum-v3.0/ao_pins.h
+++ b/src/telemetrum-v3.0/ao_pins.h
@@ -259,6 +259,7 @@ struct ao_adc {
 #define AO_CC1200_SPI_CS_PIN   2
 #define AO_CC1200_SPI_BUS      AO_SPI_2_PB13_PB14_PB15
 #define AO_CC1200_SPI          stm_spi2
+#define AO_CC1200_SPI_SPEED    AO_SPI_SPEED_FAST
 
 #define AO_CC1200_INT_PORT             (&stm_gpioa)
 #define AO_CC1200_INT_PIN              (3)