espressif/esp-protocols
1
0
Fork 1
mirror of https://github.com/espressif/esp-protocols.git synced 2025-07-18 04:52:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(esp_modem): Read module name with AT commands

Browse Source 
This fixes basic IDF test case which supplied dummy module name.
This commit is contained in:
David Cermak
2021-11-25 16:24:49 +01:00
parent 5f0832a0ad
commit 8417e232aa
4 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_modem/include/cxx_include/esp_modem_dce_module.hpp
View File

@ -119,7 +119,6 @@ protected:
class SIM7600: public GenericModule { class SIM7600: public GenericModule {
using GenericModule::GenericModule; using GenericModule::GenericModule;
public: public:
command_result get_module_name(std::string &name) override;
command_result get_battery_status(int &voltage, int &bcs, int &bcl) override; command_result get_battery_status(int &voltage, int &bcs, int &bcl) override;
command_result power_down() override; command_result power_down() override;
}; };
@ -130,7 +129,6 @@ public:
class SIM800: public GenericModule { class SIM800: public GenericModule {
using GenericModule::GenericModule; using GenericModule::GenericModule;
public: public:
command_result get_module_name(std::string &name) override;
command_result power_down() override; command_result power_down() override;
command_result set_data_mode() override; command_result set_data_mode() override;
}; };
@ -140,8 +138,6 @@ public:
*/ */
class BG96: public GenericModule { class BG96: public GenericModule {
using GenericModule::GenericModule; using GenericModule::GenericModule;
public:
command_result get_module_name(std::string &name) override;
}; };
/** /**

18
components/esp_modem/src/esp_modem_modules.cpp
View File

@ -50,12 +50,6 @@ DECLARE_ALL_COMMAND_APIS(return_type name(...) )
// //
// Handle specific commands for specific supported modems // Handle specific commands for specific supported modems
// //
command_result SIM7600::get_module_name(std::string &name)
{
name = "7600";
return command_result::OK;
}
command_result SIM7600::get_battery_status(int &voltage, int &bcs, int &bcl) command_result SIM7600::get_battery_status(int &voltage, int &bcs, int &bcl)
{ {
return dce_commands::get_battery_status_sim7xxx(dte.get(), voltage, bcs, bcl); return dce_commands::get_battery_status_sim7xxx(dte.get(), voltage, bcs, bcl);
@ -66,12 +60,6 @@ command_result SIM7600::power_down()
return dce_commands::power_down_sim7xxx(dte.get()); return dce_commands::power_down_sim7xxx(dte.get());
} }
command_result SIM800::get_module_name(std::string &name)
{
name = "800L";
return command_result::OK;
}
command_result SIM800::power_down() command_result SIM800::power_down()
{ {
return dce_commands::power_down_sim8xx(dte.get()); return dce_commands::power_down_sim8xx(dte.get());
@ -82,10 +70,4 @@ command_result SIM800::set_data_mode()
return dce_commands::set_data_mode_sim8xx(dte.get()); return dce_commands::set_data_mode_sim8xx(dte.get());
} }
command_result BG96::get_module_name(std::string &name)
{
name = "BG96";
return command_result::OK;
}
} }

2
components/esp_modem/test/host_test/main/LoopbackTerm.cpp
View File

@ -28,6 +28,8 @@ int LoopbackTerm::write(uint8_t *data, size_t len)
response = "CONNECT\r\n"; response = "CONNECT\r\n";
} else if (command.find("AT+CSQ\r") != std::string::npos) { } else if (command.find("AT+CSQ\r") != std::string::npos) {
response = "+CSQ: 123,456\n\r\nOK\r\n"; response = "+CSQ: 123,456\n\r\nOK\r\n";
} else if (command.find("AT+CGMM\r") != std::string::npos) {
response = "0G Dummy Model\n\r\nOK\r\n";
} else if (command.find("AT+CBC\r") != std::string::npos) { } else if (command.find("AT+CBC\r") != std::string::npos) {
response = is_bg96 ? "+CBC: 1,2,123456V\r\r\n\r\nOK\r\n\n\r\n" : response = is_bg96 ? "+CBC: 1,2,123456V\r\r\n\r\nOK\r\n\n\r\n" :
"+CBC: 123.456V\r\r\n\r\nOK\r\n\n\r\n"; "+CBC: 123.456V\r\r\n\r\nOK\r\n\n\r\n";

4
components/esp_modem/test/host_test/main/test_modem.cpp
View File

@ -37,6 +37,10 @@ TEST_CASE("DCE AT parser", "[esp_modem]")
CHECK(dce->set_pin("1234") == command_result::OK); CHECK(dce->set_pin("1234") == command_result::OK);
CHECK(dce->read_pin(pin_ok) == command_result::OK); CHECK(dce->read_pin(pin_ok) == command_result::OK);
CHECK(pin_ok == true); CHECK(pin_ok == true);
std::string model;
CHECK(dce->get_module_name(model) == command_result::OK);
CHECK(model == "0G Dummy Model");
} }