diff options
Diffstat (limited to 'software/hhd70dongle/hhd70dongle.c')
| -rw-r--r-- | software/hhd70dongle/hhd70dongle.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/software/hhd70dongle/hhd70dongle.c b/software/hhd70dongle/hhd70dongle.c index 81fabf4..f28886d 100644 --- a/software/hhd70dongle/hhd70dongle.c +++ b/software/hhd70dongle/hhd70dongle.c @@ -43,6 +43,7 @@ #include "hhd70.h" #include "c1101lib.h" +#include "cc1101_defines.h" //todo: move to separte File: @@ -95,7 +96,7 @@ void print_part_status(void) void beacon_enable(void) { - c1101_spi_strobe_command(SPIC1101_ADDR_STX); + c1101_spi_strobe_command(CC1101_CMD_STX); hhd70_palna_txmode(); } @@ -114,7 +115,7 @@ void beacon_off(void) void beacon_disable(void) { hhd70_palna_rxmode(); - c1101_spi_strobe_command(SPIC1101_ADDR_SIDLE); + c1101_spi_strobe_command(CC1101_CMD_SIDLE); } int main(void) @@ -133,7 +134,7 @@ int main(void) printf("hhd70dongle ready\r\n"); _delay_ms(500); - c1101_spi_strobe_command(SPIC1101_ADDR_SRES); // reset c1101 + c1101_spi_strobe_command(CC1101_CMD_SRES); // reset c1101 //c1101 init now happens after pressing B, S or E hhd70_palna_rxmode(); @@ -170,7 +171,7 @@ int main(void) enable_tx_part=false; enable_rx_part=false; enable_beacon_part=false; - c1101_spi_strobe_command(SPIC1101_ADDR_SRES); // reset c1101 + c1101_spi_strobe_command(CC1101_CMD_SRES); // reset c1101 hhd70_palna_rxmode(); print_part_status(); led_off(); @@ -213,7 +214,7 @@ int main(void) } else if ((char) recv_byte == 'R') { - c1101_spi_dump_registers_to_usb(); + c1101_spi_dump_registers(); print_part_status(); } else if ((char) recv_byte == 'D' || (char) recv_byte == 'd') @@ -334,13 +335,13 @@ int main(void) } } - + usbio_task(); if (enable_rx_part) { - c1101_spi_strobe_command(SPIC1101_ADDR_SRX); // enter RX - Mode + c1101_spi_strobe_command(CC1101_CMD_SRX); // enter RX - Mode _delay_ms(1000); if (hhd70_rx_data_available()) @@ -348,7 +349,7 @@ int main(void) led_on(); printf("RX: GDO2 pin HIGH\r\n"); printf("c1101 rx bytes:"); - debug_sprint_int16hex(write_buffer, c1101_spi_read_register(SPIC1101_ADDR_RXBYTES)); + debug_sprint_int16hex(write_buffer, c1101_spi_read_register(CC1101_REG_RO_RXBYTES)); printf("%s", write_buffer); printf("\r\n"); c1101_recieveData(); @@ -356,15 +357,15 @@ int main(void) } printf("c1101 rssi: "); - debug_sprint_int16hex(write_buffer, c1101_spi_read_register(SPIC1101_ADDR_RSSI)); + debug_sprint_int16hex(write_buffer, c1101_spi_read_register(CC1101_REG_RO_RSSI)); printf("%s", write_buffer); printf("\r\n"); printf("c1101 tx bytes: "); - debug_sprint_int16hex(write_buffer, c1101_spi_read_register(SPIC1101_ADDR_TXBYTES)); + debug_sprint_int16hex(write_buffer, c1101_spi_read_register(CC1101_REG_RO_TXBYTES)); printf("%s", write_buffer); printf("\r\n"); printf("c1101 rx bytes: "); - int16_t num_rx_bytes = c1101_spi_read_register(SPIC1101_ADDR_RXBYTES); + int16_t num_rx_bytes = c1101_spi_read_register(CC1101_REG_RO_RXBYTES); debug_sprint_int16hex(write_buffer, num_rx_bytes); printf("%s", write_buffer); printf("\r\n"); @@ -408,7 +409,7 @@ int main(void) /* _delay_ms(250); */ /* led_on(); */ /* printf("TX Data: String\r\n"); */ - c1101_transmitData_infPktMode("OE6EOF test mur.sat GFSK r:9k6 fdev:11kHz 1234567890123456789012345678901234567890 End of Test",93); + /* c1101_transmitData_infPktMode("OE6EOF test mur.sat GFSK r:9k6 fdev:11kHz 1234567890123456789012345678901234567890 End of Test",93); */ /* led_off(); */ /* _delay_ms(100); */ /* led_on(); */ @@ -424,12 +425,12 @@ int main(void) led_on(); //c1101_transmitData_infPktMode(mursat_beacon,sizeof(mursat_beacon)); hhd70_palna_txmode(); - c1101_spi_strobe_command(SPIC1101_ADDR_STX); + c1101_spi_strobe_command(CC1101_CMD_STX); hhd70_set_OOK_GDO0_high(); _delay_ms(1000); led_off(); hhd70_set_OOK_GDO0_low(); - c1101_spi_strobe_command(SPIC1101_ADDR_SIDLE); + c1101_spi_strobe_command(CC1101_CMD_SIDLE); hhd70_palna_rxmode(); _delay_ms(200); }*/ |