diff --git a/brew.h b/brew.h index e713e075e37f90fd9970efa6d2528810fd09bd0e..cd7448801a0c7f6b4b2f49f00c0682df0b116798 100644 --- a/brew.h +++ b/brew.h @@ -14,7 +14,7 @@ #define NELEMS(x) (sizeof(x) / sizeof((x)[0])) // ++++++++++++++++++++++++ Cooking Variables ++++++++++++++++++++++++ -#define COOKING_MAX_OVER_TEMPERATURE_RANGE_ALLOWED 5.0 +#define COOKING_MAX_OVER_TEMPERATURE_RANGE_ALLOWED 2.0 // ++++++++++++++++++++++++ OTHER +++++++++++++++++++++++++++++++++ #include "CustomDataStructures.h" diff --git a/brew.ino b/brew.ino index b1e652a51d194a19eb0c0997582aaff8c09083e1..4132d4977461dc17a2dabb387921f0829d83bbb3 100644 --- a/brew.ino +++ b/brew.ino @@ -113,18 +113,20 @@ Temperature basePT100("base", PT100_BASE_OUTPUT_PIN, PT100_BASE_INPUT_PIN, PT100_BASE_TIME_BETWEEN_READINGS, - 2.0298, 2.0259, 665.24, 662.17); + //2.0298, 2.0259, 665.24, 662.17); // orig + 2.0208, 2.0281, 663.52, 665.49); Temperature upPT100("up", PT100_UP_OUTPUT_PIN, PT100_UP_INPUT_PIN, PT100_UP_TIME_BETWEEN_READINGS, - 2.0274, 2.0245, 659.43, 656.72); + //2.0274, 2.0245, 659.43, 656.72); // orig + 2.0279, 2.0264, 656.57, 659); Temperature downPT100("down", PT100_DOWN_OUTPUT_PIN, PT100_DOWN_INPUT_PIN, PT100_DOWN_TIME_BETWEEN_READINGS, - //2.0309, 2.0288, 658.15, 655.35); - 2.0309, 2.0288, 656.15, 655.35); + //2.0309, 2.0288, 659.15, 655.35); // orig + 2.0157, 2.0428, 662.11, 662.85); // ######################### INTERRUPTS ######################### void isr () { // Interrupt service routine is executed when a HIGH to LOW transition is detected on CLK diff --git a/src/Temperature/Temperature.cpp b/src/Temperature/Temperature.cpp index b75d26455adec4f70f0c54b79fe5c84583099729..d2f0861395e0c5ae71751380cee1b543a9003380 100644 --- a/src/Temperature/Temperature.cpp +++ b/src/Temperature/Temperature.cpp @@ -70,8 +70,10 @@ void Temperature::measure(boolean ln) { #ifdef DEBUG Serial.print(_name); Serial.print(","); - //Serial.print(_VoutAnalogSample); - //Serial.print(workingSample); + Serial.print(_VoutAnalogSample); + Serial.print(","); + Serial.print(workingSample); + Serial.print(","); Serial.print(_measuredTemperature); //Serial.print(GetMedianAverage(_rTemperatureMeasurements, 6)); Serial.print(","); diff --git a/src/Temperature/Temperature.h b/src/Temperature/Temperature.h index 71377790a681ddc6466f01c74eca7bf4b1fcde1c..8bb7fdddd688079ce88aab9830db6b20bd37be27 100644 --- a/src/Temperature/Temperature.h +++ b/src/Temperature/Temperature.h @@ -8,7 +8,7 @@ #include "Arduino.h" -//#define DEBUG +#define DEBUG #define CONSTANT_ADC_STEP_COUNT 1024.0