From 341157c7415fcf879696c9d8167722a0c5ff264c Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 29 Jul 2020 10:53:39 -0700 Subject: [PATCH] altos: Use new ao_spi_speed inline to set SPI speeds using spec'd frequencies Instead of hand-adjusting SPI speeds for each driver and product based on processor supported rates, create an inline function that takes the maximum frequency supported by the device and maps that to a value supported by the SoC. This ensures that we don't accidentally drive devices faster than they want (as could happen with AO_SPI_SPEED_FAST), but do go as fast as possible in every configuration. Using an inline function means the value is computed at compile time. Signed-off-by: Keith Packard --- src/drivers/ao_adxl375.c | 2 ++ src/drivers/ao_bmx160.c | 4 +++- src/drivers/ao_cc1120.c | 6 ++++-- src/drivers/ao_cc115l.c | 2 ++ src/drivers/ao_cc1200.c | 4 +--- src/drivers/ao_companion.c | 4 +++- src/drivers/ao_m25.c | 4 +++- src/drivers/ao_mma655x.c | 4 +++- src/drivers/ao_mpu6000.c | 6 ++++-- src/drivers/ao_mpu9250.c | 2 +- src/drivers/ao_ms5607.c | 4 +--- src/easymega-v2.0/ao_pins.h | 1 - src/easymega-v3.0/ao_pins.h | 1 - src/easymini-v2.0/ao_pins.h | 1 - src/lpc/ao_arch.h | 34 +++++++++++++++++++----------- src/stm/ao_arch_funcs.h | 34 +++++++++++++++++------------- src/stmf0/ao_arch_funcs.h | 35 ++++++++++++++++++------------- src/telebt-v3.0/ao_pins.h | 1 - src/telebt-v4.0/ao_pins.h | 1 - src/teledongle-v3.0/ao_pins.h | 1 - src/telefireeight-v1.0/ao_pins.h | 1 - src/telefireeight-v2.0/ao_pins.h | 1 - src/telefireone-v1.0/ao_pins.h | 1 - src/telefireone-v2.0/ao_pins.h | 1 - src/telefiretwo-v0.1/ao_pins.h | 1 - src/telefiretwo-v0.2/ao_pins.h | 1 - src/telegps-v0.1/ao_pins.h | 1 - src/telegps-v0.3/ao_pins.h | 1 - src/telegps-v1.0/ao_pins.h | 1 - src/telegps-v2.0/ao_pins.h | 1 - src/telelco-v0.2-cc1200/ao_pins.h | 1 - src/telelco-v0.3/ao_pins.h | 1 - src/telelco-v2.0/ao_pins.h | 1 - src/telelcotwo-v0.1/ao_pins.h | 1 - src/telemega-v2.0/ao_pins.h | 1 - src/telemega-v3.0/ao_pins.h | 1 - src/telemega-v4.0/ao_pins.h | 2 -- src/telemetrum-v3.0/ao_pins.h | 2 -- src/telemini-v3.0/ao_pins.h | 2 -- src/telestatic-v3.0/ao_pins.h | 1 - 40 files changed, 88 insertions(+), 86 deletions(-) diff --git a/src/drivers/ao_adxl375.c b/src/drivers/ao_adxl375.c index dca2213b..c7cf78af 100644 --- a/src/drivers/ao_adxl375.c +++ b/src/drivers/ao_adxl375.c @@ -26,6 +26,8 @@ #define PRINTD(l,...) #endif +#define AO_ADXL375_SPI_SPEED ao_spi_speed(5000000) + struct ao_adxl375_sample ao_adxl375_current; static void diff --git a/src/drivers/ao_bmx160.c b/src/drivers/ao_bmx160.c index c3922b60..427a081b 100644 --- a/src/drivers/ao_bmx160.c +++ b/src/drivers/ao_bmx160.c @@ -24,7 +24,9 @@ static uint8_t ao_bmx160_configured; static struct ao_bmm150_trim ao_bmm150_trim; -#define ao_bmx160_spi_get() ao_spi_get(AO_BMX160_SPI_BUS, AO_SPI_SPEED_8MHz) +#define AO_BMX160_SPI_SPEED ao_spi_speed(10000000) + +#define ao_bmx160_spi_get() ao_spi_get(AO_BMX160_SPI_BUS, AO_BMX160_SPI_SPEED) #define ao_bmx160_spi_put() ao_spi_put(AO_BMX160_SPI_BUS) #define ao_bmx160_spi_start() ao_spi_set_cs(AO_BMX160_SPI_CS_PORT, \ diff --git a/src/drivers/ao_cc1120.c b/src/drivers/ao_cc1120.c index b1a13778..1ebc0ea2 100644 --- a/src/drivers/ao_cc1120.c +++ b/src/drivers/ao_cc1120.c @@ -42,8 +42,10 @@ extern const uint32_t ao_radio_cal; #define FOSC 32000000 -#define ao_radio_try_select(task_id) ao_spi_try_get_mask(AO_CC1120_SPI_CS_PORT,(1 << AO_CC1120_SPI_CS_PIN),AO_CC1120_SPI_BUS,AO_SPI_SPEED_4MHz, task_id) -#define ao_radio_select() ao_spi_get_mask(AO_CC1120_SPI_CS_PORT,(1 << AO_CC1120_SPI_CS_PIN),AO_CC1120_SPI_BUS,AO_SPI_SPEED_4MHz) +#define AO_CC1120_SPI_SPEED ao_spi_speed(6100000) /* 6.1MHz max with 32MHz osc */ + +#define ao_radio_try_select(task_id) ao_spi_try_get_mask(AO_CC1120_SPI_CS_PORT,(1 << AO_CC1120_SPI_CS_PIN),AO_CC1120_SPI_BUS,AO_CC1120_SPI_SPEED, task_id) +#define ao_radio_select() ao_spi_get_mask(AO_CC1120_SPI_CS_PORT,(1 << AO_CC1120_SPI_CS_PIN),AO_CC1120_SPI_BUS,AO_CC1120_SPI_SPEED) #define ao_radio_deselect() ao_spi_put_mask(AO_CC1120_SPI_CS_PORT,(1 << AO_CC1120_SPI_CS_PIN),AO_CC1120_SPI_BUS) #define ao_radio_spi_start_bytes() ao_spi_start_bytes(AO_CC1120_SPI_BUS) #define ao_radio_spi_stop_bytes() ao_spi_stop_bytes(AO_CC1120_SPI_BUS) diff --git a/src/drivers/ao_cc115l.c b/src/drivers/ao_cc115l.c index 2b5fd3fd..dc8e9ff3 100644 --- a/src/drivers/ao_cc115l.c +++ b/src/drivers/ao_cc115l.c @@ -39,6 +39,8 @@ static uint8_t ao_radio_abort; /* radio operation should abort */ #define FOSC 26000000 +#define AO_CC115L_SPI_SPEED ao_spi_speed(6500000) /* for back-to-back access */ + #define ao_radio_select() ao_spi_get_mask(AO_CC115L_SPI_CS_PORT,(1 << AO_CC115L_SPI_CS_PIN),AO_CC115L_SPI_BUS,AO_CC115L_SPI_SPEED) #define ao_radio_deselect() ao_spi_put_mask(AO_CC115L_SPI_CS_PORT,(1 << AO_CC115L_SPI_CS_PIN),AO_CC115L_SPI_BUS) #define ao_radio_spi_send(d,l) ao_spi_send((d), (l), AO_CC115L_SPI_BUS) diff --git a/src/drivers/ao_cc1200.c b/src/drivers/ao_cc1200.c index 105e0d50..3ccf121f 100644 --- a/src/drivers/ao_cc1200.c +++ b/src/drivers/ao_cc1200.c @@ -51,9 +51,7 @@ extern const uint32_t ao_radio_cal; #define FOSC 40000000 #endif -#ifndef AO_CC1200_SPI_SPEED -#error AO_CC1200_SPI_SPEED undefined -#endif +#define AO_CC1200_SPI_SPEED ao_spi_speed(7700000) /* 7.7MHz max for extended memory reads */ #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) diff --git a/src/drivers/ao_companion.c b/src/drivers/ao_companion.c index d6fbb6b7..093356a5 100644 --- a/src/drivers/ao_companion.c +++ b/src/drivers/ao_companion.c @@ -28,11 +28,13 @@ #error HAS_COMPANION not set in ao_companion.c #endif +#define AO_COMPANION_SPI_SPEED ao_spi_speed(200000) + #define COMPANION_SELECT() do { \ ao_spi_get_bit(AO_COMPANION_CS_PORT, \ AO_COMPANION_CS_PIN, \ AO_COMPANION_SPI_BUS, \ - AO_SPI_SPEED_200kHz); \ + AO_COMPANION_SPI_SPEED); \ } while (0) #define COMPANION_DESELECT() do { \ diff --git a/src/drivers/ao_m25.c b/src/drivers/ao_m25.c index 550c9535..2e4cbedf 100644 --- a/src/drivers/ao_m25.c +++ b/src/drivers/ao_m25.c @@ -101,7 +101,9 @@ static uint8_t ao_m25_mutex; static uint8_t ao_m25_instruction[4]; -#define M25_SELECT(cs) ao_spi_get_mask(AO_M25_SPI_CS_PORT,cs,AO_M25_SPI_BUS, AO_SPI_SPEED_FAST) +#define AO_M25_SPI_SPEED ao_spi_speed(10000000) /* this seems like a reasonable minimum speed to require */ + +#define M25_SELECT(cs) ao_spi_get_mask(AO_M25_SPI_CS_PORT,cs,AO_M25_SPI_BUS,AO_M25_SPI_SPEED) #define M25_DESELECT(cs) ao_spi_put_mask(AO_M25_SPI_CS_PORT,cs,AO_M25_SPI_BUS) #define M25_BLOCK_SHIFT 16 diff --git a/src/drivers/ao_mma655x.c b/src/drivers/ao_mma655x.c index 4c24e98b..7736a0f8 100644 --- a/src/drivers/ao_mma655x.c +++ b/src/drivers/ao_mma655x.c @@ -30,12 +30,14 @@ #define PRINTD(l,...) #endif +#define AO_MMA655X_SPI_SPEED ao_spi_speed(8333333) /* 120ns clock period */ + static void ao_mma655x_start(void) { ao_spi_get_bit(AO_MMA655X_CS_PORT, AO_MMA655X_CS_PIN, AO_MMA655X_SPI_INDEX, - AO_SPI_SPEED_FAST); + AO_MMA655X_SPI_SPEED); } static void diff --git a/src/drivers/ao_mpu6000.c b/src/drivers/ao_mpu6000.c index c894239e..7c9d6b6b 100644 --- a/src/drivers/ao_mpu6000.c +++ b/src/drivers/ao_mpu6000.c @@ -32,7 +32,9 @@ static uint8_t ao_mpu6000_configured; #if AO_MPU6000_SPI -#define ao_mpu6000_spi_get() ao_spi_get(AO_MPU6000_SPI_BUS, AO_SPI_SPEED_1MHz) +#define AO_MPU6000_SPI_SPEED ao_spi_speed(1000000) /* 1Mhz for all register access */ + +#define ao_mpu6000_spi_get() ao_spi_get(AO_MPU6000_SPI_BUS, AO_MPU6000_SPI_SPEED) #define ao_mpu6000_spi_put() ao_spi_put(AO_MPU6000_SPI_BUS) #define ao_mpu6000_spi_start() ao_spi_set_cs(AO_MPU6000_SPI_CS_PORT, \ @@ -383,7 +385,7 @@ ao_mpu6000_init(void) */ ao_cur_task = &ao_mpu6000_task; - ao_spi_get(AO_MPU6000_SPI_BUS, AO_SPI_SPEED_1MHz); + ao_mpu6000_spi_get(); ao_cur_task = NULL; #endif diff --git a/src/drivers/ao_mpu9250.c b/src/drivers/ao_mpu9250.c index 0597a81c..09b65bfa 100644 --- a/src/drivers/ao_mpu9250.c +++ b/src/drivers/ao_mpu9250.c @@ -35,7 +35,7 @@ static uint8_t ao_mpu9250_configured; #if AO_MPU9250_SPI #ifndef AO_MPU9250_SPI_SPEED -#define AO_MPU9250_SPI_SPEED AO_SPI_SPEED_1MHz +#define AO_MPU9250_SPI_SPEED ao_spi_speed(1000000) /* 1MHz max SCLK */ #endif #define ao_mpu9250_spi_get() ao_spi_get(AO_MPU9250_SPI_BUS, AO_MPU9250_SPI_SPEED) diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c index 1ebba3e9..c5e733a4 100644 --- a/src/drivers/ao_ms5607.c +++ b/src/drivers/ao_ms5607.c @@ -25,9 +25,7 @@ struct ao_ms5607_prom ao_ms5607_prom; static uint8_t ms5607_configured; -#ifndef AO_MS5607_SPI_SPEED -#define AO_MS5607_SPI_SPEED AO_SPI_SPEED_FAST -#endif +#define AO_MS5607_SPI_SPEED ao_spi_speed(20000000) static void ao_ms5607_start(void) { diff --git a/src/easymega-v2.0/ao_pins.h b/src/easymega-v2.0/ao_pins.h index 399654f0..d7f90334 100644 --- a/src/easymega-v2.0/ao_pins.h +++ b/src/easymega-v2.0/ao_pins.h @@ -324,7 +324,6 @@ struct ao_adc { #define AO_ADXL375_SPI_INDEX (AO_SPI_1_PB3_PB4_PB5 | AO_SPI_MODE_3) #define AO_ADXL375_CS_PORT (&stm_gpioc) #define AO_ADXL375_CS_PIN 12 -#define AO_ADXL375_SPI_SPEED AO_SPI_SPEED_4MHz #define AO_ADXL375_INT1_PORT (&stm_gpiob) #define AO_ADXL375_INT1_PIN 8 diff --git a/src/easymega-v3.0/ao_pins.h b/src/easymega-v3.0/ao_pins.h index fa810fda..31ebfa45 100644 --- a/src/easymega-v3.0/ao_pins.h +++ b/src/easymega-v3.0/ao_pins.h @@ -324,7 +324,6 @@ struct ao_adc { #define AO_ADXL375_SPI_INDEX (AO_SPI_1_PB3_PB4_PB5 | AO_SPI_MODE_3) #define AO_ADXL375_CS_PORT (&stm_gpioc) #define AO_ADXL375_CS_PIN 12 -#define AO_ADXL375_SPI_SPEED AO_SPI_SPEED_4MHz #define AO_ADXL375_INT1_PORT (&stm_gpiob) #define AO_ADXL375_INT1_PIN 8 diff --git a/src/easymini-v2.0/ao_pins.h b/src/easymini-v2.0/ao_pins.h index 38d46310..ba5749e9 100644 --- a/src/easymini-v2.0/ao_pins.h +++ b/src/easymini-v2.0/ao_pins.h @@ -93,7 +93,6 @@ #define AO_MS5607_MISO_PIN 6 #define AO_MS5607_MISO_MASK (1 << AO_MS5607_MISO_PIN) #define AO_MS5607_SPI_INDEX AO_SPI_1_PA5_PA6_PA7 -#define AO_MS5607_SPI_SPEED AO_SPI_SPEED_12MHz #define AO_DATA_RING 64 diff --git a/src/lpc/ao_arch.h b/src/lpc/ao_arch.h index c638aa22..eedac777 100644 --- a/src/lpc/ao_arch.h +++ b/src/lpc/ao_arch.h @@ -103,18 +103,28 @@ ao_serial_init(void); /* SPI definitions */ -#define AO_SPI_SPEED_12MHz 4 -#define AO_SPI_SPEED_8MHz 6 -#define AO_SPI_SPEED_6MHz 8 -#define AO_SPI_SPEED_4MHz 12 -#define AO_SPI_SPEED_2MHz 24 -#define AO_SPI_SPEED_1MHz 48 -#define AO_SPI_SPEED_500kHz 96 -#define AO_SPI_SPEED_250kHz 192 -#define AO_SPI_SPEED_125kHz 384 -#define AO_SPI_SPEED_62500Hz 768 - -#define AO_SPI_SPEED_FAST AO_SPI_SPEED_12MHz +#define _AO_SPI_SPEED_12MHz 4 +#define _AO_SPI_SPEED_8MHz 6 +#define _AO_SPI_SPEED_6MHz 8 +#define _AO_SPI_SPEED_4MHz 12 +#define _AO_SPI_SPEED_2MHz 24 +#define _AO_SPI_SPEED_1MHz 48 +#define _AO_SPI_SPEED_500kHz 96 +#define _AO_SPI_SPEED_250kHz 192 +#define _AO_SPI_SPEED_125kHz 384 +#define _AO_SPI_SPEED_62500Hz 768 + +static inline uint32_t +ao_spi_speed(uint32_t hz) +{ + if (hz >= 4000000) return _AO_SPI_SPEED_4MHz; + if (hz >= 2000000) return _AO_SPI_SPEED_2MHz; + if (hz >= 1000000) return _AO_SPI_SPEED_1MHz; + if (hz >= 500000) return _AO_SPI_SPEED_500kHz; + if (hz >= 250000) return _AO_SPI_SPEED_250kHz; + if (hz >= 125000) return _AO_SPI_SPEED_125kHz; + return _AO_SPI_SPEED_62500Hz; +} #define AO_BOOT_APPLICATION_BASE ((uint32_t *) 0x00001000) #define AO_BOOT_APPLICATION_BOUND ((uint32_t *) (0x00000000 + 32 * 1024)) diff --git a/src/stm/ao_arch_funcs.h b/src/stm/ao_arch_funcs.h index 5c8d990b..8f4f6cd4 100644 --- a/src/stm/ao_arch_funcs.h +++ b/src/stm/ao_arch_funcs.h @@ -24,20 +24,26 @@ /* PCLK is set to 16MHz (HCLK 32MHz, APB prescaler 2) */ -#define AO_SPI_SPEED_8MHz STM_SPI_CR1_BR_PCLK_2 -#define AO_SPI_SPEED_4MHz STM_SPI_CR1_BR_PCLK_4 -#define AO_SPI_SPEED_2MHz STM_SPI_CR1_BR_PCLK_8 -#define AO_SPI_SPEED_1MHz STM_SPI_CR1_BR_PCLK_16 -#define AO_SPI_SPEED_500kHz STM_SPI_CR1_BR_PCLK_32 -#define AO_SPI_SPEED_250kHz STM_SPI_CR1_BR_PCLK_64 -#define AO_SPI_SPEED_125kHz STM_SPI_CR1_BR_PCLK_128 -#define AO_SPI_SPEED_62500Hz STM_SPI_CR1_BR_PCLK_256 +//#define AO_SPI_SPEED_8MHz STM_SPI_CR1_BR_PCLK_2 /* too fast to use safely */ +#define _AO_SPI_SPEED_4MHz STM_SPI_CR1_BR_PCLK_4 +#define _AO_SPI_SPEED_2MHz STM_SPI_CR1_BR_PCLK_8 +#define _AO_SPI_SPEED_1MHz STM_SPI_CR1_BR_PCLK_16 +#define _AO_SPI_SPEED_500kHz STM_SPI_CR1_BR_PCLK_32 +#define _AO_SPI_SPEED_250kHz STM_SPI_CR1_BR_PCLK_64 +#define _AO_SPI_SPEED_125kHz STM_SPI_CR1_BR_PCLK_128 +#define _AO_SPI_SPEED_62500Hz STM_SPI_CR1_BR_PCLK_256 -#define AO_SPI_SPEED_FAST AO_SPI_SPEED_8MHz - -/* Companion bus wants something no faster than 200kHz */ - -#define AO_SPI_SPEED_200kHz AO_SPI_SPEED_125kHz +static inline uint32_t +ao_spi_speed(uint32_t hz) +{ + if (hz >= 4000000) return _AO_SPI_SPEED_4MHz; + if (hz >= 2000000) return _AO_SPI_SPEED_2MHz; + if (hz >= 1000000) return _AO_SPI_SPEED_1MHz; + if (hz >= 500000) return _AO_SPI_SPEED_500kHz; + if (hz >= 250000) return _AO_SPI_SPEED_250kHz; + if (hz >= 125000) return _AO_SPI_SPEED_125kHz; + return _AO_SPI_SPEED_62500Hz; +} #define AO_SPI_CPOL_BIT 4 #define AO_SPI_CPHA_BIT 5 @@ -151,8 +157,6 @@ ao_spi_recv(void *block, uint16_t len, uint8_t spi_index); void ao_spi_duplex(const void *out, void *in, uint16_t len, uint8_t spi_index); -extern uint16_t ao_spi_speed[STM_NUM_SPI]; - void ao_spi_init(void); diff --git a/src/stmf0/ao_arch_funcs.h b/src/stmf0/ao_arch_funcs.h index 190f9d17..defe2598 100644 --- a/src/stmf0/ao_arch_funcs.h +++ b/src/stmf0/ao_arch_funcs.h @@ -26,20 +26,27 @@ /* PCLK is set to 48MHz (HCLK 48MHz, HPRE 1, PPRE 1) */ -#define AO_SPI_SPEED_24MHz STM_SPI_CR1_BR_PCLK_2 -#define AO_SPI_SPEED_12MHz STM_SPI_CR1_BR_PCLK_4 -#define AO_SPI_SPEED_6MHz STM_SPI_CR1_BR_PCLK_8 -#define AO_SPI_SPEED_3MHz STM_SPI_CR1_BR_PCLK_16 -#define AO_SPI_SPEED_1500kHz STM_SPI_CR1_BR_PCLK_32 -#define AO_SPI_SPEED_750kHz STM_SPI_CR1_BR_PCLK_64 -#define AO_SPI_SPEED_375kHz STM_SPI_CR1_BR_PCLK_128 -#define AO_SPI_SPEED_187500Hz STM_SPI_CR1_BR_PCLK_256 +#define _AO_SPI_SPEED_24MHz STM_SPI_CR1_BR_PCLK_2 +#define _AO_SPI_SPEED_12MHz STM_SPI_CR1_BR_PCLK_4 +#define _AO_SPI_SPEED_6MHz STM_SPI_CR1_BR_PCLK_8 +#define _AO_SPI_SPEED_3MHz STM_SPI_CR1_BR_PCLK_16 +#define _AO_SPI_SPEED_1500kHz STM_SPI_CR1_BR_PCLK_32 +#define _AO_SPI_SPEED_750kHz STM_SPI_CR1_BR_PCLK_64 +#define _AO_SPI_SPEED_375kHz STM_SPI_CR1_BR_PCLK_128 +#define _AO_SPI_SPEED_187500Hz STM_SPI_CR1_BR_PCLK_256 -#define AO_SPI_SPEED_FAST AO_SPI_SPEED_24MHz - -/* Companion bus wants something no faster than 200kHz */ - -#define AO_SPI_SPEED_200kHz AO_SPI_SPEED_187500Hz +static inline uint32_t +ao_spi_speed(uint32_t hz) +{ + if (hz >=24000000) return _AO_SPI_SPEED_24MHz; + if (hz >=12000000) return _AO_SPI_SPEED_12MHz; + if (hz >= 6000000) return _AO_SPI_SPEED_6MHz; + if (hz >= 3000000) return _AO_SPI_SPEED_3MHz; + if (hz >= 1500000) return _AO_SPI_SPEED_1500kHz; + if (hz >= 750000) return _AO_SPI_SPEED_750kHz; + if (hz >= 375000) return _AO_SPI_SPEED_375kHz; + return _AO_SPI_SPEED_187500Hz; +} #define AO_SPI_CONFIG_1 0x00 #define AO_SPI_1_CONFIG_PA5_PA6_PA7 AO_SPI_CONFIG_1 @@ -141,8 +148,6 @@ ao_spi_recv(void *block, uint16_t len, uint8_t spi_index); void ao_spi_duplex(void *out, void *in, uint16_t len, uint8_t spi_index); -extern uint16_t ao_spi_speed[STM_NUM_SPI]; - void ao_spi_init(void); diff --git a/src/telebt-v3.0/ao_pins.h b/src/telebt-v3.0/ao_pins.h index 62dddf2a..dcb5098d 100644 --- a/src/telebt-v3.0/ao_pins.h +++ b/src/telebt-v3.0/ao_pins.h @@ -198,7 +198,6 @@ 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/telebt-v4.0/ao_pins.h b/src/telebt-v4.0/ao_pins.h index f3d70d1a..ef988d8b 100644 --- a/src/telebt-v4.0/ao_pins.h +++ b/src/telebt-v4.0/ao_pins.h @@ -272,7 +272,6 @@ struct ao_adc { #define AO_CC1200_SPI_CS_PIN 11 #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_6MHz #define AO_CC1200_INT_PORT (&stm_gpiob) #define AO_CC1200_INT_PIN (10) diff --git a/src/teledongle-v3.0/ao_pins.h b/src/teledongle-v3.0/ao_pins.h index be710aef..effc2322 100644 --- a/src/teledongle-v3.0/ao_pins.h +++ b/src/teledongle-v3.0/ao_pins.h @@ -96,7 +96,6 @@ #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/telefireeight-v1.0/ao_pins.h b/src/telefireeight-v1.0/ao_pins.h index c15e06bf..b1952278 100644 --- a/src/telefireeight-v1.0/ao_pins.h +++ b/src/telefireeight-v1.0/ao_pins.h @@ -103,7 +103,6 @@ #define AO_CC1200_SPI_CS_PIN 11 #define AO_CC1200_SPI_BUS AO_SPI_1_PE13_PE14_PE15 #define AO_CC1200_SPI stm_spi1 -#define AO_CC1200_SPI_SPEED AO_SPI_SPEED_FAST #define AO_CC1200_INT_PORT (&stm_gpioe) #define AO_CC1200_INT_PIN (12) diff --git a/src/telefireeight-v2.0/ao_pins.h b/src/telefireeight-v2.0/ao_pins.h index 046514b4..a71eb441 100644 --- a/src/telefireeight-v2.0/ao_pins.h +++ b/src/telefireeight-v2.0/ao_pins.h @@ -88,7 +88,6 @@ #define AO_CC1200_SPI_CS_PIN 11 #define AO_CC1200_SPI_BUS AO_SPI_1_PE13_PE14_PE15 #define AO_CC1200_SPI stm_spi1 -#define AO_CC1200_SPI_SPEED AO_SPI_SPEED_FAST #define AO_CC1200_INT_PORT (&stm_gpioe) #define AO_CC1200_INT_PIN (12) diff --git a/src/telefireone-v1.0/ao_pins.h b/src/telefireone-v1.0/ao_pins.h index cd8eb658..9d43c2c2 100644 --- a/src/telefireone-v1.0/ao_pins.h +++ b/src/telefireone-v1.0/ao_pins.h @@ -123,7 +123,6 @@ #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/telefireone-v2.0/ao_pins.h b/src/telefireone-v2.0/ao_pins.h index 8025ace6..3b76cccf 100644 --- a/src/telefireone-v2.0/ao_pins.h +++ b/src/telefireone-v2.0/ao_pins.h @@ -145,7 +145,6 @@ #define AO_CC1200_SPI_CS_PIN 3 #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/telefiretwo-v0.1/ao_pins.h b/src/telefiretwo-v0.1/ao_pins.h index dedd0fad..a3bc0a85 100644 --- a/src/telefiretwo-v0.1/ao_pins.h +++ b/src/telefiretwo-v0.1/ao_pins.h @@ -110,7 +110,6 @@ #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/telefiretwo-v0.2/ao_pins.h b/src/telefiretwo-v0.2/ao_pins.h index 01faace2..e04c4fd7 100644 --- a/src/telefiretwo-v0.2/ao_pins.h +++ b/src/telefiretwo-v0.2/ao_pins.h @@ -111,7 +111,6 @@ #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/telegps-v0.1/ao_pins.h b/src/telegps-v0.1/ao_pins.h index 5afc9498..31728966 100644 --- a/src/telegps-v0.1/ao_pins.h +++ b/src/telegps-v0.1/ao_pins.h @@ -148,7 +148,6 @@ #define AO_CC115L_SPI_CS_PIN 12 #define AO_CC115L_SPI_BUS AO_SPI_2_PB13_PB14_PB15 #define AO_CC115L_SPI stm_spi2 -#define AO_CC115L_SPI_SPEED AO_SPI_SPEED_4MHz #define AO_CC115L_FIFO_INT_GPIO_IOCFG CC115L_IOCFG2 #define AO_CC115L_FIFO_INT_PORT (&stm_gpioa) diff --git a/src/telegps-v0.3/ao_pins.h b/src/telegps-v0.3/ao_pins.h index 873474bb..e22331d1 100644 --- a/src/telegps-v0.3/ao_pins.h +++ b/src/telegps-v0.3/ao_pins.h @@ -96,7 +96,6 @@ #define AO_CC115L_SPI_CS_PORT 0 #define AO_CC115L_SPI_CS_PIN 3 #define AO_CC115L_SPI_BUS 0 -#define AO_CC115L_SPI_SPEED AO_SPI_SPEED_6MHz #define AO_CC115L_FIFO_INT_GPIO_IOCFG CC115L_IOCFG2 #define AO_CC115L_FIFO_INT_PORT 0 diff --git a/src/telegps-v1.0/ao_pins.h b/src/telegps-v1.0/ao_pins.h index f3bdc0ac..fbc76739 100644 --- a/src/telegps-v1.0/ao_pins.h +++ b/src/telegps-v1.0/ao_pins.h @@ -98,7 +98,6 @@ #define AO_CC115L_SPI_CS_PORT 0 #define AO_CC115L_SPI_CS_PIN 3 #define AO_CC115L_SPI_BUS 0 -#define AO_CC115L_SPI_SPEED AO_SPI_SPEED_6MHz #define AO_CC115L_FIFO_INT_GPIO_IOCFG CC115L_IOCFG2 #define AO_CC115L_FIFO_INT_PORT 0 diff --git a/src/telegps-v2.0/ao_pins.h b/src/telegps-v2.0/ao_pins.h index a2e812fa..5c6aee0e 100644 --- a/src/telegps-v2.0/ao_pins.h +++ b/src/telegps-v2.0/ao_pins.h @@ -158,7 +158,6 @@ struct ao_adc { #define AO_CC1200_SPI_CS_PIN 1 #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_6MHz #define AO_CC1200_INT_PORT (&stm_gpioa) #define AO_CC1200_INT_PIN 4 diff --git a/src/telelco-v0.2-cc1200/ao_pins.h b/src/telelco-v0.2-cc1200/ao_pins.h index f3850ebd..b434e7cb 100644 --- a/src/telelco-v0.2-cc1200/ao_pins.h +++ b/src/telelco-v0.2-cc1200/ao_pins.h @@ -95,7 +95,6 @@ #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/telelco-v0.3/ao_pins.h b/src/telelco-v0.3/ao_pins.h index c806268f..de89d746 100644 --- a/src/telelco-v0.3/ao_pins.h +++ b/src/telelco-v0.3/ao_pins.h @@ -95,7 +95,6 @@ #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/telelco-v2.0/ao_pins.h b/src/telelco-v2.0/ao_pins.h index e0663314..bfbda423 100644 --- a/src/telelco-v2.0/ao_pins.h +++ b/src/telelco-v2.0/ao_pins.h @@ -93,7 +93,6 @@ #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_gpiod) #define AO_CC1200_INT_PIN (5) diff --git a/src/telelcotwo-v0.1/ao_pins.h b/src/telelcotwo-v0.1/ao_pins.h index 3ef88c74..cf93976e 100644 --- a/src/telelcotwo-v0.1/ao_pins.h +++ b/src/telelcotwo-v0.1/ao_pins.h @@ -94,7 +94,6 @@ #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 ba302c74..efb8edd2 100644 --- a/src/telemega-v2.0/ao_pins.h +++ b/src/telemega-v2.0/ao_pins.h @@ -311,7 +311,6 @@ 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/telemega-v3.0/ao_pins.h b/src/telemega-v3.0/ao_pins.h index ce223907..4fff5076 100644 --- a/src/telemega-v3.0/ao_pins.h +++ b/src/telemega-v3.0/ao_pins.h @@ -311,7 +311,6 @@ 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/telemega-v4.0/ao_pins.h b/src/telemega-v4.0/ao_pins.h index 84af615c..97267de9 100644 --- a/src/telemega-v4.0/ao_pins.h +++ b/src/telemega-v4.0/ao_pins.h @@ -306,7 +306,6 @@ 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 @@ -351,7 +350,6 @@ struct ao_adc { #define AO_ADXL375_SPI_INDEX (AO_SPI_1_PB3_PB4_PB5 | AO_SPI_MODE_3) #define AO_ADXL375_CS_PORT (&stm_gpiod) #define AO_ADXL375_CS_PIN 4 -#define AO_ADXL375_SPI_SPEED AO_SPI_SPEED_4MHz #define AO_ADXL375_AXIS x #define AO_ADXL375_INVERT 1 diff --git a/src/telemetrum-v3.0/ao_pins.h b/src/telemetrum-v3.0/ao_pins.h index 68bec1be..a9651abb 100644 --- a/src/telemetrum-v3.0/ao_pins.h +++ b/src/telemetrum-v3.0/ao_pins.h @@ -260,7 +260,6 @@ 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) @@ -283,7 +282,6 @@ struct ao_adc { #define AO_ADXL375_SPI_INDEX (AO_SPI_1_PB3_PB4_PB5 | AO_SPI_MODE_3) #define AO_ADXL375_CS_PORT (&stm_gpiob) #define AO_ADXL375_CS_PIN 9 -#define AO_ADXL375_SPI_SPEED AO_SPI_SPEED_4MHz #define AO_ADXL375_AXIS x #define AO_ADXL375_INVERT 1 diff --git a/src/telemini-v3.0/ao_pins.h b/src/telemini-v3.0/ao_pins.h index ae8534b9..a734ff0a 100644 --- a/src/telemini-v3.0/ao_pins.h +++ b/src/telemini-v3.0/ao_pins.h @@ -106,7 +106,6 @@ #define AO_MS5607_MISO_PIN 4 #define AO_MS5607_MISO_MASK (1 << AO_MS5607_MISO_PIN) #define AO_MS5607_SPI_INDEX AO_SPI_1_PB3_PB4_PB5 -#define AO_MS5607_SPI_SPEED AO_SPI_SPEED_12MHz /* CC1200 */ @@ -119,7 +118,6 @@ #define AO_CC1200_SPI_CS_PIN 0 #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_12MHz #define AO_CC1200_INT_PORT (&stm_gpiob) #define AO_CC1200_INT_PIN 1 diff --git a/src/telestatic-v3.0/ao_pins.h b/src/telestatic-v3.0/ao_pins.h index aad17664..866206ce 100644 --- a/src/telestatic-v3.0/ao_pins.h +++ b/src/telestatic-v3.0/ao_pins.h @@ -143,7 +143,6 @@ #define AO_CC1200_SPI_CS_PIN 3 #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) -- 2.30.2