userbogd/webguiapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean lorawan module from unused variables

Browse Source
This commit is contained in:
Bogdan Pilyugin 2022-12-19 16:30:11 +02:00
parent 944f264f48
commit 517d9e56dd
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/LoRaWAN.c
View File

@ -48,8 +48,6 @@
#define LORAWAN_APP_LOG_ENABLED 1 #define LORAWAN_APP_LOG_ENABLED 1
#define LORAWAN_MESSAGE_BUFER_LENTH 32 #define LORAWAN_MESSAGE_BUFER_LENTH 32
static const int LORA_WAIT_DELIVERY_BIT = BIT2;
QueueHandle_t LORAMessagesQueueHandle; QueueHandle_t LORAMessagesQueueHandle;
static StaticQueue_t xStaticLoRaMessagesQueue; static StaticQueue_t xStaticLoRaMessagesQueue;
uint8_t LoRaMessagesQueueStorageArea[LORAWAN_MESSAGE_BUFER_LENTH uint8_t LoRaMessagesQueueStorageArea[LORAWAN_MESSAGE_BUFER_LENTH
@ -72,7 +70,6 @@ esp_err_t LORASendData(LORA_DATA_SEND_STRUCT *pdss)
LORA_DATA_SEND_STRUCT DSS; LORA_DATA_SEND_STRUCT DSS;
DSS.raw_data_ptr = ptr; DSS.raw_data_ptr = ptr;
DSS.data_length = MESSAGE_LENGTH; DSS.data_length = MESSAGE_LENGTH;
if (xQueueSend(LORAMessagesQueueHandle, &DSS, if (xQueueSend(LORAMessagesQueueHandle, &DSS,
pdMS_TO_TICKS(1000)) == pdPASS) pdMS_TO_TICKS(1000)) == pdPASS)
return ESP_OK; return ESP_OK;
@ -111,11 +108,10 @@ void LoRaWANTransportTask(void *pvParameter)
{ {
while (!ttn_is_connected()) while (!ttn_is_connected())
vTaskDelay(pdMS_TO_TICKS(300)); vTaskDelay(pdMS_TO_TICKS(300));
if (ttn_is_provisioned()) if (ttn_is_provisioned())
{ {
xEventGroupClearBits(transport_event_group, LORA_WAIT_DELIVERY_BIT); xQueueReceive(LORAMessagesQueueHandle, &DSS, portMAX_DELAY);
xQueuePeek(LORAMessagesQueueHandle, &DSS, portMAX_DELAY); ttn_transmit_message((const uint8_t*) DSS.raw_data_ptr, MESSAGE_LENGTH, 1, true);
#if LORAWAN_APP_LOG_ENABLED == 1 #if LORAWAN_APP_LOG_ENABLED == 1
char P[MESSAGE_LENGTH * 2 + 1]; char P[MESSAGE_LENGTH * 2 + 1];
@ -123,9 +119,6 @@ void LoRaWANTransportTask(void *pvParameter)
P[MESSAGE_LENGTH * 2] = 0x00; P[MESSAGE_LENGTH * 2] = 0x00;
ESP_LOGI(TAG, "Sent=%s", P); ESP_LOGI(TAG, "Sent=%s", P);
#endif #endif
ttn_transmit_message((const uint8_t*) DSS.raw_data_ptr, MESSAGE_LENGTH, 1, true);
xQueueReceive(LORAMessagesQueueHandle, &DSS, 0);
} }
else else
{ {
@ -137,7 +130,6 @@ void LoRaWANTransportTask(void *pvParameter)
} }
void LoRaWANRejoin(void) void LoRaWANRejoin(void)
{ {
ttn_rejoin(); ttn_rejoin();
@ -151,7 +143,6 @@ void LoRaWANInitJoinTask(void *pvParameter)
sizeof(LORA_DATA_SEND_STRUCT), sizeof(LORA_DATA_SEND_STRUCT),
LoRaMessagesQueueStorageArea, LoRaMessagesQueueStorageArea,
&xStaticLoRaMessagesQueue); &xStaticLoRaMessagesQueue);
ttn_init(); ttn_init();
// Configure the SX127x pins // Configure the SX127x pins
ttn_configure_pins(TTN_SPI_HOST, TTN_PIN_NSS, TTN_PIN_RXTX, -1, ttn_configure_pins(TTN_SPI_HOST, TTN_PIN_NSS, TTN_PIN_RXTX, -1,
@ -168,7 +159,6 @@ void LoRaWANInitJoinTask(void *pvParameter)
BytesToStr((unsigned char*) &GetSysConf()->lorawanSettings.AppKey, BytesToStr((unsigned char*) &GetSysConf()->lorawanSettings.AppKey,
(unsigned char*) appKey, (unsigned char*) appKey,
16); 16);
// Register callback for received messages // Register callback for received messages
ttn_on_message(messageReceived); ttn_on_message(messageReceived);