adds modemEmergencyHardReset() for R510

Author: technobly

hal/network/ncp_client/sara/sara_ncp_client.cpp

@@ -1004,6 +1004,7 @@ int SaraNcpClient::waitReady(bool powerOn) {
         return SYSTEM_ERROR_NONE;
     }
 
+    static int waitReadyRetries = 0;
     ModemState modemState = ModemState::Unknown;
 
     // Just in case make sure that the voltage translator is on
@@ -1048,6 +1049,7 @@ int SaraNcpClient::waitReady(bool powerOn) {
         skipAll(serial_.get());
         parser_.reset();
         parserError_ = 0;
+        waitReadyRetries = 0;
         LOG(TRACE, "NCP ready to accept AT commands");
 
         auto r = initReady(modemState);
@@ -1065,6 +1067,10 @@ int SaraNcpClient::waitReady(bool powerOn) {
         // Hard reset the modem
         modemHardReset(true);
         ncpState(NcpState::OFF);
+        if (++waitReadyRetries >= 10) {
+            waitReadyRetries = 10;
+            modemEmergencyHardReset();
+        }
 
         return SYSTEM_ERROR_INVALID_STATE;
     }
@@ -2548,6 +2554,35 @@ int SaraNcpClient::modemHardReset(bool powerOff) {
     return SYSTEM_ERROR_NONE;
 }
 
+int SaraNcpClient::modemEmergencyHardReset() {
+    if (ncpId() != PLATFORM_NCP_SARA_R510) {
+        return SYSTEM_ERROR_NONE;
+    }
+
+    LOG(TRACE, "Emergency hardware shutdown the modem");
+    const auto pwrState = modemPowerState();
+    // We can only reset the modem in the powered state
+    if (!pwrState) {
+        LOG(ERROR, "Modem is not powered on!");
+        return SYSTEM_ERROR_INVALID_STATE;
+    }
+
+    // Low held on power pin
+    HAL_GPIO_Write(UBPWR, 0);
+    HAL_Delay_Milliseconds(500);
+    // Low held on reset pin
+    HAL_GPIO_Write(UBRST, 0);
+    // Release power pin after 23s (23.5)
+    HAL_Delay_Milliseconds(23000);
+    HAL_GPIO_Write(UBPWR, 1);
+    // Release reset pin after 1.5s (2s)
+    HAL_Delay_Milliseconds(2000);
+    HAL_GPIO_Write(UBRST, 1);
+
+    ncpPowerState(NcpPowerState::TRANSIENT_ON);
+    return SYSTEM_ERROR_NONE;
+}
+
 bool SaraNcpClient::modemPowerState() const {
     return HAL_GPIO_Read(UBVINT);
 }

hal/network/ncp_client/sara/sara_ncp_client.h

@@ -159,6 +159,7 @@ class SaraNcpClient: public CellularNcpClient {
     int modemPowerOff();
     int modemSoftPowerOff();
     int modemHardReset(bool powerOff = false);
+    int modemEmergencyHardReset();
     bool modemPowerState() const;
     int modemSetUartState(bool state) const;
     void waitForPowerOff();