This commit is contained in:
2024-12-27 12:02:11 +01:00
parent 9d3a97e53b
commit b2f68dcb7b
3 changed files with 47 additions and 48 deletions

View File

@@ -7,44 +7,32 @@ namespace serial {
static const char *TAG = "serial.marlin2";
void Marlin2::loop() {
while (this->available()) {
uint8_t c;
this->read_byte(&c);
if (c == '\r')
continue;
if (c == '\n')
this->parse_values_();
else
this->rx_message_.push_back(c);
}
// while (this->available()) {
// uint8_t c;
// this->read_byte(&c);
// if (c == '\r')
// continue;
// if (c == '\n')
// this->parse_values_();
// else
// this->rx_message_.push_back(c);
// }
}
void Marlin2::parse_values_() {
std::string s(this->rx_message_.begin(), this->rx_message_.end());
int spos = 0;
int epos = 0;
std::vector<float> values;
while (epos != std::string::npos) {
epos = s.find(',', spos);
int len = (epos == std::string::npos ? s.size() - spos : epos - spos);
values.push_back(parse_number<float>(s.substr(spos, len)).value_or(NAN));
if (epos != std::string::npos)
spos = epos + 1;
}
this->rx_message_.clear();
for (auto sens : this->sensors_) {
if (sens.first < values.size())
sens.second->publish_state(values[sens.first]);
}
}
// void Marlin2::parse_values_() {
// std::string s(this->rx_message_.begin(), this->rx_message_.end());
// ESP_LOGV(TAG, s);
// }
void Marlin2::dump_config() {
ESP_LOGCONFIG("", "Serial CSV Reader");
for (auto sens : this->sensors_) {
ESP_LOGCONFIG(TAG, "Index %d", sens.first);
LOG_SENSOR(TAG, "", sens.second);
}
}
// void Marlin2::dump_config() {
// ESP_LOGCONFIG("", "Serial CSV Reader");
// for (auto sens : this->sensors_) {
// ESP_LOGCONFIG(TAG, "Index %d", sens.first);
// LOG_SENSOR(TAG, "", sens.second);
// }
// }
} // namespace serial
} // namespace esphome