mirror
/
pico-tracker
kopia lustrzana https://github.com/bristol-seds/pico-tracker
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Refactored SI406X defines to SI4xxx

master
Richard Meadows 2015-06-25 16:47:13 +01:00
rodzic 31edebc9e0
commit e7602eab03
5 zmienionych plików z 42 dodań i 45 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

35
firmware/inc/hw_config.h
Wyświetl plik

@ -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

8
firmware/inc/si_trx_defs.h
Wyświetl plik

@ -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

4
firmware/src/ax25.c
Wyświetl plik

@ -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 */

36
firmware/src/si_trx.c
Wyświetl plik

@ -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 */

4
firmware/src/telemetry.c
Wyświetl plik

@ -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 */