From 8e7e23305a90b3535792ed24ffbc89583f992369 Mon Sep 17 00:00:00 2001 From: Bernhard Tittelbach Date: Sun, 20 May 2012 02:06:36 +0000 Subject: fix write register bug git-svn-id: https://svn.spreadspace.org/mur.sat@446 7de4ea59-55d0-425e-a1af-a3118ea81d4c --- software/hhd70dongle/c1101lib.c | 2 +- software/hhd70dongle/hhd70dongle.c | 66 ++++++++++++++++++++------------------ 2 files changed, 35 insertions(+), 33 deletions(-) diff --git a/software/hhd70dongle/c1101lib.c b/software/hhd70dongle/c1101lib.c index 1c60727..9030f66 100644 --- a/software/hhd70dongle/c1101lib.c +++ b/software/hhd70dongle/c1101lib.c @@ -99,7 +99,7 @@ int16_t c1101_spi_write_register(char address, char byte) { hhd70_spi_cs_enable(); hhd70_c1101_wait_chip_rdy(); - if (c1101_spi_write_byte_ok_get_status(address & 0x2F) < 0) + if (c1101_spi_write_byte_ok_get_status(address & 0x3F) < 0) return -1; _delay_ms(2); if (c1101_spi_write_byte_ok_get_status(byte) < 0) diff --git a/software/hhd70dongle/hhd70dongle.c b/software/hhd70dongle/hhd70dongle.c index d89f1c4..030e6c0 100644 --- a/software/hhd70dongle/hhd70dongle.c +++ b/software/hhd70dongle/hhd70dongle.c @@ -71,8 +71,7 @@ int main(void) _delay_ms(500); c1101_init(); - hhd70_lna_enable(); - + hhd70_palna_rxmode(); for(;;) { _delay_ms(1000); @@ -80,38 +79,41 @@ int main(void) if (read_buffer[0] == 'r') reset(); - if (hhd70_rx_data_available()) - { - led_on(); - usb_rawhid_send((uint8_t*)"RX: GDO2 pin HIGH",100); - c1101_recieveData(); - led_off(); - } + //~ if (hhd70_rx_data_available() == 1) + //~ { + //~ led_on(); + //~ usb_rawhid_send((uint8_t*)"RX: GDO2 pin HIGH",100); + //~ debug_sprint_int16hex(write_buffer, c1101_spi_read_register(SPIC1101_ADDR_RXBYTES)); + //~ usb_rawhid_send(write_buffer,255); + //~ //usb_rawhid_send((uint8_t*)"c1101 IOCFG2:",255); + //~ c1101_recieveData(); + //~ led_off(); + //~ } - usb_rawhid_send((uint8_t*)"c1101 rssi:",255); + //~ usb_rawhid_send((uint8_t*)"c1101 rssi:",255); debug_sprint_int16hex(write_buffer, c1101_spi_read_register(SPIC1101_ADDR_RSSI)); usb_rawhid_send(write_buffer,255); usb_rawhid_send((uint8_t*)"c1101 tx bytes:",255); - debug_sprint_int16hex(write_buffer, c1101_spi_read_register(SPIC1101_ADDR_TXBYTES)); - usb_rawhid_send(write_buffer,255); - usb_rawhid_send((uint8_t*)"c1101 rx bytes:",255); - debug_sprint_int16hex(write_buffer, c1101_spi_read_register(SPIC1101_ADDR_RXBYTES)); - usb_rawhid_send(write_buffer,255); - //usb_rawhid_send((uint8_t*)"c1101 IOCFG2:",255); - //debug_sprint_int16hex(write_buffer, c1101_spi_read_register(SPIC1101_ADDR_IOCFG2)); - //usb_rawhid_send(write_buffer,255); - //usb_rawhid_send((uint8_t*)"c1101 IOCFG1:",255); - //debug_sprint_int16hex(write_buffer, c1101_spi_read_register(SPIC1101_ADDR_IOCFG1)); - //usb_rawhid_send(write_buffer,255); - //usb_rawhid_send((uint8_t*)"c1101 IOCFG0:",255); - //debug_sprint_int16hex(write_buffer, c1101_spi_read_register(SPIC1101_ADDR_IOCFG0)); - //usb_rawhid_send(write_buffer,255); - //usb_rawhid_send((uint8_t*)"c1101 FIFOTHR:",255); - //debug_sprint_int16hex(write_buffer, c1101_spi_read_register(SPIC1101_ADDR_FIFOTHR)); - //usb_rawhid_send(write_buffer,255); - usb_rawhid_send((uint8_t*)"c1101 PKTLEN:",255); - debug_sprint_int16hex(write_buffer, c1101_spi_read_register(SPIC1101_ADDR_PKTLEN)); - usb_rawhid_send(write_buffer,255); + //~ debug_sprint_int16hex(write_buffer, c1101_spi_read_register(SPIC1101_ADDR_TXBYTES)); + //~ usb_rawhid_send(write_buffer,255); + //~ usb_rawhid_send((uint8_t*)"c1101 rx bytes:",255); + //~ debug_sprint_int16hex(write_buffer, c1101_spi_read_register(SPIC1101_ADDR_RXBYTES)); + //~ usb_rawhid_send(write_buffer,255); + //~ //usb_rawhid_send((uint8_t*)"c1101 IOCFG2:",255); + //~ //debug_sprint_int16hex(write_buffer, c1101_spi_read_register(SPIC1101_ADDR_IOCFG2)); + //~ //usb_rawhid_send(write_buffer,255); + //~ //usb_rawhid_send((uint8_t*)"c1101 IOCFG1:",255); + //~ //debug_sprint_int16hex(write_buffer, c1101_spi_read_register(SPIC1101_ADDR_IOCFG1)); + //~ //usb_rawhid_send(write_buffer,255); + //~ //usb_rawhid_send((uint8_t*)"c1101 IOCFG0:",255); + //~ //debug_sprint_int16hex(write_buffer, c1101_spi_read_register(SPIC1101_ADDR_IOCFG0)); + //~ //usb_rawhid_send(write_buffer,255); + //~ //usb_rawhid_send((uint8_t*)"c1101 FIFOTHR:",255); + //~ //debug_sprint_int16hex(write_buffer, c1101_spi_read_register(SPIC1101_ADDR_FIFOTHR)); + //~ //usb_rawhid_send(write_buffer,255); + //~ usb_rawhid_send((uint8_t*)"c1101 PKTLEN:",255); + //~ debug_sprint_int16hex(write_buffer, c1101_spi_read_register(SPIC1101_ADDR_PKTLEN)); + //~ usb_rawhid_send(write_buffer,255); c1101_spi_dump_registers_to_usb(); write_buffer[0]='T'; write_buffer[1]='e'; @@ -120,11 +122,11 @@ int main(void) write_buffer[4]='s'; write_buffer[5]=':'; usb_rawhid_send((uint8_t*)"temp c1101:",255); - debug_sprint_int16hex(write_buffer+6, adc_read(ADCMUX_ADC12)); + debug_sprint_int16hex(write_buffer+6, c1101_measureTemp()); usb_rawhid_send(write_buffer+6,255); _delay_ms(250); usb_rawhid_send((uint8_t*)"temp atmega:",255); - debug_sprint_int16hex(write_buffer+10, c1101_measureTemp()); + debug_sprint_int16hex(write_buffer+10, adc_read(ADCMUX_ADC12)); usb_rawhid_send(write_buffer+10,255); _delay_ms(250); led_on(); -- cgit v1.2.3