diff options
author | Bernhard Tittelbach <xro@realraum.at> | 2012-05-17 06:14:27 +0000 |
---|---|---|
committer | Bernhard Tittelbach <xro@realraum.at> | 2012-05-17 06:14:27 +0000 |
commit | 33c96ee874cbd9548fcec54b97d1882548f3e50f (patch) | |
tree | a7742a9bc2aba0fa521154eaa9c7bc06083a1020 /software/hhd70dongle | |
parent | spi and c1101 lib needs to be cleanly separated, code needs to be tested and ... (diff) |
spi and c1101 code shuffling
git-svn-id: https://svn.spreadspace.org/mur.sat@417 7de4ea59-55d0-425e-a1af-a3118ea81d4c
Diffstat (limited to 'software/hhd70dongle')
-rw-r--r-- | software/hhd70dongle/Makefile | 2 | ||||
-rw-r--r-- | software/hhd70dongle/c1101lib.c | 104 | ||||
-rw-r--r-- | software/hhd70dongle/c1101lib.h | 108 | ||||
-rw-r--r-- | software/hhd70dongle/hhd70dongle.c | 6 | ||||
-rw-r--r-- | software/hhd70dongle/spi.c | 217 | ||||
-rw-r--r-- | software/hhd70dongle/spi.h | 7 |
6 files changed, 227 insertions, 217 deletions
diff --git a/software/hhd70dongle/Makefile b/software/hhd70dongle/Makefile index 2b9b239..80c92b8 100644 --- a/software/hhd70dongle/Makefile +++ b/software/hhd70dongle/Makefile @@ -21,7 +21,7 @@ ##
NAME := hhd70dongle
-OBJ := hhd70dongle.o led.o spi.o usb_rawhid.o
+OBJ := hhd70dongle.o led.o spi.o usb_rawhid.o c1101lib.o
BOARD_TYPE := teensy2
include ../teensy.include.mk
diff --git a/software/hhd70dongle/c1101lib.c b/software/hhd70dongle/c1101lib.c index 875e6d6..26d5fb9 100644 --- a/software/hhd70dongle/c1101lib.c +++ b/software/hhd70dongle/c1101lib.c @@ -36,9 +36,105 @@ #include "spi.h" //#include "usb_rawhid.h" +/**** Helper Functions ****/ -#max len: 64 bytes -void writeTXFifo(char *buffer, len) +char spi_c1101_exchange(char *data, int len) +{ + char rbyte; + spi_cs_enable(); + while (len--) + { + while ( ! (SPIC1101_SB_CHIPRDY(spi_read_byte()))); + spi_write_byte(*(data++)); + } + rbyte = spi_read_byte(); + spi_cs_disable(); + return rbyte; +} + +// note addresses range from 0x00 to 0x2F for normal registers and 0xF0 to 0xFD for special status registers +char spi_c1101_read_register(char address) +{ + char data[1]; + data[0]=address | 0x80; + return spi_c1101_exchange(data, 1); +} + +// note addresses range from 0x00 to 0x2F for normal registers +char spi_c1101_write_register(char address, char byte) +{ + char data[2]; + data[0]=address & 0x2F; + data[1]=byte; + return spi_c1101_exchange(data, 2); +} + +// note addresses range from 0x30 to 0x3D for command strobes +char spi_c1101_strobe_command(char address) +{ + char data[1]; + data[0]=address; + return spi_c1101_exchange(data, 1); +} + +int spi_c1101_read_rxfifo(int leave_num_bytes, char *buffer, int maxlen) +{ + char sb; + int num_read = 0; + int num_fifo_available = 0; + spi_cs_enable(); + while ( ! (SPIC1101_SB_CHIPRDY(spi_read_byte()))); + spi_write_byte(SPIC1101_ADDR_FIFO_READ_BURST); + do + { + sb = spi_read_byte(); + } while ( ! (SPIC1101_SB_CHIPRDY(sb))); + num_fifo_available = SPIC1101_SB_FIFO_BYTES_AVAILABLE(sb); + + while (maxlen-- && num_fifo_available - num_read <= leave_num_bytes) + { + //hope this works !! + buffer[num_read++] = spi_read_byte(); + } + spi_cs_disable(); + return num_read; +} + +//note: always check if num_written returned == len given +int spi_c1101_write_txfifo(char *buffer, int len) +{ + char sb; + int num_written = 0; + int num_fifo_available = 0; + spi_cs_enable(); + while ( ! (SPIC1101_SB_CHIPRDY(spi_read_byte()))); + spi_write_byte(SPIC1101_ADDR_FIFO_WRITE_BURST); + do + { + sb = spi_read_byte(); + } while ( ! (SPIC1101_SB_CHIPRDY(sb))); + num_fifo_available = SPIC1101_SB_FIFO_BYTES_AVAILABLE(sb); + + //if there is less space in tx-fifo than num-byte we want to send, only fill fifo until full and leave rest of buffer unsent (for now) + if (num_fifo_available < len) + len = num_fifo_available; + + while (len--) + { + //hope this works !! + spi_write_byte(buffer[num_written++]); + } + spi_cs_disable(); + return num_written; +} + + + +/**** External Functions ****/ + + +//max len: 64 bytes +void writeTXFifo(char *buffer, unsigned int len) { //check TXBYTES.NUM_TXBYTES // never write more bytes than avaiblabe or doom ensues @@ -46,7 +142,7 @@ void writeTXFifo(char *buffer, len) } -#max returned: 64 bytes +//max returned: 64 bytes int readRXFifo(char *buffer) { //check RXBYTES.NUM_RXBYTES @@ -56,5 +152,5 @@ int readRXFifo(char *buffer) // and last read byte will be duplicated. // thus: don't last avialable FIFO Bytes unless we can be sure that it will be the last byte of a packet and we can be sure that a following duplicated byte is actually an Fifo duplication and not an actually recieved byte ! - + return 0; }
\ No newline at end of file diff --git a/software/hhd70dongle/c1101lib.h b/software/hhd70dongle/c1101lib.h index 19d057f..7224a61 100644 --- a/software/hhd70dongle/c1101lib.h +++ b/software/hhd70dongle/c1101lib.h @@ -34,13 +34,111 @@ #define C1101_FIFO_MAX_LEN 64 -#max len: 64 bytes -void writeTXFifo(char *buffer, len); +//read/write config registers: +#define SPIC1101_ADDR_IOCFG2 0x00 +#define SPIC1101_ADDR_IOCFG1 0x01 +#define SPIC1101_ADDR_IOCFG0 0x02 +#define SPIC1101_ADDR_FIFOTHR 0x03 +#define SPIC1101_ADDR_SYNC1 0x04 +#define SPIC1101_ADDR_SYNC0 0x05 +#define SPIC1101_ADDR_PKTLEN 0x06 +#define SPIC1101_ADDR_PKTCTRL1 0x07 +#define SPIC1101_ADDR_PKTCTRL0 0x08 +#define SPIC1101_ADDR_ADDR 0x09 +#define SPIC1101_ADDR_CHANNR 0x0A +#define SPIC1101_ADDR_FSCTRL1 0x0B +#define SPIC1101_ADDR_FSCTRL0 0x0C +#define SPIC1101_ADDR_FREQ2 0x0D +#define SPIC1101_ADDR_FREQ1 0x0E +#define SPIC1101_ADDR_FREQ0 0x0F +#define SPIC1101_ADDR_MDMCFG4 0x10 +#define SPIC1101_ADDR_MDMCFG3 0x11 +#define SPIC1101_ADDR_MDMCFG2 0x12 +#define SPIC1101_ADDR_MDMCFG1 0x13 +#define SPIC1101_ADDR_MDMCFG0 0x14 +#define SPIC1101_ADDR_DEVIATN 0x15 +#define SPIC1101_ADDR_MCSM2 0x16 +#define SPIC1101_ADDR_MCSM1 0x17 +#define SPIC1101_ADDR_MCSM0 0x18 +#define SPIC1101_ADDR_FOCCFG 0x19 +#define SPIC1101_ADDR_BSCFG 0x1A +#define SPIC1101_ADDR_AGCCTRL2 0x1B +#define SPIC1101_ADDR_AGCCTRL1 0x1C +#define SPIC1101_ADDR_AGCCTRL0 0x1D +#define SPIC1101_ADDR_WOREVT1 0x1E +#define SPIC1101_ADDR_WOREVT0 0x1F +#define SPIC1101_ADDR_WORCTRL 0x20 +#define SPIC1101_ADDR_FREND1 0x21 +#define SPIC1101_ADDR_FREND0 0x22 +#define SPIC1101_ADDR_FSCAL3 0x23 +#define SPIC1101_ADDR_FSCAL2 0x24 +#define SPIC1101_ADDR_FSCAL1 0x25 +#define SPIC1101_ADDR_FSCAL0 0x26 +#define SPIC1101_ADDR_RCCTRL1 0x27 +#define SPIC1101_ADDR_RCCTRL0 0x28 +#define SPIC1101_ADDR_FSTEST 0x29 +#define SPIC1101_ADDR_PTEST 0x2A +#define SPIC1101_ADDR_AGCTEST 0x2B +#define SPIC1101_ADDR_TEST2 0x2C +#define SPIC1101_ADDR_TEST1 0x2D +#define SPIC1101_ADDR_TEST0 0x2E -#max returned: 64 bytes +//commands: +#define SPIC1101_ADDR_SRES 0x30 +#define SPIC1101_ADDR_SFSTXON 0x31 +#define SPIC1101_ADDR_SXOFF 0x32 +#define SPIC1101_ADDR_SCAL 0x33 +#define SPIC1101_ADDR_SRX 0x34 +#define SPIC1101_ADDR_STX 0x35 +#define SPIC1101_ADDR_SIDLE 0x36 +#define SPIC1101_ADDR_SWOR 0x38 +#define SPIC1101_ADDR_SPWD 0x39 +#define SPIC1101_ADDR_SFRX 0x3A +#define SPIC1101_ADDR_SFTX 0x3B +#define SPIC1101_ADDR_SWORRST 0x3C +#define SPIC1101_ADDR_SNOP 0x3D + +//readonly registers: +#define SPIC1101_ADDR_PARTNUM (0x30 | 0xC0) +#define SPIC1101_ADDR_VERSION (0x31 | 0xC0) +#define SPIC1101_ADDR_FREQUEST (0x32 | 0xC0) +#define SPIC1101_ADDR_LQI (0x33 | 0xC0) +#define SPIC1101_ADDR_RSSI (0x34 | 0xC0) +#define SPIC1101_ADDR_MARCSTATE (0x35 | 0xC0) +#define SPIC1101_ADDR_WORTIME1 (0x36 | 0xC0) +#define SPIC1101_ADDR_WORTIME0 (0x37 | 0xC0) +#define SPIC1101_ADDR_PKTSTATUS (0x38 | 0xC0) +#define SPIC1101_ADDR_VCO_VC_DAC (0x39 | 0xC0) +#define SPIC1101_ADDR_TXBYTES (0x3A | 0xC0) +#define SPIC1101_ADDR_RXBYTES (0x3B | 0xC0) +#define SPIC1101_ADDR_RCCTRL1_STATUS (0x3C | 0xC0) +#define SPIC1101_ADDR_RCCTRL0_STATUS (0x3D | 0xC0) + + +#define SPIC1101_ADDR_FIFO_READ (0x3F | 0x80) +#define SPIC1101_ADDR_FIFO_READ_BURST (0x3F | 0x80 | 0xC0) +#define SPIC1101_ADDR_FIFO_WRITE 0x3F +#define SPIC1101_ADDR_FIFO_WRITE_BURST (0x3F | 0x40) + +#define SPIC1101_SB_CHIPRDY(x) x & 0b1000000 +#define SPIC1101_SB_IDLE(x) (x & 0b0111000) == 0b000000 +#define SPIC1101_SB_RXMODE(x) (x & 0b0111000) == 0b001000 +#define SPIC1101_SB_TXMODE(x) (x & 0b0111000) == 0b010000 +#define SPIC1101_SB_FSTXON(x) (x & 0b0111000) == 0b011000 +#define SPIC1101_SB_CALIBRATE(x) (x & 0b0111000) == 0b100000 +#define SPIC1101_SB_SETTLING(x) (x & 0b0111000) == 0b101000 +#define SPIC1101_SB_RXFIFO_OVERFLOW(x) (x & 0b0111000b) == 0b110000 +#define SPIC1101_SB_TXFIFO_OVERFLOW(x) (x & 0b0111000b) == 0b111000 +#define SPIC1101_SB_FIFO_BYTES_AVAILABLE(x) (x & 0b0000111) + + +//max len: 64 bytes +void writeTXFifo(char *buffer, unsigned int len); + +//max returned: 64 bytes int readRXFifo(char *buffer); -#set WakeOnRadio to enabled (true) or disabled(false) -void setWOR(bool enable); +//set WakeOnRadio to enabled (true) or disabled(false) +void setWOR(int enable); #endif diff --git a/software/hhd70dongle/hhd70dongle.c b/software/hhd70dongle/hhd70dongle.c index 85d9d0f..7e11d45 100644 --- a/software/hhd70dongle/hhd70dongle.c +++ b/software/hhd70dongle/hhd70dongle.c @@ -97,8 +97,8 @@ int main(void) usb_rawhid_send("temp atmega: ",13);
write_buffer[0] = '0' + internal_temp/26;
usb_rawhid_send(write_buffer,1);
- char buf[10];
- unsigned int len;
- spi_read(sizeof(buf),buf,&len);
+ //~ char buf[10];
+ //~ unsigned int len;
+ //~ spi_read(sizeof(buf),buf,&len);
}
}
diff --git a/software/hhd70dongle/spi.c b/software/hhd70dongle/spi.c index 1e2e377..c7172ce 100644 --- a/software/hhd70dongle/spi.c +++ b/software/hhd70dongle/spi.c @@ -77,11 +77,11 @@ void spi_write_byte(char byte) while(!(SPSR & (1<<SPIF))); // Wait for transmission complete } -void spi_write(char* data, unsigned int len) -{ - for (unsigned int c=0; c<len; c++) - spi_write_byte(data[c]); -} +//~ void spi_write(char* data, unsigned int len) +//~ { + //~ for (unsigned int c=0; c<len; c++) + //~ spi_write_byte(data[c]); +//~ } //MSB first char spi_read_byte(void) @@ -90,202 +90,15 @@ char spi_read_byte(void) return SPSR; } -void spi_read(unsigned int maxlen, char *data, unsigned int *len) -{ - PORTB |= (1<<CS); - - while(SPI_PINB_REG & (1<<MISO)); /* wait for CC1101 to get ready... */ - - SPDR = 0x80; - len = 0; - while(*len < maxlen && !(SPSR & (1<<SPIF))) - data[*len++]=SPSR; - PORTB &= ~(1<<CS); -} - -//read/write config registers: -#define SPIC1101_ADDR_IOCFG2 0x00 -#define SPIC1101_ADDR_IOCFG1 0x01 -#define SPIC1101_ADDR_IOCFG0 0x02 -#define SPIC1101_ADDR_FIFOTHR 0x03 -#define SPIC1101_ADDR_SYNC1 0x04 -#define SPIC1101_ADDR_SYNC0 0x05 -#define SPIC1101_ADDR_PKTLEN 0x06 -#define SPIC1101_ADDR_PKTCTRL1 0x07 -#define SPIC1101_ADDR_PKTCTRL0 0x08 -#define SPIC1101_ADDR_ADDR 0x09 -#define SPIC1101_ADDR_CHANNR 0x0A -#define SPIC1101_ADDR_FSCTRL1 0x0B -#define SPIC1101_ADDR_FSCTRL0 0x0C -#define SPIC1101_ADDR_FREQ2 0x0D -#define SPIC1101_ADDR_FREQ1 0x0E -#define SPIC1101_ADDR_FREQ0 0x0F -#define SPIC1101_ADDR_MDMCFG4 0x10 -#define SPIC1101_ADDR_MDMCFG3 0x11 -#define SPIC1101_ADDR_MDMCFG2 0x12 -#define SPIC1101_ADDR_MDMCFG1 0x13 -#define SPIC1101_ADDR_MDMCFG0 0x14 -#define SPIC1101_ADDR_DEVIATN 0x15 -#define SPIC1101_ADDR_MCSM2 0x16 -#define SPIC1101_ADDR_MCSM1 0x17 -#define SPIC1101_ADDR_MCSM0 0x18 -#define SPIC1101_ADDR_FOCCFG 0x19 -#define SPIC1101_ADDR_BSCFG 0x1A -#define SPIC1101_ADDR_AGCCTRL2 0x1B -#define SPIC1101_ADDR_AGCCTRL1 0x1C -#define SPIC1101_ADDR_AGCCTRL0 0x1D -#define SPIC1101_ADDR_WOREVT1 0x1E -#define SPIC1101_ADDR_WOREVT0 0x1F -#define SPIC1101_ADDR_WORCTRL 0x20 -#define SPIC1101_ADDR_FREND1 0x21 -#define SPIC1101_ADDR_FREND0 0x22 -#define SPIC1101_ADDR_FSCAL3 0x23 -#define SPIC1101_ADDR_FSCAL2 0x24 -#define SPIC1101_ADDR_FSCAL1 0x25 -#define SPIC1101_ADDR_FSCAL0 0x26 -#define SPIC1101_ADDR_RCCTRL1 0x27 -#define SPIC1101_ADDR_RCCTRL0 0x28 -#define SPIC1101_ADDR_FSTEST 0x29 -#define SPIC1101_ADDR_PTEST 0x2A -#define SPIC1101_ADDR_AGCTEST 0x2B -#define SPIC1101_ADDR_TEST2 0x2C -#define SPIC1101_ADDR_TEST1 0x2D -#define SPIC1101_ADDR_TEST0 0x2E - -//commands: -#define SPIC1101_ADDR_SRES 0x30 -#define SPIC1101_ADDR_SFSTXON 0x31 -#define SPIC1101_ADDR_SXOFF 0x32 -#define SPIC1101_ADDR_SCAL 0x33 -#define SPIC1101_ADDR_SRX 0x34 -#define SPIC1101_ADDR_STX 0x35 -#define SPIC1101_ADDR_SIDLE 0x36 -#define SPIC1101_ADDR_SWOR 0x38 -#define SPIC1101_ADDR_SPWD 0x39 -#define SPIC1101_ADDR_SFRX 0x3A -#define SPIC1101_ADDR_SFTX 0x3B -#define SPIC1101_ADDR_SWORRST 0x3C -#define SPIC1101_ADDR_SNOP 0x3D - -//readonly registers: -#define SPIC1101_ADDR_PARTNUM (0x30 | 0xC0) -#define SPIC1101_ADDR_VERSION (0x31 | 0xC0) -#define SPIC1101_ADDR_FREQUEST (0x32 | 0xC0) -#define SPIC1101_ADDR_LQI (0x33 | 0xC0) -#define SPIC1101_ADDR_RSSI (0x34 | 0xC0) -#define SPIC1101_ADDR_MARCSTATE (0x35 | 0xC0) -#define SPIC1101_ADDR_WORTIME1 (0x36 | 0xC0) -#define SPIC1101_ADDR_WORTIME0 (0x37 | 0xC0) -#define SPIC1101_ADDR_PKTSTATUS (0x38 | 0xC0) -#define SPIC1101_ADDR_VCO_VC_DAC (0x39 | 0xC0) -#define SPIC1101_ADDR_TXBYTES (0x3A | 0xC0) -#define SPIC1101_ADDR_RXBYTES (0x3B | 0xC0) -#define SPIC1101_ADDR_RCCTRL1_STATUS (0x3C | 0xC0) -#define SPIC1101_ADDR_RCCTRL0_STATUS (0x3D | 0xC0) - - -#define SPIC1101_ADDR_FIFO_READ (0x3F | 0x80) -#define SPIC1101_ADDR_FIFO_READ_BURST (0x3F | 0x80 | 0xC0) -#define SPIC1101_ADDR_FIFO_WRITE 0x3F -#define SPIC1101_ADDR_FIFO_WRITE_BURST (0x3F | 0x40) - -#define SPIC1101_SB_CHIPRDY(x) x & 0b1000000 -#define SPIC1101_SB_IDLE(x) (x & 0b0111000) == 0b000000 -#define SPIC1101_SB_RXMODE(x) (x & 0b0111000) == 0b001000 -#define SPIC1101_SB_TXMODE(x) (x & 0b0111000) == 0b010000 -#define SPIC1101_SB_FSTXON(x) (x & 0b0111000) == 0b011000 -#define SPIC1101_SB_CALIBRATE(x) (x & 0b0111000) == 0b100000 -#define SPIC1101_SB_SETTLING(x) (x & 0b0111000) == 0b101000 -#define SPIC1101_SB_RXFIFO_OVERFLOW(x) (x & 0b0111000b) == 0b110000 -#define SPIC1101_SB_TXFIFO_OVERFLOW(x) (x & 0b0111000b) == 0b111000 -#define SPIC1101_SB_FIFO_BYTES_AVAILABLE(x) (x & 0b0000111) - -char spi_c1101_exchange(char *data, int len) -{ - char rbyte; - spi_cs_enable(); - while (len--) - { - while ( ! (SPIC1101_SB_CHIPRDY(spi_read_byte()))); - spi_write_byte(*(data++)); - } - rbyte = spi_read_byte(); - spi_cs_disable(); - return rbyte; -} - -// note addresses range from 0x00 to 0x2F for normal registers and 0xF0 to 0xFD for special status registers -char spi_c1101_read_register(char address) -{ - char data[1]; - data[0]=address | 0x80; - return spi_c1101_exchange(data, 1); -} +//~ void spi_read(unsigned int maxlen, char *data, unsigned int *len) +//~ { + //~ PORTB |= (1<<CS); -// note addresses range from 0x00 to 0x2F for normal registers -char spi_c1101_write_register(char address, char byte) -{ - char data[2]; - data[0]=address & 0x2F; - data[1]=byte; - return spi_c1101_exchange(data, 2); -} + //~ while(SPI_PINB_REG & (1<<MISO)); /* wait for CC1101 to get ready... */ -// note addresses range from 0x30 to 0x3D for command strobes -char spi_c1101_strobe_command(char address) -{ - char data[1]; - data[0]=address; - return spi_c1101_exchange(data, 1); -} - -int spi_c1101_read_rxfifo(int leave_num_bytes, char *buffer, int maxlen) -{ - char sb; - int num_read = 0; - int num_fifo_available = 0; - spi_cs_enable(); - while ( ! (SPIC1101_SB_CHIPRDY(spi_read_byte()))); - spi_write_byte(SPIC1101_ADDR_FIFO_READ_BURST); - do - { - sb = spi_read_byte(); - } while ( ! (SPIC1101_SB_CHIPRDY(sb))); - num_fifo_available = SPIC1101_SB_FIFO_BYTES_AVAILABLE(sb); - - while (maxlen-- && num_fifo_available - num_read <= leave_num_bytes) - { - //hope this works !! - buffer[num_read++] = spi_read_byte(); - } - spi_cs_disable(); - return num_read; -} - -//note: always check if num_written returned == len given -int spi_c1101_write_txfifo(char *buffer, int len) -{ - char sb; - int num_written = 0; - int num_fifo_available = 0; - spi_cs_enable(); - while ( ! (SPIC1101_SB_CHIPRDY(spi_read_byte()))); - spi_write_byte(SPIC1101_ADDR_FIFO_WRITE_BURST); - do - { - sb = spi_read_byte(); - } while ( ! (SPIC1101_SB_CHIPRDY(sb))); - num_fifo_available = SPIC1101_SB_FIFO_BYTES_AVAILABLE(sb); - - //if there is less space in tx-fifo than num-byte we want to send, only fill fifo until full and leave rest of buffer unsent (for now) - if (num_fifo_available < len) - len = num_fifo_available; - - while (len--) - { - //hope this works !! - spi_write_byte(buffer[num_written++]); - } - spi_cs_disable(); - return num_written; -}
\ No newline at end of file + //~ SPDR = 0x80; + //~ len = 0; + //~ while(*len < maxlen && !(SPSR & (1<<SPIF))) + //~ data[*len++]=SPSR; + //~ PORTB &= ~(1<<CS); +//~ } diff --git a/software/hhd70dongle/spi.h b/software/hhd70dongle/spi.h index 8d1ac67..8b45493 100644 --- a/software/hhd70dongle/spi.h +++ b/software/hhd70dongle/spi.h @@ -34,8 +34,11 @@ #define MURSAT_spi_h_INCLUDED void spi_init(void); +void spi_cs_enable(void); +void spi_cs_disable(void); void spi_write_byte(char byte); -void spi_write(char* data,unsigned int len); -void spi_read(unsigned int maxlen, char *data, unsigned int *len); +char spi_read_byte(void); +//~ void spi_write(char* data,unsigned int len); +//~ void spi_read(unsigned int maxlen, char *data, unsigned int *len); #endif |