diff --git a/lambda/Makefile b/lambda/Makefile index d3350b2..677df4a 100644 --- a/lambda/Makefile +++ b/lambda/Makefile @@ -28,7 +28,7 @@ PROGRAMMER_TYPE = avrisp # extra arguments to avrdude: baud rate, chip type, -F flag, etc. -PROGRAMMER_ARGS = -b 19200 -P /dev/ttyACM0 +PROGRAMMER_ARGS = -b 19200 -P /dev/ttyACM3 ##########------------------------------------------------------########## ########## Makefile Magic! ########## diff --git a/lambda/sensors.c b/lambda/sensors.c index dc1f18a..71a8bbb 100644 --- a/lambda/sensors.c +++ b/lambda/sensors.c @@ -86,7 +86,7 @@ */ void measure(void) { int16_t tempIVoltage = getVoltage(PC5); - tempIVoltageAvg = average(tempIVoltage, tempIVoltageAvg, 4); + tempIVoltageAvg = average(tempIVoltage, tempIVoltageAvg, 8); int16_t tempOVoltage = getVoltage(PC0); tempOVoltageAvg = average(tempOVoltage, tempOVoltageAvg, 4); @@ -95,6 +95,14 @@ int16_t lambdaVoltage = divRoundNearest(getVoltage(PC2), 11); lambdaVoltageAvg = average(lambdaVoltage, lambdaVoltageAvg, 4); + // TODO just for testing, remove at some point + char log[64]; + snprintf(log, sizeof(log), "Direct: Ti %3d C %4d - To %3d C %4d - L %4d\r\n", + toTempI(tempIVoltage), tempIVoltage, + toTempO(tempOVoltage), tempOVoltage, + lambdaVoltage); + printString(log); + int16_t tempI = toTempI(tempIVoltageAvg); int16_t tempO = toTempO(tempOVoltageAvg); int16_t lambda = toLambda(lambdaVoltageAvg); @@ -111,7 +119,7 @@ div_t lambdaT = div(lambda, 1000); char log[64]; - snprintf(log, sizeof(log), "Ti %3d C %d - To %3d C %d - L %d.%03d %d\r\n", + snprintf(log, sizeof(log), "Averag: Ti %3d C %4d - To %3d C %4d - L %d.%03d %4d\r\n", tempI, tempIVoltage, tempO, tempOVoltage, lambdaT.quot, abs(lambdaT.rem), lambdaVoltage); printString(log);