From: Tobias Date: Wed, 25 Oct 2017 06:29:24 +0000 (+0200) Subject: New Config-Values X-Git-Url: https://git.smho.de/?a=commitdiff_plain;h=03de69ffeb1f25ccbc7757c9600c38316c262a19;p=owTools.git New Config-Values --- diff --git a/src/main.cpp b/src/main.cpp index 2e7e655..1d9e64f 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -284,6 +284,11 @@ void continuous(std::vector *devices,int intervall,int headline,int s printf("%d-%02d-%02d %02d:%02d:%02d\t", tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec); for (owDevice* dev :*devices) { for(int k=0;kmaxrepeat;k++){ + std::vector data; + //data.push_back(0xCC); + //data.push_back(0x44); + //owi->Reset(); + //owi->Communicate(&data, 2, 0); dev->convertAll(); if (owi->log->last()log->clear(); diff --git a/src/owDeviceConfig.cpp b/src/owDeviceConfig.cpp index 00bb4b4..66bc9df 100644 --- a/src/owDeviceConfig.cpp +++ b/src/owDeviceConfig.cpp @@ -170,7 +170,7 @@ std::vector owDeviceConfig::getQuantityFromNumber(uint8_t code) { case 3: l.push_back("illuminance"); l.push_back("Beleuchtungsstärke"); - l.push_back("lux"); + l.push_back("lx"); break; case 4: l.push_back("humidity"); @@ -211,6 +211,38 @@ std::vector owDeviceConfig::getQuantityFromNumber(uint8_t code) { l.push_back("Widerstand"); l.push_back("kOhm"); break; + case 12: + l.push_back("wind speed"); + l.push_back("Windgeschwindigkeit"); + l.push_back("m/s"); + break; + case 13: + l.push_back("wind speed max"); + l.push_back("Maximale Windgeschwindigkeit"); + l.push_back("m/s"); + break; + case 14: + l.push_back("wind direction"); + l.push_back("Windrichtung"); + l.push_back("°"); + break; + case 15: + l.push_back("wind direction variance"); + l.push_back("Varianz der Windrichtung"); + l.push_back("°"); + break; + case 16: + l.push_back("illuminance red"); + l.push_back("Beleuchtungsstärke Rot"); + l.push_back("lx"); + case 17: + l.push_back("illuminance green"); + l.push_back("Beleuchtungsstärke Grün"); + l.push_back("lx"); + case 18: + l.push_back("illuminance blue"); + l.push_back("Beleuchtungsstärke Blau"); + l.push_back("lx"); default: l.push_back(""); l.push_back(""); @@ -246,6 +278,7 @@ double owDeviceConfig::calculateValueFromNumber(int code, int vn, std::vector