From 19a233de27fa88e69e351866db9ba85278043d19 Mon Sep 17 00:00:00 2001 From: "Morgan 'ARR\\!' Allen" Date: Mon, 21 Feb 2022 22:07:04 -0800 Subject: [PATCH] consistently name _spreadfactor and update config object call _set call --- include/esp32-lora.h | 1 + main/esp32-lora.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/esp32-lora.h b/include/esp32-lora.h index a270de6..e8c41e0 100644 --- a/include/esp32-lora.h +++ b/include/esp32-lora.h @@ -157,6 +157,7 @@ void lora32_send(lora32_cfg_t *config, uint8_t *data, uint8_t len); void lora32_set_bandwidth(lora32_cfg_t *lora, uint8_t bw); void lora32_set_coding_rate(lora32_cfg_t *lora, uint8_t cr); void lora32_set_spreadfactor(lora32_cfg_t *lora, uint8_t factor); +uint8_t lora32_get_spreadfactor(lora32_cfg_t *lora); void lora32_read_data(lora32_cfg_t *lora, uint8_t *data); void lora32_sleep(lora32_cfg_t *lora); void lora32_standby(lora32_cfg_t *lora); diff --git a/main/esp32-lora.c b/main/esp32-lora.c index 3da7c7e..7c65232 100644 --- a/main/esp32-lora.c +++ b/main/esp32-lora.c @@ -240,7 +240,7 @@ void lora32_toggle_reset(lora32_cfg_t *config) { vTaskDelay(100 / portTICK_PERIOD_MS); // 5ms before available } -uint8_t lora32_get_spreadingfactor(lora32_cfg_t *lora) { +uint8_t lora32_get_spreadfactor(lora32_cfg_t *lora) { return (lora32_read_reg(lora, REG_MODEM_CONFIG_2) >> 4); } @@ -260,6 +260,8 @@ void lora32_set_spreadfactor(lora32_cfg_t *lora, uint8_t factor) { ESP_LOGI(TAG, "lora32_set_spreadfactor: %d", factor); lora32_write_reg(lora, REG_MODEM_CONFIG_2, (lora32_read_reg(lora, REG_MODEM_CONFIG_2) & 0x0F) | ((factor << 4) & 0xF0)); + + lora->spreadingFactor = factor; } void lora32_enable_single_rx(lora32_cfg_t *lora) { @@ -320,7 +322,7 @@ long lora32_get_bandwidth(lora32_cfg_t *lora) { } void lora32_set_ldo_flag(lora32_cfg_t *lora) { - long symbolDuration = 1000 / (lora32_get_bandwidth(lora) / (1L << lora32_get_spreadingfactor(lora))); + long symbolDuration = 1000 / (lora32_get_bandwidth(lora) / (1L << lora32_get_spreadfactor(lora))); ESP_LOGI(TAG, "symbolDuration: %ld", symbolDuration);