diff --git a/include/NetTransport.h b/include/NetTransport.h index d00370a..044f763 100644 --- a/include/NetTransport.h +++ b/include/NetTransport.h @@ -63,6 +63,8 @@ void PPPModemColdStart(void); void PPPModemSoftRestart(void); void PPPModemStart(void); +void PPPModemGetRSSI(void); + void MQTTRun(void); MODEM_INFO* GetPPPModemInfo(void); diff --git a/src/GSMTransport.c b/src/GSMTransport.c index f097400..10fdb14 100644 --- a/src/GSMTransport.c +++ b/src/GSMTransport.c @@ -237,12 +237,22 @@ static void GSMInitTask(void *pvParameter) } 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) goto modem_init_fail; 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"); @@ -288,5 +298,12 @@ void PPPModemStart(void) 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 diff --git a/src/HTTPPostSystem.c b/src/HTTPPostSystem.c index 39750b4..eeade8c 100644 --- a/src/HTTPPostSystem.c +++ b/src/HTTPPostSystem.c @@ -451,15 +451,16 @@ static HTTP_IO_RESULT HTTPPostSystemSettings(httpd_req_t *req, char *PostData) if (!strcmp(tmp, (const char*) "1")) { 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; dss.raw_data_ptr = test; - dss.data_length = sizeof(test)+1; + dss.data_length = sizeof(test) + 1; LORASendData(&dss); return HTTP_IO_DONE_NOREFRESH; } else if (!strcmp(tmp, (const char*) "2")) { + PPPModemGetRSSI(); return HTTP_IO_DONE_NOREFRESH; } 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;