strobing command and register read and write work

3 files changed, 90 insertions, 16 deletions

diff --git a/software/avr.lib/cc1101.c b/software/avr.lib/cc1101.c
index e083df8..2023c01 100644
--- a/software/avr.lib/cc1101.c
+++ b/software/avr.lib/cc1101.c
@@ -25,30 +25,99 @@
 #include "cc1101.h"
 #include "cc1101_defines.h"
 
+static cc1101_driver_conf_t drv = {
+  .spi_cs_enable = NULL,
+  .spi_cs_disable = NULL,
+  .spi_read_miso = NULL,
+  .spi_write_byte = NULL,
+  .spi_read_byte = NULL,
+  .spi_transfer_byte = NULL,
+  .freq_corr = 0.0
+};
+
 /*
- * EXTERNAL INTERFACE
+ * internal functions
  */
 
-void cc1101_init(void)
+static inline void cc1101_spi_wait_rdy(void)
+{
+  while(drv.spi_read_miso()); // wait for CHP_RDY to go low, TODO: timeout...
+}
+
+static uint8_t cc1101_spi_strobe_command(uint8_t cmd)
 {
+  if(cmd < CC1101_CMD_MIN || cmd > CC1101_CMD_MAX)
+    return -1;
+
+  drv.spi_cs_enable();
+  cc1101_spi_wait_rdy();
 
+  uint8_t status = drv.spi_transfer_byte(CC1101_HEADER_COMMAND | cmd);
+
+  drv.spi_cs_disable();
+  return status;
 }
 
-void cc1101_reg_init(void)
+static uint8_t cc1101_spi_read_register(uint8_t addr)
 {
+  if(addr > CC1101_ADDR_MAX)
+    return 0xFF;
 
+  if(addr > CC1101_REG_RW_MAX)
+    addr |= CC1101_HEADER_READONLY;
+  else
+    addr |= CC1101_HEADER_READ;
+
+  drv.spi_cs_enable();
+  cc1101_spi_wait_rdy();
+
+  drv.spi_write_byte(addr);
+  uint8_t data = drv.spi_read_byte();
+
+  drv.spi_cs_disable();
+  return data;
 }
 
-void cc1101_soft_reset(void)
+static void cc1101_spi_write_register(uint8_t addr, uint8_t data)
 {
+  if(addr > CC1101_REG_RW_MAX)
+    return;
 
+  drv.spi_cs_enable();
+  cc1101_spi_wait_rdy();
+
+  drv.spi_write_byte(CC1101_HEADER_WRITE | addr);
+  drv.spi_write_byte(data);
+
+  drv.spi_cs_disable();
 }
 
-void cc1101_powerdown(void)
+/*
+ * EXTERNAL INTERFACE
+ */
+
+void cc1101_init(cc1101_driver_conf_t conf)
+{
+  drv = conf;
+}
+
+void cc1101_reg_init(void)
 {
+      // Set freq to 437.525 MHz
+  cc1101_spi_write_register(CC1101_REG_RW_FREQ2,0x10);   //Frequency Control Word, High Byte
+  cc1101_spi_write_register(CC1101_REG_RW_FREQ1,0xD3);   //Frequency Control Word, Middle Byte
+  cc1101_spi_write_register(CC1101_REG_RW_FREQ0,0xF0);   //Frequency Control Word, Low Byte
+}
 
+void cc1101_soft_reset(void)
+{
+  cc1101_spi_strobe_command(CC1101_CMD_SRES);
 }
 
+void cc1101_powerdown(void)
+{
+  cc1101_spi_strobe_command(CC1101_CMD_SPWD);
+}
 
 static char* cc1101_config_reg_to_string(uint8_t addr)
 {
@@ -107,7 +176,7 @@ static char* cc1101_config_reg_to_string(uint8_t addr)
 static char* cc1101_status_reg_to_string(uint8_t addr)
 {
   switch(addr) {
-  case CC1101_REG_RO_PARTNUM: return "PARNUM";
+  case CC1101_REG_RO_PARTNUM: return "PARTNUM";
   case CC1101_REG_RO_VERSION: return "VERSION";
   case CC1101_REG_RO_FREQUEST: return "FREQUEST";
   case CC1101_REG_RO_LQI: return "LQI";
@@ -133,14 +202,14 @@ void cc1101_dump_register(void)
 
   printf(" config (read/write) register:\r\n");
   for(i=0; i<=CC1101_REG_RW_MAX; ++i) {
-    uint8_t data = 0xFF; // TODO: actually read value
+    uint8_t data = cc1101_spi_read_register(i); // TODO: use burst mode...
     printf("  0x%02X (%s): 0x%02X\r\n", i, cc1101_config_reg_to_string(i), data);
   }
   printf("\r\n");
 
   printf(" status (read-only) register:\r\n");
   for(i=CC1101_REG_RO_MIN; i<=CC1101_REG_RO_MAX; ++i) {
-    uint8_t data = 0xFF; // TODO: actually read value
+    uint8_t data = cc1101_spi_read_register(i);
     printf("  0x%02X (%s): 0x%02X\r\n", i, cc1101_status_reg_to_string(i), data);
   }
   printf("\r\n");
diff --git a/software/avr.lib/cc1101.h b/software/avr.lib/cc1101.h
index 1519a3d..c5690e0 100644
--- a/software/avr.lib/cc1101.h
+++ b/software/avr.lib/cc1101.h
@@ -23,7 +23,19 @@
 #ifndef SPREADAVR_cc1101_h_INCLUDED
 #define SPREADAVR_cc1101_h_INCLUDED
 
-void cc1101_init(void);
+#define CC1101_FREQ_CORR(xtal) ((float)(xtal/65536.0))
+
+typedef struct {
+  void (*spi_cs_enable)(void);
+  void (*spi_cs_disable)(void);
+  uint8_t (*spi_read_miso)(void);
+  void (*spi_write_byte)(const uint8_t);
+  uint8_t (*spi_read_byte)(void);
+  uint8_t (*spi_transfer_byte)(const uint8_t);
+  float freq_corr;
+} cc1101_driver_conf_t;
+
+void cc1101_init(cc1101_driver_conf_t conf);
 void cc1101_reg_init(void);
 void cc1101_soft_reset(void);
 void cc1101_powerdown(void);
diff --git a/software/avr.lib/cc1101_defines.h b/software/avr.lib/cc1101_defines.h
index e9e2e67..51ba6ea 100644
--- a/software/avr.lib/cc1101_defines.h
+++ b/software/avr.lib/cc1101_defines.h
@@ -143,11 +143,4 @@
 
 #define CC1101_FIFO_MAX_LEN    64
 
-//freq    Fosc/65536
-#ifdef CC1101_QUARTZ_26M
-#define CC1101_FREQ_CORR 396.728515 // = 26000000/65536
-#else
-#error Please set Quartz Frequency using the variable: CC1101_QUARTZ_*
-#endif // CC1101_QUARTZ_26M
-
 #endif