Original project changes: Use StatusPoller() for all cellular polls, to better support CGREG and CEREG

This commit is contained in:
Carsten Schmiemann 2022-09-08 11:54:11 +02:00
parent 1fa378c5f9
commit faad212a43

View file

@ -842,7 +842,7 @@ modem::modem_state1_t modem::State1Ticker1()
if (m_mux != NULL) if (m_mux != NULL)
{ {
if ((m_state1_ticker>5)&&((m_state1_ticker % 30) == 0)) if ((m_state1_ticker>5)&&((m_state1_ticker % 30) == 0))
{ muxtx(m_mux_channel_POLL, "AT+CREG?;+CCLK?;+CSQ;+COPS?\r\n"); } { m_driver->StatusPoller(); }
if (m_mux->IsMuxUp()) if (m_mux->IsMuxUp())
return NetWait; return NetWait;
} }
@ -863,7 +863,7 @@ modem::modem_state1_t modem::State1Ticker1()
else if ((m_state1_ticker > 3)&&((m_netreg >= Registered))) else if ((m_state1_ticker > 3)&&((m_netreg >= Registered)))
return NetStart; // We have GSM, so start the network return NetStart; // We have GSM, so start the network
if ((m_mux != NULL)&&(m_state1_ticker>3)&&((m_state1_ticker % 10) == 0)) if ((m_mux != NULL)&&(m_state1_ticker>3)&&((m_state1_ticker % 10) == 0))
{ muxtx(m_mux_channel_POLL, "AT+CREG?;+CCLK?;+CSQ;+COPS?\r\n"); } { m_driver->StatusPoller(); }
break; break;
case NetStart: case NetStart:
@ -899,14 +899,14 @@ modem::modem_state1_t modem::State1Ticker1()
case NetHold: case NetHold:
if ((m_mux != NULL)&&(m_state1_ticker>5)&&((m_state1_ticker % 30) == 0)) if ((m_mux != NULL)&&(m_state1_ticker>5)&&((m_state1_ticker % 30) == 0))
{ muxtx(m_mux_channel_POLL, "AT+CREG?;+CCLK?;+CSQ;+COPS?\r\n"); } { m_driver->StatusPoller(); }
break; break;
case NetSleep: case NetSleep:
if (m_powermode == On) return NetWait; if (m_powermode == On) return NetWait;
if (m_powermode != Sleep) return PoweringOn; if (m_powermode != Sleep) return PoweringOn;
if ((m_mux != NULL)&&(m_state1_ticker>5)&&((m_state1_ticker % 30) == 0)) if ((m_mux != NULL)&&(m_state1_ticker>5)&&((m_state1_ticker % 30) == 0))
{ muxtx(m_mux_channel_POLL, "AT+CREG?;+CCLK?;+CSQ;+COPS?\r\n"); } { m_driver->StatusPoller(); }
break; break;
case NetMode: case NetMode: