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

added external gsm module reset

Browse Source
This commit is contained in:
Bogdan Pilyugin 2022-10-11 16:19:09 +02:00
parent aeb8bf1f37
commit 61c05053fd
3 changed files with 939 additions and 915 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Kconfig
View File

@ -425,6 +425,13 @@ menu "webguiapp configuration"
bool "Default GPRS switched on" bool "Default GPRS switched on"
default n default n
config MODEM_DEVICE_POWER_CONTROL_PIN
int "Power control GPIO"
default -1
range -1 33
help
Pin number of power control.
choice MODEM_DEVICE choice MODEM_DEVICE
prompt "Choose supported modem device (DCE)" prompt "Choose supported modem device (DCE)"
default MODEM_DEVICE_SIM800 default MODEM_DEVICE_SIM800

1
include/NetTransport.h
View File

@ -114,5 +114,6 @@ void StartSystemTimer(void);
uint32_t GetUpTime(void); uint32_t GetUpTime(void);
void RegEthReset(void (*eth_rst)(uint8_t level)); void RegEthReset(void (*eth_rst)(uint8_t level));
void RegGSMReset(void (*gsm_rst)(uint8_t level));
#endif /* MAIN_INCLUDE_NETTRANSPORT_H_ */ #endif /* MAIN_INCLUDE_NETTRANSPORT_H_ */

42
src/GSMTransport.c
View File

@ -1,4 +1,4 @@
/* Copyright 2022 Bogdan Pilyugin /* Copyright 2022 Bogdan Pilyugin
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -32,7 +32,6 @@
#include "SystemConfiguration.h" #include "SystemConfiguration.h"
#include "NetTransport.h" #include "NetTransport.h"
#if CONFIG_WEBGUIAPP_GPRS_ENABLE #if CONFIG_WEBGUIAPP_GPRS_ENABLE
static EventGroupHandle_t event_group = NULL; static EventGroupHandle_t event_group = NULL;
static const int CONNECT_BIT = BIT0; static const int CONNECT_BIT = BIT0;
@ -44,7 +43,6 @@ static bool isPPPinitializing = false;
static bool isPPPConn = false; static bool isPPPConn = false;
TaskHandle_t initTaskhandle; TaskHandle_t initTaskhandle;
#define PPP_MODEM_TIMEOUT 40 #define PPP_MODEM_TIMEOUT 40
MODEM_INFO mod_info = { "-", "-", "-", "-" }; MODEM_INFO mod_info = { "-", "-", "-", "-" };
@ -52,7 +50,11 @@ esp_netif_t *ppp_netif;
esp_modem_dce_t *dce; esp_modem_dce_t *dce;
TaskHandle_t trasporttask; TaskHandle_t trasporttask;
static void (*gsm_reset)(uint8_t level) = NULL;
void RegGSMReset(void (*gsm_rst)(uint8_t level))
{
gsm_reset = gsm_rst;
}
esp_netif_t* GetPPPNetifAdapter(void) esp_netif_t* GetPPPNetifAdapter(void)
{ {
@ -146,12 +148,27 @@ static void GSMInitTask(void *pvParameter)
if (starttype == 0) if (starttype == 0)
{ {
//SetGSM_PWR(OFF); #if CONFIG_MODEM_DEVICE_POWER_CONTROL_PIN >= 0
gpio_set_level(GPIO_NUM_2, 0); gpio_set_level(CONFIG_MODEM_DEVICE_POWER_CONTROL_PIN, 0);
vTaskDelay(pdMS_TO_TICKS(1000)); vTaskDelay(pdMS_TO_TICKS(1000));
//SetGSM_PWR(ON); gpio_set_level(CONFIG_MODEM_DEVICE_POWER_CONTROL_PIN, 1);
gpio_set_level(GPIO_NUM_2, 1); #else
if (gsm_reset)
{
gsm_reset(0);
vTaskDelay(pdMS_TO_TICKS(1000));
gsm_reset(1);
vTaskDelay(pdMS_TO_TICKS(10000));
} }
else
{
ESP_LOGE(TAG, "ethernet chip reset pin not defined");
ESP_ERROR_CHECK(1);
}
#endif
}
ESP_ERROR_CHECK(esp_event_handler_register(IP_EVENT, ESP_EVENT_ANY_ID, &on_ip_event, NULL)); ESP_ERROR_CHECK(esp_event_handler_register(IP_EVENT, ESP_EVENT_ANY_ID, &on_ip_event, NULL));
ESP_ERROR_CHECK(esp_event_handler_register(NETIF_PPP_STATUS, ESP_EVENT_ANY_ID, &on_ppp_changed, NULL)); ESP_ERROR_CHECK(esp_event_handler_register(NETIF_PPP_STATUS, ESP_EVENT_ANY_ID, &on_ppp_changed, NULL));
event_group = xEventGroupCreate(); event_group = xEventGroupCreate();
@ -171,8 +188,8 @@ static void GSMInitTask(void *pvParameter)
/* Configure the DCE */ /* Configure the DCE */
esp_modem_dce_config_t dce_config = ESP_MODEM_DCE_DEFAULT_CONFIG(CONFIG_MODEM_PPP_APN); esp_modem_dce_config_t dce_config = ESP_MODEM_DCE_DEFAULT_CONFIG(CONFIG_MODEM_PPP_APN);
/* Configure the PPP netif */ /* Configure the PPP netif */
esp_netif_inherent_config_t esp_netif_conf = ESP_NETIF_INHERENT_DEFAULT_PPP() esp_netif_inherent_config_t esp_netif_conf = ESP_NETIF_INHERENT_DEFAULT_PPP();
;
esp_netif_conf.route_prio = PPP_PRIO; esp_netif_conf.route_prio = PPP_PRIO;
esp_netif_config_t netif_ppp_config = ESP_NETIF_DEFAULT_PPP(); esp_netif_config_t netif_ppp_config = ESP_NETIF_DEFAULT_PPP();
@ -202,7 +219,8 @@ static void GSMInitTask(void *pvParameter)
} }
ESP_LOGI(TAG, "IMSI:%s", mod_info.imsi); ESP_LOGI(TAG, "IMSI:%s", mod_info.imsi);
mod_info.oper[0] = 0x00; int tech = 0; mod_info.oper[0] = 0x00;
int tech = 0;
while (esp_modem_get_operator_name(dce, mod_info.oper, &tech) != ESP_OK) while (esp_modem_get_operator_name(dce, mod_info.oper, &tech) != ESP_OK)
{ {
if (++GSMConnectTimeout >= PPP_MODEM_TIMEOUT) if (++GSMConnectTimeout >= PPP_MODEM_TIMEOUT)
@ -273,5 +291,3 @@ void PPPModemStart(void)
#endif #endif