X-Git-Url: http://git.smho.de/gw/?a=blobdiff_plain;f=src%2FowDeviceConfig.cpp;h=33f9769337b547d9fd62540e5fea3a67ce7c0c8d;hb=17ea6dc449cad650a4c783446ab048c12e44c666;hp=963b3a0f4fb7b843318c791a9e26278ff31ec40c;hpb=039b202e5c68834801d23e22eecc7cae2879ea83;p=owTools.git

diff --git a/src/owDeviceConfig.cpp b/src/owDeviceConfig.cpp
index 963b3a0..33f9769 100644
--- a/src/owDeviceConfig.cpp
+++ b/src/owDeviceConfig.cpp
@@ -170,7 +170,7 @@ std::vector<std::string> 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<std::string> 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("");
@@ -245,7 +277,10 @@ double owDeviceConfig::calculateValueFromNumber(int code, int vn, std::vector<in
 			case 17:return V[vn]*0.2441/1000.0; break; //Vsens DS2438
 			case 18:return V[vn]/8.0;break;
 			case 19:return V[vn]/500.0*14.0;break;  //Test
-			default:return 0;
+			case 20:return V[vn]*0.5+700;break;  
+			case 21:return V[vn]+1280; break;  
+			case 22:return V[vn]*10;break;
+			default:return V[vn];
 		}
 }
 
@@ -275,6 +310,10 @@ std::string owDeviceConfig::getSensorChip(uint8_t ch) {
 		case 20: s="Intern ADC";break;
 		case 21: s="SHT35";break;	//	Feuchte/Temperatur Bester
 		case 22: s="SHT31";break;	//	Feuchte/Temperautr
+		case 23: s="APDS-9960";break;	//	Feuchte/Temperautr
+		case 24: s="BMP680";break;
+		case 25: s="SGP30";break;
+		case 26: s="SGPC3";break;
 		default: return "";
 	}
 	return s;