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

diff --git a/src/owDeviceConfig.cpp b/src/owDeviceConfig.cpp
index 5c86c05..c3e4301 100644
--- a/src/owDeviceConfig.cpp
+++ b/src/owDeviceConfig.cpp
@@ -243,6 +243,51 @@ std::vector<std::string> owDeviceConfig::getQuantityFromNumber(uint8_t code) {
 			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("");
@@ -284,11 +329,12 @@ double owDeviceConfig::calculateValueFromNumber(int code, int vn, std::vector<in
 			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
+			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];
 		}
 }
@@ -325,6 +371,13 @@ std::string owDeviceConfig::getSensorChip(uint8_t ch) {
 		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;