X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_cc1200.c;h=727097441007fee784b2e570fd57d7d315ec7466;hb=bf51520898fb30b289b2e03b31a1719c172cf422;hp=6f04380300c59c8547e2fd3e3f85cf811dc7d426;hpb=c89268c1fa70fbdc661ac0963b9f8fe22c42bbfe;p=fw%2Faltos diff --git a/src/drivers/ao_cc1200.c b/src/drivers/ao_cc1200.c index 6f043803..72709744 100644 --- a/src/drivers/ao_cc1200.c +++ b/src/drivers/ao_cc1200.c @@ -75,12 +75,12 @@ ao_radio_reg_read(uint16_t addr) data[0] = ((1 << CC1200_READ) | (0 << CC1200_BURST) | CC1200_EXTENDED); - data[1] = addr; + data[1] = (uint8_t) addr; d = 2; } else { data[0] = ((1 << CC1200_READ) | (0 << CC1200_BURST) | - addr); + (uint8_t) addr); d = 1; } ao_radio_select(); @@ -106,12 +106,12 @@ ao_radio_reg_write(uint16_t addr, uint8_t value) data[0] = ((0 << CC1200_READ) | (0 << CC1200_BURST) | CC1200_EXTENDED); - data[1] = addr; + data[1] = (uint8_t) addr; d = 2; } else { data[0] = ((0 << CC1200_READ) | (0 << CC1200_BURST) | - addr); + (uint8_t) addr); d = 1; } data[d] = value; @@ -204,6 +204,7 @@ ao_radio_status(void) void ao_radio_recv_abort(void) { + ao_exti_disable(AO_CC1200_INT_PORT, AO_CC1200_INT_PIN); ao_radio_abort = 1; ao_wakeup(&ao_radio_wake); } @@ -213,7 +214,6 @@ ao_radio_recv_abort(void) static void ao_radio_isr(void) { - ao_exti_disable(AO_CC1200_INT_PORT, AO_CC1200_INT_PIN); ao_radio_wake = 1; ao_wakeup(&ao_radio_wake); } @@ -221,14 +221,12 @@ ao_radio_isr(void) static void ao_radio_start_tx(void) { - ao_exti_enable(AO_CC1200_INT_PORT, AO_CC1200_INT_PIN); ao_radio_strobe(CC1200_STX); } static void ao_radio_start_rx(void) { - ao_exti_enable(AO_CC1200_INT_PORT, AO_CC1200_INT_PIN); ao_radio_strobe(CC1200_SRX); } @@ -575,8 +573,7 @@ static uint16_t ao_radio_mode; #define AO_RADIO_MODE_BITS_PACKET 1 #define AO_RADIO_MODE_BITS_TX_BUF 4 -#define AO_RADIO_MODE_BITS_TX_FINISH 8 -#define AO_RADIO_MODE_BITS_RX 16 +#define AO_RADIO_MODE_BITS_FINISH 8 #define AO_RADIO_MODE_BITS_RDF 32 #define AO_RADIO_MODE_BITS_APRS 64 #define AO_RADIO_MODE_BITS_TEST 128 @@ -584,12 +581,12 @@ static uint16_t ao_radio_mode; #define AO_RADIO_MODE_BITS_FIXED 512 #define AO_RADIO_MODE_NONE 0 -#define AO_RADIO_MODE_PACKET_TX (AO_RADIO_MODE_BITS_PACKET | AO_RADIO_MODE_BITS_FIXED | AO_RADIO_MODE_BITS_TX_FINISH) -#define AO_RADIO_MODE_PACKET_RX (AO_RADIO_MODE_BITS_PACKET | AO_RADIO_MODE_BITS_FIXED | AO_RADIO_MODE_BITS_RX) -#define AO_RADIO_MODE_RDF (AO_RADIO_MODE_BITS_RDF | AO_RADIO_MODE_BITS_FIXED | AO_RADIO_MODE_BITS_TX_FINISH) +#define AO_RADIO_MODE_PACKET_TX (AO_RADIO_MODE_BITS_PACKET | AO_RADIO_MODE_BITS_FIXED | AO_RADIO_MODE_BITS_FINISH) +#define AO_RADIO_MODE_PACKET_RX (AO_RADIO_MODE_BITS_PACKET | AO_RADIO_MODE_BITS_FIXED | AO_RADIO_MODE_BITS_FINISH) +#define AO_RADIO_MODE_RDF (AO_RADIO_MODE_BITS_RDF | AO_RADIO_MODE_BITS_FIXED | AO_RADIO_MODE_BITS_FINISH) #define AO_RADIO_MODE_APRS_BUF (AO_RADIO_MODE_BITS_APRS | AO_RADIO_MODE_BITS_INFINITE | AO_RADIO_MODE_BITS_TX_BUF) #define AO_RADIO_MODE_APRS_LAST_BUF (AO_RADIO_MODE_BITS_APRS | AO_RADIO_MODE_BITS_FIXED | AO_RADIO_MODE_BITS_TX_BUF) -#define AO_RADIO_MODE_APRS_FINISH (AO_RADIO_MODE_BITS_APRS | AO_RADIO_MODE_BITS_FIXED | AO_RADIO_MODE_BITS_TX_FINISH) +#define AO_RADIO_MODE_APRS_FINISH (AO_RADIO_MODE_BITS_APRS | AO_RADIO_MODE_BITS_FIXED | AO_RADIO_MODE_BITS_FINISH) #define AO_RADIO_MODE_TEST (AO_RADIO_MODE_BITS_TEST | AO_RADIO_MODE_BITS_INFINITE | AO_RADIO_MODE_BITS_TX_BUF) static void @@ -598,7 +595,7 @@ _ao_radio_set_regs(const uint16_t *regs, int nreg) int i; for (i = 0; i < nreg; i++) { - ao_radio_reg_write(regs[0], regs[1]); + ao_radio_reg_write(regs[0], (uint8_t) regs[1]); regs += 2; } } @@ -613,7 +610,7 @@ ao_radio_set_mode(uint16_t new_mode) if (new_mode == ao_radio_mode) return; - changes = new_mode & (~ao_radio_mode); + changes = (uint16_t) (new_mode & (~ao_radio_mode)); if (changes & AO_RADIO_MODE_BITS_PACKET) { ao_radio_set_regs(packet_setup); @@ -642,17 +639,10 @@ ao_radio_set_mode(uint16_t new_mode) if (changes & AO_RADIO_MODE_BITS_TX_BUF) { ao_radio_reg_write(AO_CC1200_INT_GPIO_IOCFG, CC1200_IOCFG_GPIO_CFG_TXFIFO_THR); - ao_exti_set_mode(AO_CC1200_INT_PORT, AO_CC1200_INT_PIN, AO_EXTI_MODE_FALLING|AO_EXTI_PRIORITY_HIGH); } - if (changes & AO_RADIO_MODE_BITS_TX_FINISH) { + if (changes & AO_RADIO_MODE_BITS_FINISH) { ao_radio_reg_write(AO_CC1200_INT_GPIO_IOCFG, CC1200_IOCFG_GPIO_CFG_PKT_SYNC_RXTX); - ao_exti_set_mode(AO_CC1200_INT_PORT, AO_CC1200_INT_PIN, AO_EXTI_MODE_FALLING|AO_EXTI_PRIORITY_HIGH); - } - - if (changes & AO_RADIO_MODE_BITS_RX) { - ao_radio_reg_write(AO_CC1200_INT_GPIO_IOCFG, CC1200_IOCFG_GPIO_CFG_MARC_MCU_WAKEUP); - ao_exti_set_mode(AO_CC1200_INT_PORT, AO_CC1200_INT_PIN, AO_EXTI_MODE_RISING|AO_EXTI_PRIORITY_HIGH); } if (changes & AO_RADIO_MODE_BITS_RDF) @@ -716,22 +706,35 @@ ao_radio_get(uint8_t len) { static uint32_t last_radio_setting; static uint8_t last_radio_rate; + static uint8_t last_radio_10mw; ao_mutex_get(&ao_radio_mutex); if (!ao_radio_configured) ao_radio_setup(); if (ao_config.radio_setting != last_radio_setting) { - ao_radio_reg_write(CC1200_FREQ2, ao_config.radio_setting >> 16); - ao_radio_reg_write(CC1200_FREQ1, ao_config.radio_setting >> 8); - ao_radio_reg_write(CC1200_FREQ0, ao_config.radio_setting); + ao_radio_reg_write(CC1200_FREQ2, (uint8_t) (ao_config.radio_setting >> 16)); + ao_radio_reg_write(CC1200_FREQ1, (uint8_t) (ao_config.radio_setting >> 8)); + ao_radio_reg_write(CC1200_FREQ0, (uint8_t) ao_config.radio_setting); last_radio_setting = ao_config.radio_setting; ao_radio_strobe(CC1200_SCAL); } if (ao_config.radio_rate != last_radio_rate) { - ao_radio_mode &= ~AO_RADIO_MODE_BITS_PACKET; + ao_radio_mode &= (uint16_t) ~AO_RADIO_MODE_BITS_PACKET; last_radio_rate = ao_config.radio_rate; } + if(ao_config.radio_10mw != last_radio_10mw) { + last_radio_10mw = ao_config.radio_10mw; + /* + * 0x37 "should" be 10dBm, but measurements on TBT + * v4.0 show that too hot, so use * 0x32 to make sure + * we're in spec. + */ + if (ao_config.radio_10mw) + ao_radio_reg_write(CC1200_PA_CFG1, 0x32); + else + ao_radio_reg_write(CC1200_PA_CFG1, 0x3f); + } ao_radio_set_len(len); } @@ -759,12 +762,18 @@ ao_radio_show_state(char *where) /* Wait for the radio to signal an interrupt */ static void -ao_radio_wait_isr(uint16_t timeout) +_ao_radio_wait_isr(AO_TICK_TYPE timeout) { - ao_arch_block_interrupts(); while (!ao_radio_wake && !ao_radio_abort) if (ao_sleep_for(&ao_radio_wake, timeout)) ao_radio_abort = 1; +} + +static void +ao_radio_wait_isr(AO_TICK_TYPE timeout) +{ + ao_arch_block_interrupts(); + _ao_radio_wait_isr(timeout); ao_arch_release_interrupts(); } @@ -881,7 +890,7 @@ ao_radio_test_cmd(void) uint8_t mode = 2; ao_cmd_white(); if (ao_cmd_lex_c != '\n') - mode = ao_cmd_decimal(); + mode = (uint8_t) ao_cmd_decimal(); mode++; if ((mode & 2)) ao_radio_test_on(); @@ -927,14 +936,15 @@ ao_radio_send_aprs(ao_radio_fill_func fill) /* At the last buffer, set the total length */ if (done) - ao_radio_set_len(total & 0xff); + ao_radio_set_len((uint8_t) (total & 0xff)); /* Wait for some space in the fifo */ + ao_arch_block_interrupts(); while (started && ao_radio_int_pin() != 0 && !ao_radio_abort) { ao_radio_wake = 0; - ao_exti_enable(AO_CC1200_INT_PORT, AO_CC1200_INT_PIN); - ao_radio_wait_isr(AO_MS_TO_TICKS(1000)); + _ao_radio_wait_isr(AO_MS_TO_TICKS(1000)); } + ao_arch_release_interrupts(); if (ao_radio_abort) break; @@ -943,18 +953,19 @@ ao_radio_send_aprs(ao_radio_fill_func fill) else ao_radio_set_mode(AO_RADIO_MODE_APRS_BUF); - ao_radio_fifo_write(buf, cnt); + ao_radio_fifo_write(buf, (uint8_t) cnt); if (!started) { ao_radio_strobe(CC1200_STX); started = 1; } } /* Wait for the transmitter to go idle */ + ao_arch_block_interrupts(); while (started && ao_radio_int_pin() != 0 && !ao_radio_abort) { ao_radio_wake = 0; - ao_exti_enable(AO_CC1200_INT_PORT, AO_CC1200_INT_PIN); - ao_radio_wait_isr(AO_MS_TO_TICKS(1000)); + _ao_radio_wait_isr(AO_MS_TO_TICKS(1000)); } + ao_arch_release_interrupts(); if (ao_radio_abort) ao_radio_idle(); ao_radio_put(); @@ -1008,7 +1019,7 @@ ao_radio_dump_state(struct ao_radio_state *s) #endif uint8_t -ao_radio_recv(void *d, uint8_t size, uint8_t timeout) +ao_radio_recv(void *d, uint8_t size, AO_TICK_TYPE timeout) { uint8_t success = 0; @@ -1020,6 +1031,8 @@ ao_radio_recv(void *d, uint8_t size, uint8_t timeout) while (!ao_radio_abort) { ao_radio_wait_isr(timeout); + if (ao_radio_abort) + break; if (ao_radio_wake) { uint8_t marc_status1 = ao_radio_reg_read(CC1200_MARC_STATUS1); @@ -1069,13 +1082,13 @@ ao_radio_recv(void *d, uint8_t size, uint8_t timeout) switch (ao_config.radio_rate) { default: case AO_RADIO_RATE_38400: - timeout = AO_MS_TO_TICKS(size * (8 * 2 * 10) / 384) + 1; + timeout = AO_MS_TO_TICKS((AO_TICK_TYPE) size * (8 * 2 * 10) / 384) + 1; break; case AO_RADIO_RATE_9600: - timeout = AO_MS_TO_TICKS(size * (8 * 2 * 10) / 96) + 1; + timeout = AO_MS_TO_TICKS((AO_TICK_TYPE) size * (8 * 2 * 10) / 96) + 1; break; case AO_RADIO_RATE_2400: - timeout = AO_MS_TO_TICKS(size * (8 * 2 * 10) / 24) + 1; + timeout = AO_MS_TO_TICKS((AO_TICK_TYPE) size * (8 * 2 * 10) / 24) + 1; break; } } @@ -1096,7 +1109,7 @@ ao_radio_recv(void *d, uint8_t size, uint8_t timeout) rssi = -11; /* Write it back to the packet */ - ((int8_t *) d)[size-2] = AO_RADIO_FROM_RSSI(rssi); + ((uint8_t *) d)[size-2] = AO_RADIO_FROM_RSSI(rssi); } else { ao_radio_idle(); ao_radio_rssi = 0; @@ -1468,5 +1481,7 @@ ao_radio_init(void) AO_EXTI_MODE_FALLING|AO_EXTI_PRIORITY_HIGH, ao_radio_isr); + ao_exti_enable(AO_CC1200_INT_PORT, AO_CC1200_INT_PIN); + ao_cmd_register(&ao_radio_cmds[0]); }