X-Git-Url: http://git.smho.de/gw/?a=blobdiff_plain;f=src%2FowDeviceConfig.cpp;h=c3e430194dd22b15ce72a39ee69bc72915ad69ac;hb=dde7c78613c656f74b606e7b5048188749ee0e0d;hp=00bb4b453bbcb1b57b377ac15c2f5fff6b5ef822;hpb=51072ef678990d6bd1a228f2a14a6e2ca82a0037;p=owTools.git

diff --git a/src/owDeviceConfig.cpp b/src/owDeviceConfig.cpp
index 00bb4b4..c3e4301 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,83 @@ 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");
+
+		case 19:
+			l.push_back("particulate mass concentration PM1");
+			l.push_back("Feinstaubkonzentration PM1");
+			l.push_back("µg/m³");
+		case 20:
+			l.push_back("particulate mass concentration PM2.5");
+			l.push_back("Feinstaubkonzentration PM2.5");
+			l.push_back("µg/m³");
+		case 21:
+			l.push_back("particulate mass concentration PM4");
+			l.push_back("Feinstaubkonzentration PM4");
+			l.push_back("µg/m³");
+		case 22:
+			l.push_back("particulate mass concentration PM10");
+			l.push_back("Feinstaubkonzentration PM10");
+			l.push_back("µg/m³");
+		case 23:
+			l.push_back("number concentration PM0.5");
+			l.push_back("Partikelzahl PM0.5");
+			l.push_back("#/cm³");
+		case 24:
+			l.push_back("number concentration PM1");
+			l.push_back("Partikelzahl PM1");
+			l.push_back("#/cm³");
+		case 25:
+			l.push_back("number concentration PM2.5");
+			l.push_back("Partikelzahl PM2.5");
+			l.push_back("#/cm³");
+		case 26:
+			l.push_back("number concentration PM4");
+			l.push_back("Partikelzahl PM4");
+			l.push_back("#/cm³");
+		case 27:
+			l.push_back("number concentration PM10");
+			l.push_back("Partikelzahl PM10");
+			l.push_back("#/cm³");
+		case 28:
+			l.push_back("typical particle size");
+			l.push_back("Durchschnittliche Partikelgröße");
+			l.push_back("µm");
+
+
+
+
 		default:
 			l.push_back("");
 			l.push_back("");
@@ -246,7 +323,19 @@ double owDeviceConfig::calculateValueFromNumber(int code, int vn, std::vector<in
 			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;  
-			default:return 0;
+			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;
+			case 27:return ((double)V[2]+(double)V[1]/1000.0)/8.0;break;
+			case 28:return exp(V[vn]/2560.0);break;
+			case 29:return ((double)V[1]*10.0+(double)V[2]/100.0);break;
+			case 30: return V[vn] / 2.0; break;
+			case 31: return V[vn] / 4.0; break;
+			case 32: return V[vn] / 5.0; break;
+			default:return V[vn];
 		}
 }
 
@@ -276,6 +365,19 @@ 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;
+		case 27: s="iAQ-core C";break;
+		case 28: s="HDC2010";break;
+		case 29: s="LPS225HB";break;
+		case 30: s="SHTC3";break;
+		case 31: s="SPS30";break;
+		case 32: s="DHT11";break;
+		case 33: s="SCD30";break;
+		case 34: s="SCD40";break;
+		
 		default: return "";
 	}
 	return s;