Compare commits

...
Sign in to create a new pull request.

6 commits

Author SHA1 Message Date
Morgan 'ARR\!' Allen
5fd28a946f tweaking _send checking and holding, Im not sure _send should actually block, this probably should be handled by application code 2026-03-18 10:38:25 -07:00
Morgan 'ARR\!' Allen
1933bc70d5 errant log_level_set 2026-03-13 15:07:33 -07:00
Morgan 'ARR\!' Allen
a0d3320609 lora32_handle_t.events > .state 2026-03-13 15:07:16 -07:00
Morgan 'ARR\!' Allen
00400d7249 wait for !MODE_TX before lora32_send can proceed 2026-03-13 15:06:56 -07:00
Morgan 'ARR\!' Allen
a306ef17a8 convey driver start via lora32_handle_t 2026-03-13 15:06:18 -07:00
Morgan 'ARR\!' Allen
ec1dc66f9b acquiring bus in the dio task seems to result in the double release.
additional locking was added which could also help with the situation
2026-03-13 15:05:11 -07:00
2 changed files with 32 additions and 9 deletions

View file

@ -49,6 +49,7 @@
#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
@ -97,7 +98,7 @@
#define ERR_LOR_VERSION_MISMATCH (01)
#define LORA32_DEFAULT_CONFIG() {\
#define LORA32_DEFAULT_CONFIG() (lora32_cfg_t){\
.bandwidth = 7,\
.codingRate = 5,\
.frequency = 915000000,\
@ -132,7 +133,8 @@ typedef void (*cadDoneCallback)(lora32_cfg_t *lora, bool detected);
typedef void (*cadDetectedCallback)(lora32_cfg_t *lora);
typedef struct {
EventGroupHandle_t events;
EventGroupHandle_t state;
void *driver;
} lora32_handle_t;
typedef struct lora32_modem_status_t {

View file

@ -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, "<%2X<%2X", address, t.rx_data[1]);
ESP_LOGV(TAG, "<%02X<%02X", address, t.rx_data[1]);
xSemaphoreGive(spi_semaphore);
@ -109,12 +109,16 @@ 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);
}
@ -138,13 +142,25 @@ 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) return;
if(lora == NULL) {
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));
@ -294,6 +310,8 @@ 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);
}
@ -305,6 +323,8 @@ 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);
}
@ -323,6 +343,8 @@ 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);
}
@ -416,7 +438,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);
@ -426,7 +448,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) {
@ -507,8 +529,6 @@ 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();
}
@ -541,7 +561,8 @@ 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.events = xEventGroupCreate();
lora->handle.state = xEventGroupCreate();
xEventGroupSetBits(lora->handle.state, 0);
uint8_t version = lora32_read_reg(lora, REG_VERSION);
ESP_LOGD(TAG, "lora32_get_id() == 0x%2X", version);