From e7602eab038297c391632a62fd91dff6be76e618 Mon Sep 17 00:00:00 2001 From: Richard Meadows Date: Thu, 25 Jun 2015 16:47:13 +0100 Subject: [PATCH] Refactored SI406X defines to SI4xxx --- firmware/inc/hw_config.h | 35 ++++++++++++++++------------------- firmware/inc/si_trx_defs.h | 8 ++++---- firmware/src/ax25.c | 4 ++-- firmware/src/si_trx.c | 36 ++++++++++++++++++------------------ firmware/src/telemetry.c | 4 ++-- 5 files changed, 42 insertions(+), 45 deletions(-) diff --git a/firmware/inc/hw_config.h b/firmware/inc/hw_config.h index 93aa8d0..6c5d8b4 100644 --- a/firmware/inc/hw_config.h +++ b/firmware/inc/hw_config.h @@ -45,9 +45,6 @@ #endif - - - //#define XPLAINED /** @@ -101,22 +98,22 @@ /** * Radio */ -#define SI406X_SERCOM (SercomSpi*)SERCOM3 -#define SI406X_SERCOM_MOSI_PIN PIN_PA19 -#define SI406X_SERCOM_MOSI_PINMUX PINMUX_PA19D_SERCOM3_PAD3 -#define SI406X_SERCOM_MISO_PIN PIN_PA22 -#define SI406X_SERCOM_MISO_PINMUX PINMUX_PA22C_SERCOM3_PAD0 -#define SI406X_SERCOM_SCK_PIN PIN_PA23 -#define SI406X_SERCOM_SCK_PINMUX PINMUX_PA23C_SERCOM3_PAD1 -#define SI406X_SERCOM_MUX SPI_SIGNAL_MUX_SETTING_D -#define SI406X_SEL_PIN PIN_PA18 -#define SI406X_IRQ_PIN PIN_PA24 -#define SI406X_IRQ_PINMUX PINMUX_PA24A_EIC_EXTINT12 -#define SI406X_SDN_PIN PIN_PA17 -#define SI406X_GPIO0_PIN PIN_PA27 -#define SI406X_GPIO1_PIN PIN_PA25 -#define SI406X_GPIO1_PINMUX PINMUX_PA25F_TC5_WO1 -#define SI406X_TCXO_FREQUENCY 16369000 +#define SI4xxx_SERCOM (SercomSpi*)SERCOM3 +#define SI4xxx_SERCOM_MOSI_PIN PIN_PA19 +#define SI4xxx_SERCOM_MOSI_PINMUX PINMUX_PA19D_SERCOM3_PAD3 +#define SI4xxx_SERCOM_MISO_PIN PIN_PA22 +#define SI4xxx_SERCOM_MISO_PINMUX PINMUX_PA22C_SERCOM3_PAD0 +#define SI4xxx_SERCOM_SCK_PIN PIN_PA23 +#define SI4xxx_SERCOM_SCK_PINMUX PINMUX_PA23C_SERCOM3_PAD1 +#define SI4xxx_SERCOM_MUX SPI_SIGNAL_MUX_SETTING_D +#define SI4xxx_SEL_PIN PIN_PA18 +#define SI4xxx_IRQ_PIN PIN_PA24 +#define SI4xxx_IRQ_PINMUX PINMUX_PA24A_EIC_EXTINT12 +#define SI4xxx_SDN_PIN PIN_PA17 +#define SI4xxx_GPIO0_PIN PIN_PA27 +#define SI4xxx_GPIO1_PIN PIN_PA25 +#define SI4xxx_GPIO1_PINMUX PINMUX_PA25F_TC5_WO1 +#define SI4xxx_TCXO_FREQUENCY 16369000 /** * RF Power @ 1.8V diff --git a/firmware/inc/si_trx_defs.h b/firmware/inc/si_trx_defs.h index 91b01f7..134506a 100644 --- a/firmware/inc/si_trx_defs.h +++ b/firmware/inc/si_trx_defs.h @@ -302,17 +302,17 @@ void _si_trx_transfer(int tx_count, int rx_count, uint8_t *data); * Chip Select. Active Low (High = Inactive, Low = Active) */ #define _si_trx_cs_enable() \ - port_pin_set_output_level(SI406X_SEL_PIN, 0) + port_pin_set_output_level(SI4xxx_SEL_PIN, 0) #define _si_trx_cs_disable() \ - port_pin_set_output_level(SI406X_SEL_PIN, 1) + port_pin_set_output_level(SI4xxx_SEL_PIN, 1) /** * Shutdown. Active High (High = Shutdown, Low = Run) */ #define _si_trx_sdn_enable() \ - port_pin_set_output_level(SI406X_SDN_PIN, 1) + port_pin_set_output_level(SI4xxx_SDN_PIN, 1) #define _si_trx_sdn_disable() \ - port_pin_set_output_level(SI406X_SDN_PIN, 0) + port_pin_set_output_level(SI4xxx_SDN_PIN, 0) /** * HF Clock diff --git a/firmware/src/ax25.c b/firmware/src/ax25.c index a2a532d..7c4b8ad 100644 --- a/firmware/src/ax25.c +++ b/firmware/src/ax25.c @@ -191,8 +191,8 @@ void ax25_gpio1_pwm_init(void) /* Enable the output pin */ - system_pinmux_pin_set_config(SI406X_GPIO1_PINMUX >> 16, /* GPIO Pin */ - SI406X_GPIO1_PINMUX & 0xFFFF, /* Mux Position */ + system_pinmux_pin_set_config(SI4xxx_GPIO1_PINMUX >> 16, /* GPIO Pin */ + SI4xxx_GPIO1_PINMUX & 0xFFFF, /* Mux Position */ SYSTEM_PINMUX_PIN_DIR_INPUT, /* Direction */ SYSTEM_PINMUX_PIN_PULL_NONE, /* Pull */ false); /* Powersave */ diff --git a/firmware/src/si_trx.c b/firmware/src/si_trx.c index 0433d1c..ae7e537 100644 --- a/firmware/src/si_trx.c +++ b/firmware/src/si_trx.c @@ -31,7 +31,7 @@ #include "hw_config.h" -#define VCXO_FREQUENCY SI406X_TCXO_FREQUENCY +#define VCXO_FREQUENCY SI4xxx_TCXO_FREQUENCY void _si_trx_transfer_nocts(int tx_count, int rx_count, uint8_t *data) @@ -260,7 +260,7 @@ static void si_trx_modem_set_deviation(uint32_t deviation) static void si_trx_modem_set_tx_datarate(uint32_t rate) { - uint32_t nco_max_count = ((float)SI406X_TCXO_FREQUENCY / 10); + uint32_t nco_max_count = ((float)SI4xxx_TCXO_FREQUENCY / 10); /* Set TX_NCO_MODE */ _si_trx_set_property_32(SI_PROPERTY_GROUP_MODEM, @@ -473,7 +473,7 @@ void si_trx_switch_channel(int16_t channel) void si_trx_shutdown(void) { /* Configure the SDN pin */ - port_pin_set_config(SI406X_SDN_PIN, + port_pin_set_config(SI4xxx_SDN_PIN, PORT_PIN_DIR_OUTPUT, /* Direction */ PORT_PIN_PULL_NONE, /* Pull */ false); /* Powersave */ @@ -489,7 +489,7 @@ void si_trx_init(void) si_trx_shutdown(); /* Configure the SPI select pin */ - port_pin_set_config(SI406X_SEL_PIN, + port_pin_set_config(SI4xxx_SEL_PIN, PORT_PIN_DIR_OUTPUT, /* Direction */ PORT_PIN_PULL_NONE, /* Pull */ false); /* Powersave */ @@ -498,24 +498,24 @@ void si_trx_init(void) _si_trx_cs_disable(); /* Configure the GPIO pins */ - port_pin_set_config(SI406X_GPIO0_PIN, + port_pin_set_config(SI4xxx_GPIO0_PIN, PORT_PIN_DIR_OUTPUT, /* Direction */ PORT_PIN_PULL_NONE, /* Pull */ false); /* Powersave */ - port_pin_set_output_level(SI406X_GPIO0_PIN, 0); - port_pin_set_config(SI406X_GPIO1_PIN, + port_pin_set_output_level(SI4xxx_GPIO0_PIN, 0); + port_pin_set_config(SI4xxx_GPIO1_PIN, PORT_PIN_DIR_OUTPUT, /* Direction */ PORT_PIN_PULL_NONE, /* Pull */ false); /* Powersave */ - port_pin_set_output_level(SI406X_GPIO1_PIN, 0); + port_pin_set_output_level(SI4xxx_GPIO1_PIN, 0); /* Configure the IRQ pin */ // TODO /* Configure the serial port */ - spi_bitbang_init(SI406X_SERCOM_MOSI_PIN, - SI406X_SERCOM_MISO_PIN, - SI406X_SERCOM_SCK_PIN); + spi_bitbang_init(SI4xxx_SERCOM_MOSI_PIN, + SI4xxx_SERCOM_MISO_PIN, + SI4xxx_SERCOM_SCK_PIN); } @@ -530,7 +530,7 @@ void spi_loopback_test(void) /* SPI_MODE_MASTER, /\** SPI mode *\/ */ /* SPI_DATA_ORDER_MSB, /\** Data order *\/ */ /* SPI_TRANSFER_MODE_0, /\** Transfer mode *\/ */ - /* SI406X_SERCOM_MUX, /\** Mux setting *\/ */ + /* SI4xxx_SERCOM_MUX, /\** Mux setting *\/ */ /* SPI_CHARACTER_SIZE_8BIT, /\** SPI character size *\/ */ /* false, /\** Enabled in sleep *\/ */ /* true, /\** Enable receiver *\/ */ @@ -541,15 +541,15 @@ void spi_loopback_test(void) /* 0, /\** Slave - Address mask *\/ */ /* false, /\** Slave - Preload data *\/ */ /* GCLK_GENERATOR_0, /\** GCLK generator to use *\/ */ - /* SI406X_SERCOM_MOSI_PINMUX, /\** Pinmux *\/ */ - /* SI406X_SERCOM_MISO_PINMUX, /\** Pinmux *\/ */ - /* SI406X_SERCOM_SCK_PINMUX, /\** Pinmux *\/ */ + /* SI4xxx_SERCOM_MOSI_PINMUX, /\** Pinmux *\/ */ + /* SI4xxx_SERCOM_MISO_PINMUX, /\** Pinmux *\/ */ + /* SI4xxx_SERCOM_SCK_PINMUX, /\** Pinmux *\/ */ /* PINMUX_UNUSED); /\** Pinmux *\/ */ /* Init loopback */ - spi_bitbang_init(SI406X_SERCOM_MOSI_PIN, - SI406X_SERCOM_MOSI_PIN, - SI406X_SERCOM_SCK_PIN); + spi_bitbang_init(SI4xxx_SERCOM_MOSI_PIN, + SI4xxx_SERCOM_MOSI_PIN, + SI4xxx_SERCOM_SCK_PIN); /* Enable */ diff --git a/firmware/src/telemetry.c b/firmware/src/telemetry.c index 45190ec..f14f957 100644 --- a/firmware/src/telemetry.c +++ b/firmware/src/telemetry.c @@ -486,8 +486,8 @@ void telemetry_gpio1_pwm_init(void) /* Enable the output pin */ - system_pinmux_pin_set_config(SI406X_GPIO1_PINMUX >> 16, /* GPIO Pin */ - SI406X_GPIO1_PINMUX & 0xFFFF, /* Mux Position */ + system_pinmux_pin_set_config(SI4xxx_GPIO1_PINMUX >> 16, /* GPIO Pin */ + SI4xxx_GPIO1_PINMUX & 0xFFFF, /* Mux Position */ SYSTEM_PINMUX_PIN_DIR_INPUT, /* Direction */ SYSTEM_PINMUX_PIN_PULL_NONE, /* Pull */ false); /* Powersave */