GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-04 06:10:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Isolate sensor unit for easier post treatment

Browse Source
This commit is contained in:
Luc 2020-08-27 19:25:42 +02:00
parent 9be683efc3
commit a035516a20
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
esp3d/src/modules/sensor/analogsensor.cpp
View File

@ -78,8 +78,9 @@ const char * AnalogSensorDevice::GetModelString(uint8_t i)
const char * AnalogSensorDevice::GetData() const char * AnalogSensorDevice::GetData()
{ {
static String s; static String s;
s = String(SENSOR_CONVERTER(analogRead(ESP3D_SENSOR_PIN))); s = String(SENSOR_CONVERTER(analogRead(ESP3D_SENSOR_PIN))) + "[";
s += SENSOR__UNIT; s += SENSOR__UNIT;
s +="]";
return s.c_str(); return s.c_str();
} }

7
esp3d/src/modules/sensor/bmx280.cpp
View File

@ -167,11 +167,12 @@ const char * BMX280SensorDevice::GetData()
temperature = toFahrenheit(temperature); temperature = toFahrenheit(temperature);
} }
s= String(temperature,1); s= String(temperature,1);
s+= "[";
s+= SENSOR__UNIT; s+= SENSOR__UNIT;
s+= " " +String(pressure,1); s+= "] " +String(pressure,1);
s+= "Pa"; s+= "[Pa]";
if (bmx280_device->isBME280()) { if (bmx280_device->isBME280()) {
s+=" " + String(humidity,1) + "%"; s+=" " + String(humidity,1) + "[%]";
} }
} else { } else {
s="DISCONNECTED"; s="DISCONNECTED";

5
esp3d/src/modules/sensor/dht.cpp
View File

@ -134,8 +134,9 @@ const char * DHTSensorDevice::GetData()
} }
if ( String(humidity,1)!="nan") { if ( String(humidity,1)!="nan") {
s= String(temperature,1); s= String(temperature,1);
s+= SENSOR__UNIT; s+= "[";
s+=" " + String(humidity,1) + "%"; s+= SENSOR__UNIT+
s+="] " + String(humidity,1) + "[%]";
} else { } else {
s="DISCONNECTED"; s="DISCONNECTED";
log_esp3d("No valid data"); log_esp3d("No valid data");

5
esp3d/src/modules/sensor/sensor.h
View File

@ -45,7 +45,10 @@ public:
{ {
return 0; return 0;
} }
virtual uint8_t GetModel(uint8_t i=0){ return 0;} virtual uint8_t GetModel(uint8_t i=0)
{
return 0;
}
virtual const char *GetModelString(uint8_t i=0) virtual const char *GetModelString(uint8_t i=0)
{ {
return "None"; return "None";