Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Gen3] 05.12 - Refactor logic that hard codes UMNOPROF for Kore ATT #2319

Merged
merged 3 commits into from
May 19, 2021
Merged

[Gen3] 05.12 - Refactor logic that hard codes UMNOPROF for Kore ATT #2319

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18b2aa0
Refactor logic that hard codes KORE ATT UMNOPROF
keeramis May 19, 2021
cf7f236
Fix comment
keeramis May 19, 2021
291611d
minor
keeramis May 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 6 additions & 14 deletions hal/network/ncp_client/sara/sara_ncp_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,19 +1004,6 @@ int SaraNcpClient::selectNetworkProf(ModemState& state) {
(netConf_.netProv() == CellularNetworkProvider::KORE_ATT &&
static_cast<UbloxSaraUmnoprof>(curProf) != UbloxSaraUmnoprof::ATT)) ) {
int newProf = static_cast<int>(UbloxSaraUmnoprof::SIM_SELECT);

// Hard code ATT for 05.12 firmware versions
if (fwVersion_ == UBLOX_NCP_R4_APP_FW_VERSION_0512) {
if (netConf_.netProv() == CellularNetworkProvider::KORE_ATT) {
newProf = static_cast<int>(UbloxSaraUmnoprof::ATT);
// break out of do-while if we're trying to set ATT a third time
if (resetCount >= 2) {
LOG(WARN, "Hard coding to UMNOPROF=2 did not work, please check if UMNOPROF=100 is required!");
break;
}
}
}

// TWILIO Super SIM
if (netConf_.netProv() == CellularNetworkProvider::TWILIO) {
// _oldFirmwarePresent: u-blox firmware 05.06* and 05.07* does not have
Expand All @@ -1033,6 +1020,12 @@ int SaraNcpClient::selectNetworkProf(ModemState& state) {
}
// KORE AT&T or 3rd Party SIM
else {
// Hard code ATT for 05.12 firmware versions
if (fwVersion_ == UBLOX_NCP_R4_APP_FW_VERSION_0512) {
keeramis marked this conversation as resolved.
Show resolved Hide resolved
if (netConf_.netProv() == CellularNetworkProvider::KORE_ATT) {
newProf = static_cast<int>(UbloxSaraUmnoprof::ATT);
}
}
// break out of do-while if we're trying to set SIM_SELECT a third time
if (resetCount >= 2) {
LOG(WARN, "UMNOPROF=1 did not resolve a built-in profile, please check if UMNOPROF=100 is required!");
Expand Down Expand Up @@ -1084,7 +1077,6 @@ int SaraNcpClient::selectNetworkProf(ModemState& state) {
// Prevent modem from immediately dropping into PSM/eDRX modes
// which (on 05.12) may be enabled as soon as the UMNOPROF has taken effect
if (disableLowPowerModes) {
// Not checking the error
CHECK(disablePsmEdrx());
}
}
Expand Down