Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-26 07:24:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

read modem gnss state

Browse source
This commit is contained in:
oarcher 2024-08-12 14:55:37 +02:00
parent e1af5bc767
commit 60a7ef7408
3 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
esphome/components/modem/modem_component.cpp
View file

@ -73,7 +73,7 @@ bool ModemComponent::get_imei(std::string &result) {
if (this->dce) { if (this->dce) {
command_result status; command_result status;
// status = this->dce->get_imei(result); // status = this->dce->get_imei(result);
status = this->dce->at("AT+CGSN", result, 3000); status = this->dce->at("AT+CGSN", result, 1000);
success = true; success = true;
if (status == command_result::OK && result.length() == 15) { if (status == command_result::OK && result.length() == 15) {
for (char c : result) { for (char c : result) {
@ -122,7 +122,7 @@ bool ModemComponent::modem_ready(bool force_check) {
#endif #endif
} }
std::string imei; std::string imei;
watchdog::WatchdogManager wdt(10000); // watchdog::WatchdogManager wdt(10000);
if (this->get_imei(imei)) { if (this->get_imei(imei)) {
// we are sure that the modem is on // we are sure that the modem is on
this->internal_state_.powered_on = true; this->internal_state_.powered_on = true;

3
esphome/components/modem/switch/gnns_switch.h
View file

@ -16,6 +16,7 @@ namespace modem {
class GnssSwitch : public switch_::Switch, public Component { class GnssSwitch : public switch_::Switch, public Component {
public: public:
void set_command(const std::string &command) { this->command_ = command; } void set_command(const std::string &command) { this->command_ = command; }
optional<bool> get_modem_gnss_state();
// ========== INTERNAL METHODS ========== // ========== INTERNAL METHODS ==========
// (In most use cases you won't need these) // (In most use cases you won't need these)
@ -26,7 +27,7 @@ class GnssSwitch : public switch_::Switch, public Component {
protected: protected:
std::string command_; std::string command_;
void write_state(bool state) override; void write_state(bool state) override;
bool modem_state_{false}; optional<bool> modem_state_;
}; };
} // namespace modem } // namespace modem

28
esphome/components/modem/switch/gnss_switch.cpp
View file

@ -31,15 +31,39 @@ using namespace esp_modem;
static const char *const TAG = "modem.switch"; static const char *const TAG = "modem.switch";
optional<bool> GnssSwitch::get_modem_gnss_state() {
optional<bool> gnss_state;
if (global_modem_component->modem_ready()) {
std::string modem_state = global_modem_component->send_at(this->command_ + "?");
std::string delimiter = ": ";
std::size_t pos = modem_state.find(delimiter);
if (pos != std::string::npos) {
pos += delimiter.length();
if (modem_state[pos] == '1') {
return true;
} else if (modem_state[pos] == '0') {
return false;
}
}
}
return gnss_state;
}
void GnssSwitch::dump_config() { LOG_SWITCH("", "Modem GNSS Switch", this); } void GnssSwitch::dump_config() { LOG_SWITCH("", "Modem GNSS Switch", this); }
void GnssSwitch::setup() { this->state = this->get_initial_state_with_restore_mode().value_or(false); } void GnssSwitch::setup() { this->state = this->get_initial_state_with_restore_mode().value_or(false); }
void GnssSwitch::loop() { void GnssSwitch::loop() {
if ((this->state != this->modem_state_) && global_modem_component->modem_ready()) { if (global_modem_component->modem_ready()) {
if (!this->modem_state_.has_value()) {
this->modem_state_ = this->get_modem_gnss_state();
} else {
if ((this->state != this->modem_state_)) {
global_modem_component->send_at(this->command_ + (this->state ? "=1" : "=0")); global_modem_component->send_at(this->command_ + (this->state ? "=1" : "=0"));
this->modem_state_ = this->state; this->modem_state_ = this->state;
this->publish_state(this->modem_state_); this->publish_state(this->state);
}
}
} }
} }