diff options
| -rw-r--r-- | pcr-controller/pcr-controller.c | 31 | ||||
| -rw-r--r-- | pcr-controller/pid_control.c | 2 | ||||
| -rw-r--r-- | pcr-controller/protocol_uc.txt | 50 | ||||
| -rw-r--r-- | pcr-controller/temp_curve.c | 31 | ||||
| -rw-r--r-- | pcr-controller/temp_curve.h | 3 |
5 files changed, 96 insertions, 21 deletions
diff --git a/pcr-controller/pcr-controller.c b/pcr-controller/pcr-controller.c index 46d48ae..95a3c19 100644 --- a/pcr-controller/pcr-controller.c +++ b/pcr-controller/pcr-controller.c @@ -129,20 +129,24 @@ void printRawTemp(int16_t raw_temp) printf("%d.%02d", raw_temp / 16, decimals); } -void printTemperature(void) +void printStatus(void) { if (num_temp_sensors_ == 0) { - printf("ERROR: No DS1820 sensors on 1wire bus, thus no temperature\r\n"); + printf("{\"cmd_ok\":false,\"error\": \"No DS1820 sensors on 1wire bus, thus no temperature\"}\r\n"); return; } if (raw_temp_ == DS1820_ERROR) { - printf("ERROR talking to DS18b20, no valid temperature!\r\n"); + printf("{\"cmd_ok\":false,\"error\":\"talking to DS18b20, no valid temperature!\"}\r\n"); } else { - printf("Temp: "); + printf("{\"t\":%lu, \"currtemp\":", system_clk_); printRawTemp(raw_temp_); - printf("\r\n"); + printf(", \"targettemp\":"); + printRawTemp(pid_getTargetValue()); + printf(", \"curve\":%s", (tcurve_isSet()?"true":"false")); + printf(", \"curve_t_elapsed\":%u", tcurve_getTimeElapsed()); + printf(", \"cycles_left\":%u}\r\n", tcurve_getRepeatsLeft()); } } @@ -203,14 +207,10 @@ void handle_cmd(uint8_t cmd) case 'm': monitor_temp_ = ~monitor_temp_; break; case '=': pid_setTargetValue(raw_temp_); break; case '#': pid_setTargetValue(PID_DISABLED); break; - case 's': printTemperature(); return; + case 't': + case 's': printStatus(); return; case 'L': led_toggle(); break; case 'l': cmdq_queueCmdWithNumArgs(led_toggle, 0); break; - case 't': - printf("TargetTemp: "); - printRawTemp(pid_getTargetValue()); - printf("\r\n"); - return; case 'p': case 'i': case 'd': @@ -232,9 +232,10 @@ void handle_cmd(uint8_t cmd) cmdq_queueCmdWithNumArgs(tcurve_add, 2); break; case 'Z': cmdq_queueCmdWithNumArgs(tcurve_setRepeats, 1); break; - default: printf("ERROR\r\n"); return; + case 'E': cmdq_queueCmdWithNumArgs(tcurve_setPostCycleTargetTemp, 1); break; + default: printf("{\"cmd_ok\":false,\"error\":\"unknown cmd\"}\r\n"); return; } - printf("OK\r\n"); + printf("{\"cmd_ok\":true}\r\n"); } int main(void) @@ -288,7 +289,7 @@ int main(void) queryAndSaveTemperature(11); //at 11bit resolution, this takes at least 390ms if (monitor_temp_) - printTemperature(); + printStatus(); if (tcurve_isSet()) { @@ -298,7 +299,7 @@ int main(void) pid_setTargetValue(tcurve_getTempToSet(raw_temp_, time_elapsed)); if (debug_) { - printf("time: %lu, elapsed: %u, target_temp: %d\r\n", system_clk_, time_elapsed, pid_getTargetValue()); + printf("t: %lu, elapsed: %u, target_temp: %d\r\n", system_clk_, time_elapsed, pid_getTargetValue()); } } diff --git a/pcr-controller/pid_control.c b/pcr-controller/pid_control.c index 18b2bc6..f1d7d3f 100644 --- a/pcr-controller/pid_control.c +++ b/pcr-controller/pid_control.c @@ -61,7 +61,7 @@ void pid_setD(int16_t d) void pid_printVars(void) { - printf("PID P: %d /%d\r\nPID I: %d /%d\r\nPID D: %d /%d\r\n", (int16_t) (pid_p_), (int16_t) PID_SCALE, (int16_t) (pid_i_), (int16_t) PID_SCALE, (int16_t) (pid_d_), (int16_t) PID_SCALE); + printf("{\"PID_P\":%d, \"PID_I\":%d, \"PID_D\":%d, \"PID_SCALE\":%d}\r\n", (int16_t) (pid_p_), (int16_t) (pid_i_), (int16_t) (pid_d_), (int16_t) PID_SCALE); } void pid_setTargetValue(int16_t v) diff --git a/pcr-controller/protocol_uc.txt b/pcr-controller/protocol_uc.txt index 2ecfe0b..68c4c90 100644 --- a/pcr-controller/protocol_uc.txt +++ b/pcr-controller/protocol_uc.txt @@ -15,10 +15,58 @@ Command bytes: 'L' Toggle LED (Debug) 'l' Toggle LED by using queuing system (Debug) 'R' Reset (Alle Register zurücksetzen und neu initialisieren) +'=' Halte aktuelle Temperatur (PID Ziel gleich aktuelle Temp messen) '-' Lösche gesetzte Temperaturkurve '+' Füge einen Punkt zur Temperaturkurve hinzu. erwartet Zieltemperatur und zeit (in10tel sekunden) für wie lange die temperatur gehalten werden soll bevor zur nächsten gesprungen wird. <- string(int(float(temp)*16)) \n <- string(int(seconds*10)) \n 'Z' setzte Anzahl Zyklen in denen die Temperaturkurve wiederholt wird (0 == default == keine Wiederholung == 1 Zyklus, 1 == 1 Wiederholung == 2 Zyklen) <- string(int(repeats)) +'E' Temperatursoll das nach Ende des Temperaturkurvenzyklus gesetzt werden soll <- string (int(float(temp)*16)) 'm' Schalte ständige Ausgabe der aktuellen Temperatur ein/aus Nach jedem Setz-Command: Bestätigung mit "OK\r\n" (oder so) -' + + + +Das folgende Beispiel +fragt die Temperatur ab, +löscht eine evtl gesetzte Temperaturkurve +Hält für's Erste die aktuelle Temperatur +Schaltet die Pumpe ein +Programmiert eine Kurve von 95°C (15min) -> 65°C (1s) -> 60°C (30s) -> 70°C (30s) +Wiederholt die Kurve 30 mal +Kühlt die Proben nach dem Ende auf 5°C +Gibt periodisch die aktuelle Temperatur aus. + +Example PCR: +s +- += +A +b ++ +1520 +9000 ++ +1040 +10 ++ +960 +300 ++ +1120 +300 +Z +30 +E +80 +m + + +Example uc Answers: +{"cmd_ok":false,"error": "No DS1820 sensors on 1wire bus, thus no temperature"} +{"cmd_ok":false,"error":"talking to DS18b20, no valid temperature!"} +{"cmd_ok":true} +{"t":503, "currtemp":20.34, "targettemp":-2048.00, "curve":false, "curve_t_elapsed":0, "cycles_left":0} //curve and pid disabled (pid disabel when targettemp == -2048.00 +{"t":97000, "currtemp":40.34, "targettemp":70.00, "curve":true, "curve_t_elapsed":14, "cycles_left":11} +{"t":97200, "currtemp":69.72, "targettemp":70.00, "curve":true, "curve_t_elapsed":214, "cycles_left":11} +{"t":110123, "currtemp":30.14, "targettemp":30.00, "curve":true, "curve_t_elapsed":10, "cycles_left":9} +{"t":9999999, "currtemp":5.02, "targettemp":5.00, "curve":true, "curve_t_elapsed":65535, "cycles_left":0} //we know all is finished because targettemp is hold-temp diff --git a/pcr-controller/temp_curve.c b/pcr-controller/temp_curve.c index 641f57c..534ddfa 100644 --- a/pcr-controller/temp_curve.c +++ b/pcr-controller/temp_curve.c @@ -37,6 +37,8 @@ tc_entry *temp_curve_current_ = 0; uint16_t temp_stable_time_ = 0; uint8_t curve_num_repeats_ = 0; +uint8_t temp_curve_finished_ = 0; +int16_t post_cycle_target_temp_ = TCURVE_ERROR; void tcurve_reset(void) { @@ -51,11 +53,22 @@ void tcurve_reset(void) temp_curve_end_ = 0; temp_curve_current_ = 0; curve_num_repeats_ = 0; + temp_curve_finished_ = 0; } uint8_t tcurve_hasFinished(void) { - return temp_curve_current_ == temp_curve_end_ && curve_num_repeats_ == 0; + return temp_curve_finished_; +} + +uint16_t tcurve_getTimeElapsed(void) +{ + return temp_stable_time_; +} + +uint8_t tcurve_getRepeatsLeft(void) +{ + return curve_num_repeats_; } uint8_t tcurve_isSet(void) @@ -66,6 +79,12 @@ uint8_t tcurve_isSet(void) void tcurve_setRepeats(uint8_t r) { curve_num_repeats_ = r; + temp_curve_finished_ = 0; +} + +void tcurve_setPostCycleTargetTemp(int16_t v) +{ + post_cycle_target_temp_ = v; } void tcurve_add(int16_t temp, uint16_t hold_for_ticks) @@ -91,6 +110,9 @@ int16_t tcurve_getTempToSet(int16_t current_temp, uint16_t ticks_elapsed) if (temp_curve_current_ == 0) return TCURVE_ERROR; + if (temp_curve_finished_ && post_cycle_target_temp_ != TCURVE_ERROR) + return post_cycle_target_temp_; + if (current_temp > temp_curve_current_->target_temp - temp_margin_ && current_temp < temp_curve_current_->target_temp + temp_margin_) { temp_stable_time_ += ticks_elapsed; @@ -98,19 +120,20 @@ int16_t tcurve_getTempToSet(int16_t current_temp, uint16_t ticks_elapsed) // if time has been stable for long enough, advance to next // if there is no next, repeat curve until curve_num_repeats_ == 0 - // once that happens, hold current temp forever + // once that happens, set to post_cycle_target_temp_ or hold last value if (temp_stable_time_ >= temp_curve_current_->hold_for_timeticks) { + temp_stable_time_ = 0; if (temp_curve_current_->next != 0) { temp_curve_current_ = temp_curve_current_->next; - temp_stable_time_ = 0; } else if (curve_num_repeats_) { //restart temp curve from the beginning temp_curve_current_ = temp_curve_; curve_num_repeats_--; - } + } else + temp_curve_finished_ = 1; } return temp_curve_current_->target_temp; }
\ No newline at end of file diff --git a/pcr-controller/temp_curve.h b/pcr-controller/temp_curve.h index 39887cb..86d5000 100644 --- a/pcr-controller/temp_curve.h +++ b/pcr-controller/temp_curve.h @@ -29,6 +29,9 @@ void tcurve_reset(void); void tcurve_setRepeats(uint8_t r); uint8_t tcurve_isSet(void); uint8_t tcurve_hasFinished(void); +uint16_t tcurve_getTimeElapsed(void); +uint8_t tcurve_getRepeatsLeft(void); +void tcurve_setPostCycleTargetTemp(int16_t v); void tcurve_add(int16_t temp, uint16_t hold_for_s); int16_t tcurve_getTempToSet(int16_t current_temp, uint16_t time_elapsed); |