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

[si_trx] fix compiler warnings, set pa duty cycle to default values 

TODO: try out other settings of pa duty cycle, may be more efficient
main-solar-only
Richard Meadows 2016-03-28 14:05:13 +01:00
rodzic 5a671c8366
commit 10e6d0944b
2 zmienionych plików z 18 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -303,7 +303,7 @@ enum {
* Generic SPI Send / Receive * Generic SPI Send / Receive
*/ */
void _si_trx_transfer(int tx_count, int rx_count, uint8_t *data); void _si_trx_transfer(int tx_count, int rx_count, uint8_t *data);
void _si_trx_transfer_uint16(uint16_t value);
/** /**
* Chip Select. Active Low (High = Inactive, Low = Active) * Chip Select. Active Low (High = Inactive, Low = Active)
*/ */
@ -328,13 +328,6 @@ void _si_trx_transfer(int tx_count, int rx_count, uint8_t *data);
#define _si_trx_hf_clock_disable(void) \ #define _si_trx_hf_clock_disable(void) \
/* NOT USED: Clock is always enabled */ /* NOT USED: Clock is always enabled */
/**
* Convenience function for 16-bit transfer functions
*/
static void _si_trx_transfer_uint16(uint16_t value)
{
_si_trx_transfer(2, 0, (uint8_t*)&value);
}
/** /**
* State changes * State changes
*/ */

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

@ -41,7 +41,7 @@
/** /**
* Convenience transfer functions * Convenience transfer functions
*/ */
static void _si_trx_set_property_8(uint8_t group, uint8_t property, uint8_t value) static inline void _si_trx_set_property_8(uint8_t group, uint8_t property, uint8_t value)
{ {
uint8_t buffer[5]; uint8_t buffer[5];
@ -53,7 +53,7 @@ static void _si_trx_set_property_8(uint8_t group, uint8_t property, uint8_t valu
_si_trx_transfer(5, 0, buffer); _si_trx_transfer(5, 0, buffer);
} }
static void _si_trx_set_property_16(uint8_t group, uint8_t property, uint16_t value) static inline void _si_trx_set_property_16(uint8_t group, uint8_t property, uint16_t value)
{ {
uint8_t buffer[6]; uint8_t buffer[6];
@ -66,7 +66,7 @@ static void _si_trx_set_property_16(uint8_t group, uint8_t property, uint16_t va
_si_trx_transfer(6, 0, buffer); _si_trx_transfer(6, 0, buffer);
} }
static void _si_trx_set_property_24(uint8_t group, uint8_t property, uint32_t value) static inline void _si_trx_set_property_24(uint8_t group, uint8_t property, uint32_t value)
{ {
uint8_t buffer[8]; uint8_t buffer[8];
@ -80,7 +80,7 @@ static void _si_trx_set_property_24(uint8_t group, uint8_t property, uint32_t va
_si_trx_transfer(7, 0, buffer); _si_trx_transfer(7, 0, buffer);
} }
static void _si_trx_set_property_32(uint8_t group, uint8_t property, uint32_t value) static inline void _si_trx_set_property_32(uint8_t group, uint8_t property, uint32_t value)
{ {
uint8_t buffer[8]; uint8_t buffer[8];
@ -175,6 +175,13 @@ void _si_trx_transfer(int tx_count, int rx_count, uint8_t *data)
_si_trx_cs_disable(); _si_trx_cs_disable();
} }
/**
* Convenience function for 16-bit transfer functions
*/
void _si_trx_transfer_uint16(uint16_t value)
{
_si_trx_transfer(2, 0, (uint8_t*)&value);
}
/** /**
@ -569,6 +576,7 @@ void si_trx_reset(uint8_t modulation_type, struct si_frequency_configuration* fc
si_trx_set_frequency(fconfig, deviation); si_trx_set_frequency(fconfig, deviation);
si_trx_set_tx_power(power); si_trx_set_tx_power(power);
si_trx_set_tx_pa_duty_cycle(SI_PA_BIAS_CLKDUTY_DIFF_50);
/* Modem tx filter coefficients */ /* Modem tx filter coefficients */
uint8_t rsid_si_coeff[] = {0x1, 0x4, 0x9, 0x11, 0x19, 0x22, 0x2a, 0x30, 0x31}; uint8_t rsid_si_coeff[] = {0x1, 0x4, 0x9, 0x11, 0x19, 0x22, 0x2a, 0x30, 0x31};
@ -746,6 +754,10 @@ void spi_loopback_test(void)
/* Test transfer */ /* Test transfer */
uint8_t data = spi_bitbang_transfer(0x34); uint8_t data = spi_bitbang_transfer(0x34);
/* Print result */
//semihost_printf("Rx'ed: 0x%02x\n", data); //semihost_printf("Rx'ed: 0x%02x\n", data);
/* check result */
if (data != 0x34) {
while(1);
}
} }