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

updated esp_modem to version 0.1.25, successfuly tested CMUX mode

Browse Source
This commit is contained in:
Bogdan Pilyugin 2022-12-21 12:12:37 +02:00
parent 0c0e089419
commit 9d0e30bf0d
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/NetTransport.h
View File

@ -63,6 +63,8 @@ void PPPModemColdStart(void);
void PPPModemSoftRestart(void); void PPPModemSoftRestart(void);
void PPPModemStart(void); void PPPModemStart(void);
void PPPModemGetRSSI(void);
void MQTTRun(void); void MQTTRun(void);
MODEM_INFO* GetPPPModemInfo(void); MODEM_INFO* GetPPPModemInfo(void);

19
src/GSMTransport.c
View File

@ -237,12 +237,22 @@ static void GSMInitTask(void *pvParameter)
} }
ESP_LOGI(TAG, "IMEI:%s", mod_info.imei); ESP_LOGI(TAG, "IMEI:%s", mod_info.imei);
while (esp_modem_set_mode(dce, ESP_MODEM_MODE_DATA) != ESP_OK) while (esp_modem_set_mode(dce, ESP_MODEM_MODE_CMUX) != ESP_OK)
{ {
if (++GSMConnectTimeout >= PPP_MODEM_TIMEOUT) if (++GSMConnectTimeout >= PPP_MODEM_TIMEOUT)
goto modem_init_fail; goto modem_init_fail;
vTaskDelay(pdMS_TO_TICKS(1000)); vTaskDelay(pdMS_TO_TICKS(1000));
} }
/*
while (esp_modem_set_mode(dce, ESP_MODEM_MODE_CMUX_MANUAL_DATA) != ESP_OK)
{
if (++GSMConnectTimeout >= PPP_MODEM_TIMEOUT)
goto modem_init_fail;
vTaskDelay(pdMS_TO_TICKS(1000));
}
*/
ESP_LOGI(TAG, "PPP data mode OK"); ESP_LOGI(TAG, "PPP data mode OK");
@ -288,5 +298,12 @@ void PPPModemStart(void)
xTaskCreate(GSMRunTask, "GSMRunTask", 1024 * 4, &ResetType, 3, NULL); xTaskCreate(GSMRunTask, "GSMRunTask", 1024 * 4, &ResetType, 3, NULL);
} }
void PPPModemGetRSSI(void)
{
int rssi, ber;
esp_modem_get_signal_quality(dce, &rssi, &ber);
ESP_LOGW(TAG, "Signal %d, ber %d", rssi, ber);
}
#endif #endif

6
src/HTTPPostSystem.c
View File

@ -451,15 +451,16 @@ static HTTP_IO_RESULT HTTPPostSystemSettings(httpd_req_t *req, char *PostData)
if (!strcmp(tmp, (const char*) "1")) if (!strcmp(tmp, (const char*) "1"))
{ {
ESP_LOGI(TAG, "Got command F1 send test lora"); ESP_LOGI(TAG, "Got command F1 send test lora");
const char test[] = {"LoRaWAN test message"}; const char test[] = { "LoRaWAN test message" };
LORA_DATA_SEND_STRUCT dss; LORA_DATA_SEND_STRUCT dss;
dss.raw_data_ptr = test; dss.raw_data_ptr = test;
dss.data_length = sizeof(test)+1; dss.data_length = sizeof(test) + 1;
LORASendData(&dss); LORASendData(&dss);
return HTTP_IO_DONE_NOREFRESH; return HTTP_IO_DONE_NOREFRESH;
} }
else if (!strcmp(tmp, (const char*) "2")) else if (!strcmp(tmp, (const char*) "2"))
{ {
PPPModemGetRSSI();
return HTTP_IO_DONE_NOREFRESH; return HTTP_IO_DONE_NOREFRESH;
} }
else if (!strcmp(tmp, (const char*) "3")) else if (!strcmp(tmp, (const char*) "3"))
@ -495,7 +496,6 @@ static HTTP_IO_RESULT HTTPPostSystemSettings(httpd_req_t *req, char *PostData)
return HTTP_IO_DONE_NOREFRESH; return HTTP_IO_DONE_NOREFRESH;
} }
} }
return HTTP_IO_DONE; return HTTP_IO_DONE;