X-Git-Url: http://git.smho.de/?a=blobdiff_plain;f=src%2FowDeviceConfig.cpp;h=5c86c05a18688a25af90f743f658e0e56b6b5d31;hb=2d637281cefcc16f27911887827217744880e74c;hp=18b0126aa13e0a775aa700ae58af7f910fa951c3;hpb=7968f686e3576bdb90a063998ec2718c074e0162;p=owTools.git

diff --git a/src/owDeviceConfig.cpp b/src/owDeviceConfig.cpp
index 18b0126..5c86c05 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("");
@@ -243,7 +275,21 @@ double owDeviceConfig::calculateValueFromNumber(int code, int vn, std::vector<in
 			case 15:return exp((V[vn]-32767.0)/1000.0);  break;
 			case 16:return V[vn]/32.0;  break;
 			case 17:return V[vn]*0.2441/1000.0; break; //Vsens DS2438
-			default:return 0;
+			case 18:return V[vn]/8.0;break;
+			case 19:return V[vn]/500.0*14.0;break;  //Test
+			case 20:return V[vn]*0.5+700;break;  
+			case 21:return V[vn]+1280; break;  
+			case 22:return V[vn]*10;break;
+			case 23:return V[vn]*0.025+700.0;break;
+			case 24:return V[vn]*1.1/1024.0;break;
+			case 25:return V[vn]*3.0/1024.0;break;
+			case 26:return V[vn]*5.0/1024.0;break;
+<<<<<<< HEAD
+			case 27:return ((double)V[2]+(double)V[1]/1000.0)/8.0;break;
+			case 28:return exp(V[vn]/2560.0);break;
+=======
+>>>>>>> origin/master
+			default:return V[vn];
 		}
 }
 
@@ -270,8 +316,15 @@ std::string owDeviceConfig::getSensorChip(uint8_t ch) {
 		case 17: s="MAX1164/TGS8100";break;	// 	VOC-Sensor
 		case 18: s="TGS8100 direkt";break;	//	VOC-Sensor
 		case 19: s="DS2423";break;	//	Counter
-		case 20: s="SHT35";break;	//	Feuchte/Temperatur Bester
-		case 21: s="SHT31";break;	//	Feuchte/Temperautr
+		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;
+		case 27: s="iAQ-core C";break;
+		case 28: s="HDC2010";break;
 		default: return "";
 	}
 	return s;