#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(AO_CC1120_SPI_BUS, 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)
data[0] = ((1 << CC1120_READ) |
(0 << CC1120_BURST) |
CC1120_EXTENDED);
- data[1] = addr;
+ data[1] = (uint8_t) addr;
d = 2;
} else {
data[0] = ((1 << CC1120_READ) |
(0 << CC1120_BURST) |
- addr);
+ (uint8_t) addr);
d = 1;
}
ao_radio_select();
data[0] = ((0 << CC1120_READ) |
(0 << CC1120_BURST) |
CC1120_EXTENDED);
- data[1] = addr;
+ data[1] = (uint8_t) addr;
d = 2;
} else {
data[0] = ((0 << CC1120_READ) |
(0 << CC1120_BURST) |
- addr);
+ (uint8_t) addr);
d = 1;
}
data[d] = value;
addr |= ((1 << CC1120_READ) |
(1 << CC1120_BURST));
}
- ao_radio_spi_send_byte(addr);
+ ao_radio_spi_send_byte((uint8_t) addr);
}
static void
static uint8_t
ao_radio_int_pin(void)
{
- return ao_gpio_get(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN, AO_CC1120_INT);
+ return ao_gpio_get(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN);
}
#if CC1120_DEBUG
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;
}
}
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);
if (!ao_radio_configured)
ao_radio_setup();
if (ao_config.radio_setting != last_radio_setting) {
- ao_radio_reg_write(CC1120_FREQ2, ao_config.radio_setting >> 16);
- ao_radio_reg_write(CC1120_FREQ1, ao_config.radio_setting >> 8);
- ao_radio_reg_write(CC1120_FREQ0, ao_config.radio_setting);
+ ao_radio_reg_write(CC1120_FREQ2, (uint8_t) (ao_config.radio_setting >> 16));
+ ao_radio_reg_write(CC1120_FREQ1, (uint8_t) (ao_config.radio_setting >> 8));
+ ao_radio_reg_write(CC1120_FREQ0, (uint8_t) (ao_config.radio_setting));
last_radio_setting = ao_config.radio_setting;
}
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;
}
ao_radio_set_len(len);
static uint8_t radio_on;
ao_cmd_white();
if (ao_cmd_lex_c != '\n') {
- ao_cmd_decimal();
- mode = (uint8_t) ao_cmd_lex_u32;
+ mode = (uint8_t) ao_cmd_decimal();
}
mode++;
if ((mode & 2) && !radio_on) {
}
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_mcu_wake && !ao_radio_abort)
}
if (done) {
- ao_radio_set_len(total & 0xff);
+ ao_radio_set_len((uint8_t) (total & 0xff));
ao_radio_set_mode(AO_RADIO_MODE_APRS_FINISH);
} 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_start_tx();
}
uint8_t
-ao_radio_recv(__xdata void *d, uint8_t size, uint8_t timeout)
+ao_radio_recv(void *d, uint8_t size, AO_TICK_TYPE timeout)
{
uint8_t len;
uint8_t radio_rssi = 0;
rx_packet_tick = 0;
#endif
len = size + 2; /* CRC bytes */
- len += 1 + ~(len & 1); /* 1 or two pad bytes */
+ len += (uint8_t) (1 + ~(len & 1)); /* 1 or two pad bytes */
len *= 2; /* 1/2 rate convolution */
rx_data_count = len * 8; /* bytes to bits */
rx_data_cur = 0;
rssi0 = ao_radio_reg_read(CC1120_RSSI0);
if (rssi0 & 1) {
- int8_t rssi = ao_radio_reg_read(CC1120_RSSI1);
+ int8_t rssi = (int8_t) ao_radio_reg_read(CC1120_RSSI1);
ao_radio_rssi = rssi;
/* Bound it to the representable range */
static void
ao_radio_aprs(void)
{
+#if PACKET_HAS_SLAVE
ao_packet_slave_stop();
+#endif
ao_aprs_send();
}
#endif