Restore event loop start and disable getconfig in amb8465 reset.

pull/153/head
Fredrik Öhrström 2020-08-19 20:45:38 +02:00
rodzic b7dffe39f1
commit 78a353de59
2 zmienionych plików z 1 dodań i 3 usunięć

Wyświetl plik

@ -152,8 +152,6 @@ bool startUsingCommandline(Configuration *config)
auto manager = createSerialCommunicationManager(config->exitafter, config->reopenafter);
onExit(call(manager.get(),stop));
manager->startEventLoop();
Detected settings = detectWMBusDeviceSetting(config->device, config->device_extra, manager.get());
unique_ptr<SerialDevice> serial_override;
@ -397,6 +395,7 @@ LIST_OF_METERS
wmbus->setMeters(&meters);
wmbus->setTimeout(config->alarm_timeout, config->alarm_expected_activity);
manager->startEventLoop();
wmbus->setLinkModes(config->listen_to_link_modes);
string using_link_modes = wmbus->getLinkModes().hr();

Wyświetl plik

@ -116,7 +116,6 @@ WMBusAmber::WMBusAmber(unique_ptr<SerialDevice> serial, SerialCommunicationManag
void WMBusAmber::deviceReset()
{
timerclear(&timestamp_last_rx_);
getConfiguration();
}
uchar xorChecksum(vector<uchar> msg, int len)