sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-31 15:12:06 +00:00
Code Issues Releases Wiki Activity

fix some gnss isues

Browse Source
This commit is contained in:
oarcher
2024-08-13 01:24:58 +02:00
parent 0b4d2cbe07
commit 67fb79a6e7
3 changed files with 82 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,7 @@ AtCommandResult ModemComponent::send_at(const std::string &cmd, uint32_t timeout
if (this->modem_ready()) {
ESP_LOGV(TAG, "Sending command: %s", cmd.c_str());
status = this->dce->at(cmd, at_command_result.result, timeout);
ESP_LOGV(TAG, "Result for command %s: %s (status %s)", cmd.c_str(), at_command_result.result.c_str(),
ESP_LOGD(TAG, "Result for command %s: %s (status %s)", cmd.c_str(), at_command_result.result.c_str(),
command_result_to_string(status).c_str());
}
if (status == command_result::OK) {
@@ -694,7 +694,7 @@ void ModemComponent::poweron_() {
if (this->modem_ready()) {
ESP_LOGV(TAG, "Modem is already ON");
} else {
ESP_LOGW(TAG, "No 'power_pin' defined: Not able to poweron the modem");
ESP_LOGE(TAG, "No 'power_pin' defined: Not able to poweron the modem");
}
}
}

164
esphome/components/modem/sensor/modem_sensor.cpp
View File

@@ -79,6 +79,7 @@ std::map<std::string, std::string> get_gnssinfo_tokens(const std::string &gnss_i
if (data.find(",,,,,,") != std::string::npos) {
ESP_LOGW(TAG, "No GNSS location available");
return gnss_data; // empty
}
std::vector<std::string> parts;
@@ -90,10 +91,6 @@ std::map<std::string, std::string> get_gnssinfo_tokens(const std::string &gnss_i
}
switch (parts.size()) {
case 15:
parts.emplace_back("");
// NOLINTNEXTLINE(bugprone-branch-clone)
// fall through
case 16:
gnss_data["mode"] = parts[0];
gnss_data["sat_used_count"] = parts[1];
@@ -114,10 +111,6 @@ std::map<std::string, std::string> get_gnssinfo_tokens(const std::string &gnss_i
gnss_data["lon_lat_format"] = "DDMM.MM"; // decimal degrees, float minutes
break;
case 17:
parts.emplace_back("");
// NOLINTNEXTLINE(bugprone-branch-clone)
// fall through
case 18:
gnss_data["mode"] = parts[0];
gnss_data["sat_used_count"] = parts[1];
@@ -154,87 +147,88 @@ std::map<std::string, std::string> get_gnssinfo_tokens(const std::string &gnss_i
void ModemSensor::update_gnss_sensors_() {
if (this->gnss_latitude_sensor_ || this->gnss_longitude_sensor_ || this->gnss_altitude_sensor_) {
std::map<std::string, std::string> parts;
auto at_command_result = global_modem_component->send_at("AT+CGNSSINFO");
if (at_command_result) {
std::string gnss_info = at_command_result.result;
std::map<std::string, std::string> parts = get_gnssinfo_tokens(gnss_info);
float lat = NAN;
float lon = NAN;
if (parts["lon_lat_format"] == "DDMM.MM") {
float lat_deg = parts["latitude"].empty() ? NAN : std::stof(parts["latitude"].substr(0, 2));
float lat_min = parts["latitude"].empty() ? NAN : std::stof(parts["latitude"].substr(2));
lat = lat_deg + (lat_min / 60.0);
if (parts["lat_dir"] == "S")
lat = -lat;
float lon_deg = parts["longitude"].empty() ? NAN : std::stof(parts["longitude"].substr(0, 3));
float lon_min = parts["longitude"].empty() ? NAN : std::stof(parts["longitude"].substr(3));
lon = lon_deg + (lon_min / 60.0);
if (parts["lon_dir"] == "W")
lon = -lon;
} else if (parts["lon_lat_format"] == "DD.DD") {
lat = parts["latitude"].empty() ? NAN : std::stof(parts["latitude"]);
if (parts["lat_dir"] == "S")
lat = -lat;
lon = parts["longitude"].empty() ? NAN : std::stof(parts["longitude"]);
if (parts["lon_dir"] == "W")
lon = -lon;
}
float alt = parts["altitude"].empty() ? NAN : std::stof(parts["altitude"]);
float speed_knots = parts["speed"].empty() ? NAN : std::stof(parts["speed"]);
float speed_kmh = speed_knots * 1.852; // Convert speed from knots to km/h
float cog = parts["cog"].empty() ? NAN : std::stof(parts["cog"]);
float pdop = parts["pdop"].empty() ? NAN : std::stof(parts["pdop"]);
float hdop = parts["hdop"].empty() ? NAN : std::stof(parts["hdop"]);
float vdop = parts["vdop"].empty() ? NAN : std::stof(parts["vdop"]);
int mode = parts["mode"].empty() ? 0 : std::stoi(parts["mode"]);
int gps_svs = parts["sat_used_count"].empty() ? 0 : std::stoi(parts["sat_used_count"]);
int glonass_svs = parts["sat_view_count"].empty() ? NAN : std::stoi(parts["sat_view_count"]);
int beidou_svs = parts["sat_view_count_2"].empty() ? 0 : std::stoi(parts["sat_view_count_2"]);
// Parsing date
int day = parts["date"].empty() ? 0 : std::stoi(parts["date"].substr(0, 2));
int month = parts["date"].empty() ? 0 : std::stoi(parts["date"].substr(2, 2));
int year = parts["date"].empty() ? 0 : std::stoi(parts["date"].substr(4, 2)) + 2000;
// Parsing time
int hour = parts["time"].empty() ? 0 : std::stoi(parts["time"].substr(0, 2));
int minute = parts["time"].empty() ? 0 : std::stoi(parts["time"].substr(2, 2));
int second = parts["time"].empty() ? 0 : std::stoi(parts["time"].substr(4, 2));
ESP_LOGV(TAG, "Latitude: %f, Longitude: %f", lat, lon);
ESP_LOGV(TAG, "Altitude: %f m", alt);
ESP_LOGV(TAG, "Speed: %f km/h", speed_kmh);
ESP_LOGV(TAG, "COG: %f degrees", cog);
ESP_LOGV(TAG, "PDOP: %f", pdop);
ESP_LOGV(TAG, "HDOP: %f", hdop);
ESP_LOGV(TAG, "VDOP: %f", vdop);
ESP_LOGV(TAG, "GPS SVs: %d", gps_svs);
ESP_LOGV(TAG, "GLONASS SVs: %d", glonass_svs);
ESP_LOGV(TAG, "BEIDOU SVs: %d", beidou_svs);
ESP_LOGV(TAG, "Fix mode: %d", mode);
ESP_LOGV(TAG, "Date: %04d-%02d-%02d", year, month, day);
ESP_LOGV(TAG, "Time: %02d:%02d:%02d", hour, minute, second);
// Sensors update
App.feed_wdt();
if (this->gnss_latitude_sensor_)
this->gnss_latitude_sensor_->publish_state(lat);
if (this->gnss_longitude_sensor_)
this->gnss_longitude_sensor_->publish_state(lon);
if (this->gnss_altitude_sensor_)
this->gnss_altitude_sensor_->publish_state(alt);
if (this->gnss_speed_sensor_)
this->gnss_speed_sensor_->publish_state(speed_kmh);
if (this->gnss_course_sensor_)
this->gnss_course_sensor_->publish_state(cog);
if (this->gnss_accuracy_sensor_)
this->gnss_accuracy_sensor_->publish_state(hdop * 5);
parts = get_gnssinfo_tokens(gnss_info);
}
float lat = NAN;
float lon = NAN;
if (parts["lon_lat_format"] == "DDMM.MM") {
float lat_deg = parts["latitude"].empty() ? NAN : std::stof(parts["latitude"].substr(0, 2));
float lat_min = parts["latitude"].empty() ? NAN : std::stof(parts["latitude"].substr(2));
lat = lat_deg + (lat_min / 60.0);
if (parts["lat_dir"] == "S")
lat = -lat;
float lon_deg = parts["longitude"].empty() ? NAN : std::stof(parts["longitude"].substr(0, 3));
float lon_min = parts["longitude"].empty() ? NAN : std::stof(parts["longitude"].substr(3));
lon = lon_deg + (lon_min / 60.0);
if (parts["lon_dir"] == "W")
lon = -lon;
} else if (parts["lon_lat_format"] == "DD.DD") {
lat = parts["latitude"].empty() ? NAN : std::stof(parts["latitude"]);
if (parts["lat_dir"] == "S")
lat = -lat;
lon = parts["longitude"].empty() ? NAN : std::stof(parts["longitude"]);
if (parts["lon_dir"] == "W")
lon = -lon;
}
float alt = parts["altitude"].empty() ? NAN : std::stof(parts["altitude"]);
float speed_knots = parts["speed"].empty() ? NAN : std::stof(parts["speed"]);
float speed_kmh = speed_knots * 1.852; // Convert speed from knots to km/h
float cog = parts["cog"].empty() ? NAN : std::stof(parts["cog"]);
float pdop = parts["pdop"].empty() ? NAN : std::stof(parts["pdop"]);
float hdop = parts["hdop"].empty() ? NAN : std::stof(parts["hdop"]);
float vdop = parts["vdop"].empty() ? NAN : std::stof(parts["vdop"]);
int mode = parts["mode"].empty() ? 0 : std::stoi(parts["mode"]);
int gps_svs = parts["sat_used_count"].empty() ? 0 : std::stoi(parts["sat_used_count"]);
int glonass_svs = parts["sat_view_count"].empty() ? NAN : std::stoi(parts["sat_view_count"]);
int beidou_svs = parts["sat_view_count_2"].empty() ? 0 : std::stoi(parts["sat_view_count_2"]);
// Parsing date
int day = parts["date"].empty() ? 0 : std::stoi(parts["date"].substr(0, 2));
int month = parts["date"].empty() ? 0 : std::stoi(parts["date"].substr(2, 2));
int year = parts["date"].empty() ? 0 : std::stoi(parts["date"].substr(4, 2)) + 2000;
// Parsing time
int hour = parts["time"].empty() ? 0 : std::stoi(parts["time"].substr(0, 2));
int minute = parts["time"].empty() ? 0 : std::stoi(parts["time"].substr(2, 2));
int second = parts["time"].empty() ? 0 : std::stoi(parts["time"].substr(4, 2));
ESP_LOGV(TAG, "Latitude: %f, Longitude: %f", lat, lon);
ESP_LOGV(TAG, "Altitude: %f m", alt);
ESP_LOGV(TAG, "Speed: %f km/h", speed_kmh);
ESP_LOGV(TAG, "COG: %f degrees", cog);
ESP_LOGV(TAG, "PDOP: %f", pdop);
ESP_LOGV(TAG, "HDOP: %f", hdop);
ESP_LOGV(TAG, "VDOP: %f", vdop);
ESP_LOGV(TAG, "GPS SVs: %d", gps_svs);
ESP_LOGV(TAG, "GLONASS SVs: %d", glonass_svs);
ESP_LOGV(TAG, "BEIDOU SVs: %d", beidou_svs);
ESP_LOGV(TAG, "Fix mode: %d", mode);
ESP_LOGV(TAG, "Date: %04d-%02d-%02d", year, month, day);
ESP_LOGV(TAG, "Time: %02d:%02d:%02d", hour, minute, second);
// Sensors update
App.feed_wdt();
if (this->gnss_latitude_sensor_)
this->gnss_latitude_sensor_->publish_state(lat);
if (this->gnss_longitude_sensor_)
this->gnss_longitude_sensor_->publish_state(lon);
if (this->gnss_altitude_sensor_)
this->gnss_altitude_sensor_->publish_state(alt);
if (this->gnss_speed_sensor_)
this->gnss_speed_sensor_->publish_state(speed_kmh);
if (this->gnss_course_sensor_)
this->gnss_course_sensor_->publish_state(cog);
if (this->gnss_accuracy_sensor_)
this->gnss_accuracy_sensor_->publish_state(hdop * 5);
}
}

2
esphome/components/modem/switch/gnss_switch.cpp
View File

@@ -32,7 +32,7 @@ using namespace esp_modem;
static const char *const TAG = "modem.switch";
optional<bool> GnssSwitch::get_modem_gnss_state() {
optional<bool> gnss_state;
optional<bool> gnss_state = nullopt;
auto at_command_result = global_modem_component->send_at(this->command_ + "?");
if (at_command_result) {
std::string modem_state = at_command_result.result;