ok
Fork of g3_waterplay by
Revision 10:fbab9fa07922, committed 2016-06-20
- Comitter:
- ekasinambela
- Date:
- Mon Jun 20 14:46:19 2016 +0000
- Parent:
- 9:a12f15260c67
- Commit message:
- temperature measurement is OK
Changed in this revision
| TemperatureSensor.cpp | Show annotated file Show diff for this revision Revisions of this file |
| main.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/TemperatureSensor.cpp Mon Jun 20 10:19:27 2016 +0000
+++ b/TemperatureSensor.cpp Mon Jun 20 14:46:19 2016 +0000
@@ -42,6 +42,7 @@
if(this->_temperature > KELVIN_TO_CELCIUS){
this->_temperature += VARIANCE;
+ this->_temperature += 0.21*this->_temperature - 6.09;
}
this->_status = 0.0;
--- a/main.cpp Mon Jun 20 10:19:27 2016 +0000
+++ b/main.cpp Mon Jun 20 14:46:19 2016 +0000
@@ -19,7 +19,7 @@
p24, p27, p28, p29, p25, p26
);
TextLCD lcd(
- p19, p20, p21, p22, p23, p24
+ p19, p20, p11, p12, p13, p14
);
char buffer[128];
char program_name[128] = "G3: WATERPLAY";
@@ -69,6 +69,6 @@
while(keep_running) {
waterplay.control();
- keep_running = 0;
+ //keep_running = 0;
}
}
\ No newline at end of file
