Crash_Override
/
OVMS3
2
0
Fork 0
Code Issues 5 Pull Requests Projects Releases 4 Wiki Activity

Original project changes: Cellular: reduce UART queue overflows by distributing status poll

This commit is contained in:
Carsten Schmiemann 2022-10-03 12:33:00 +02:00
parent e6f2a6b992
commit a2a079c812
4 changed files with 70 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OVMS.V3/components/ovms_cellular/src/ovms_cellular.h
View File

@ -257,6 +257,7 @@ class modemdriver : public InternalRamAllocated
protected:
unsigned int m_powercyclefactor;
modem* m_modem;
int m_statuspoller_step;
};
template<typename Type> modemdriver* CreateCellularModemDriver()

7
OVMS.V3/components/ovms_cellular/src/ovms_cellular_modem_driver.cpp
View File

@ -61,6 +61,7 @@ modemdriver::modemdriver()
{
m_modem = MyPeripherals->m_cellular_modem;
m_powercyclefactor = 0;
m_statuspoller_step = 0;
}
modemdriver::~modemdriver()
@ -154,11 +155,13 @@ void modemdriver::StatusPoller()
bool modemdriver::State1Leave(modem::modem_state1_t oldstate)
{
m_statuspoller_step = 0;
return false;
}
bool modemdriver::State1Enter(modem::modem_state1_t newstate)
{
m_statuspoller_step = 0;
return false;
}
@ -169,5 +172,9 @@ modem::modem_state1_t modemdriver::State1Activity(modem::modem_state1_t curstate
modem::modem_state1_t modemdriver::State1Ticker1(modem::modem_state1_t curstate)
{
if (m_statuspoller_step > 0)
{
StatusPoller();
}
return curstate;
}

36
OVMS.V3/components/simcom/src/simcom_5360.cpp
View File

@ -69,17 +69,43 @@ const char* simcom5360::GetName()
void simcom5360::StatusPoller()
{
if (m_modem->m_mux != NULL)
{ m_modem->muxtx(GetMuxChannelPOLL(), "AT+CREG?;+CCLK?;+CSQ;+CPSI?;+COPS?\r\n"); }
{
// The ESP32 UART queue has a capacity of 128 bytes, NMEA and PPP data may be
// coming in concurrently, and we cannot use flow control.
// Reduce the queue stress by distributing the status poll:
switch (++m_statuspoller_step)
{
case 1:
m_modem->muxtx(GetMuxChannelPOLL(), "AT+CREG?;+CCLK?;+CSQ\r\n");
// → ~ 55 bytes, e.g.
// +CREG: 1,5 +CCLK: "22/10/02,09:33:27+08" +CSQ: 24,99
break;
case 2:
m_modem->muxtx(GetMuxChannelPOLL(), "AT+CPSI?\r\n");
// → ~ 60 bytes, e.g.
// +CPSI: GSM,Online,262-02,0x011f,14822,4 EGSM 900,-67,0,40-40
break;
case 3:
m_modem->muxtx(GetMuxChannelPOLL(), "AT+COPS?\r\n");
// → ~ 35 bytes, e.g.
// +COPS: 0,0,"vodafone.de Hologram",0
// done, fallthrough:
default:
m_statuspoller_step = 0;
break;
}
}
}
bool simcom5360::State1Leave(modem::modem_state1_t oldstate)
{
return false;
return modemdriver::State1Leave(oldstate);
}
bool simcom5360::State1Enter(modem::modem_state1_t newstate)
{
return false;
return modemdriver::State1Enter(newstate);
}
modem::modem_state1_t simcom5360::State1Activity(modem::modem_state1_t curstate)
@ -93,7 +119,7 @@ modem::modem_state1_t simcom5360::State1Activity(modem::modem_state1_t curstate)
return modem::None;
}
return curstate;
return modemdriver::State1Activity(curstate);
}
modem::modem_state1_t simcom5360::State1Ticker1(modem::modem_state1_t curstate)
@ -131,5 +157,5 @@ modem::modem_state1_t simcom5360::State1Ticker1(modem::modem_state1_t curstate)
return modem::None;
}
return curstate;
return modemdriver::State1Ticker1(curstate);
}

36
OVMS.V3/components/simcom/src/simcom_7600.cpp
View File

@ -91,7 +91,33 @@ void simcom7600::StartupNMEA()
void simcom7600::StatusPoller()
{
if (m_modem->m_mux != NULL)
{ m_modem->muxtx(GetMuxChannelPOLL(), "AT+CREG?;+CGREG?;+CEREG?;+CCLK?;+CSQ;+CPSI?;+COPS?\r\n"); }
{
// The ESP32 UART queue has a capacity of 128 bytes, NMEA and PPP data may be
// coming in concurrently, and we cannot use flow control.
// Reduce the queue stress by distributing the status poll:
switch (++m_statuspoller_step)
{
case 1:
m_modem->muxtx(GetMuxChannelPOLL(), "AT+CREG?;+CGREG?;+CEREG?;+CCLK?;+CSQ\r\n");
// → ~ 80 bytes, e.g.
// +CREG: 1,5 +CGREG: 1,5 +CEREG: 1,5 +CCLK: "22/09/09,12:54:41+08" +CSQ: 13,99
break;
case 2:
m_modem->muxtx(GetMuxChannelPOLL(), "AT+CPSI?\r\n");
// → ~ 85 bytes, e.g.
// +CPSI: LTE,Online,262-02,0xB0F5,13179412,448,EUTRAN-BAND1,100,4,4,-122,-1184,-874,9
break;
case 3:
m_modem->muxtx(GetMuxChannelPOLL(), "AT+COPS?\r\n");
// → ~ 35 bytes, e.g.
// +COPS: 0,0,"vodafone.de Hologram",7
// done, fallthrough:
default:
m_statuspoller_step = 0;
break;
}
}
}
void simcom7600::PowerCycle()
@ -111,12 +137,12 @@ void simcom7600::PowerCycle()
bool simcom7600::State1Leave(modem::modem_state1_t oldstate)
{
return false;
return modemdriver::State1Leave(oldstate);
}
bool simcom7600::State1Enter(modem::modem_state1_t newstate)
{
return false;
return modemdriver::State1Enter(newstate);
}
modem::modem_state1_t simcom7600::State1Activity(modem::modem_state1_t curstate)
@ -130,7 +156,7 @@ modem::modem_state1_t simcom7600::State1Activity(modem::modem_state1_t curstate)
return modem::None;
}
return curstate;
return modemdriver::State1Activity(curstate);
}
modem::modem_state1_t simcom7600::State1Ticker1(modem::modem_state1_t curstate)
@ -156,5 +182,5 @@ modem::modem_state1_t simcom7600::State1Ticker1(modem::modem_state1_t curstate)
return modem::None;
}
return curstate;
return modemdriver::State1Ticker1(curstate);
}