include/esp32-lora.h

@@ -49,7 +49,6 @@
 #define MODE_RX_SINGLE           0x06
 #define MODE_CAD_DETECT          0x07
 #define MODE_LONG_RANGE_MODE     0x80
-#define MODE_ALL                 (MODE_SLEEP & MODE_STANDBY & MODE_TX & MODE_RX_CONTINUOUS & MODE_RX_SINGLE & MODE_CAD_DETECT)
 
 // PA config
 #define PA_BOOST                 0x80
@@ -98,7 +97,7 @@
 
 #define ERR_LOR_VERSION_MISMATCH (01)
 
-#define LORA32_DEFAULT_CONFIG() (lora32_cfg_t){\
+#define LORA32_DEFAULT_CONFIG() {\
   .bandwidth = 7,\
   .codingRate = 5,\
   .frequency = 915000000,\
@@ -133,8 +132,7 @@ typedef void (*cadDoneCallback)(lora32_cfg_t *lora, bool detected);
 typedef void (*cadDetectedCallback)(lora32_cfg_t *lora);
 
 typedef struct {
-  EventGroupHandle_t state;
+  EventGroupHandle_t events;
-  void *driver;
 } lora32_handle_t;
 
 typedef struct lora32_modem_status_t {

main/esp32-lora.c

@@ -43,7 +43,7 @@ uint8_t lora32_read_reg(lora32_cfg_t *lora, uint8_t address) {
 
 	ESP_ERROR_CHECK(spi_device_transmit(lora->spi, &t));
 
-  ESP_LOGV(TAG, "<%02X<%02X", address, t.rx_data[1]);
+  ESP_LOGV(TAG, "<%2X<%2X", address, t.rx_data[1]);
 
   xSemaphoreGive(spi_semaphore);
 
@@ -109,16 +109,12 @@ void lora32_set_implicit_header(lora32_cfg_t *lora) {
 void lora32_standby(lora32_cfg_t *lora) {
   ESP_LOGV(TAG, "MODE_STANDBY");
 
-  xEventGroupSetBits(lora->handle.state, MODE_STANDBY);
-
   lora32_write_reg(lora, REG_OP_MODE, MODE_LONG_RANGE_MODE | MODE_STANDBY);
 }
 
 void lora32_sleep(lora32_cfg_t *lora) {
   ESP_LOGV(TAG, "MODE_SLEEP");
 
-  xEventGroupSetBits(lora->handle.state, MODE_SLEEP);
-
   lora32_write_reg(lora, REG_OP_MODE, MODE_LONG_RANGE_MODE | MODE_SLEEP);
 }
 
@@ -142,25 +138,13 @@ void lora32_enable_tx(lora32_cfg_t *lora) {
   else
     lora32_set_explicit_header(lora);
 
-  xEventGroupSetBits(lora->handle.state, MODE_TX);
-
   // zero out receive buffer
   lora32_write_reg(lora, REG_FIFO_ADDR_PTR, 0);
   lora32_write_reg(lora, REG_PAYLOAD_LENGTH, 0);
 }
 
 void lora32_send(lora32_cfg_t *lora, uint8_t *data, uint8_t len) {
-  if(lora == NULL) {
+  if(lora == NULL) return;
-    ESP_LOGE(TAG, "lora NULL");
-
-    return;
-  } else {
-    ESP_LOGD(TAG, "lora: %p", lora);
-  }
-
-  if((xEventGroupGetBits(lora->handle.state) & MODE_TX) == MODE_TX) {
-    xEventGroupWaitBits(lora->handle.state, MODE_ALL ^ MODE_TX, true, false, portMAX_DELAY);
-  }
 
   ESP_ERROR_CHECK(spi_device_acquire_bus(lora->spi, portMAX_DELAY));
 
@@ -310,8 +294,6 @@ void lora32_enable_single_rx(lora32_cfg_t *lora) {
     lora32_update_dio_mapping(lora, REG_DIO_MAPPING_1, DIO0_MODE_RXDONE, DIO0_MODE_SHIFT);
   }
 
-  xEventGroupSetBits(lora->handle.state, MODE_RX_SINGLE);
-
   lora32_write_reg(lora, REG_OP_MODE, MODE_LONG_RANGE_MODE | MODE_RX_SINGLE);
 }
 
@@ -323,8 +305,6 @@ void lora32_enable_continuous_rx(lora32_cfg_t *lora) {
     lora32_update_dio_mapping(lora, REG_DIO_MAPPING_1, DIO0_MODE_RXDONE, DIO0_MODE_SHIFT);
   }
 
-  xEventGroupSetBits(lora->handle.state, MODE_RX_CONTINUOUS);
-
   lora32_write_reg(lora, REG_OP_MODE, MODE_LONG_RANGE_MODE | MODE_RX_CONTINUOUS);
 }
 
@@ -343,8 +323,6 @@ void lora32_enable_cad(lora32_cfg_t *lora) {
 
   ESP_LOGV(TAG, "MODE_CAD_DETECT");
 
-  xEventGroupSetBits(lora->handle.state, MODE_CAD_DETECT);
-
   lora32_write_reg(lora, REG_OP_MODE, MODE_LONG_RANGE_MODE | MODE_CAD_DETECT);
 }
 
@@ -438,7 +416,7 @@ static void IRAM_ATTR lora32_dio_task(void *arg) {
     // wait for event over Queue
     if(xQueueReceive(dio_event_queue, (void*)&lora, portMAX_DELAY) != pdPASS) continue;
 
-    //spi_device_acquire_bus(lora->spi, portMAX_DELAY);
+    spi_device_acquire_bus(lora->spi, portMAX_DELAY);
 
     // read IRQ flags
     uint8_t irqs = lora32_read_reg(lora, REG_IRQ_FLAGS);
@@ -448,7 +426,7 @@ static void IRAM_ATTR lora32_dio_task(void *arg) {
     ESP_LOGD(TAG, "clearing irqs");
     lora32_write_reg(lora, REG_IRQ_FLAGS, irqs);
 
-    //spi_device_release_bus(lora->spi);
+    spi_device_release_bus(lora->spi);
 
     // TODO handle header validation
     if((irqs & IRQ_RX_DONE) == IRQ_RX_DONE) {
@@ -529,6 +507,8 @@ uint8_t lora32_spi_init(lora32_cfg_t *lora) {
 }
 
 uint8_t lora32_init(lora32_cfg_t *lora) {
+  esp_log_level_set(TAG, ESP_LOG_DEBUG);
+
   if(spi_semaphore == NULL) {
     spi_semaphore = xSemaphoreCreateMutex();
   }
@@ -561,8 +541,7 @@ uint8_t lora32_init(lora32_cfg_t *lora) {
   ESP_ERROR_CHECK(spi_bus_add_device(lora->spi_host, &devcfg, &lora->spi));
 
   // initialize event groups
-  lora->handle.state = xEventGroupCreate();
+  lora->handle.events = xEventGroupCreate();
-  xEventGroupSetBits(lora->handle.state, 0);
 
   uint8_t version = lora32_read_reg(lora, REG_VERSION);
   ESP_LOGD(TAG, "lora32_get_id() == 0x%2X", version);