Improve crash/restart detection, works more reliably and auto-run now…

… works on fast power cycles
xjp13 · Jun 26, 2011 · ff29874 · ff29874
1 parent 2b1d924
commit ff29874
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/arduino/OpenPCR/openpcr.pde b/arduino/OpenPCR/openpcr.pde
@@ -34,7 +34,7 @@ void setup() {
   else
     strcpy(gszRestartDetect, RESTART_DETECTION_STRING);
 
-  gpThermocycler = new Thermocycler(restarted);
+  gpThermocycler = new Thermocycler(!(MCUSR & 1));
 }
 
 void loop() {

diff --git a/arduino/OpenPCR/thermocycler.cpp b/arduino/OpenPCR/thermocycler.cpp
@@ -79,9 +79,9 @@ PROGMEM const unsigned int LID_RESISTANCE_TABLE[] = {
 #define PLATE_PID_INC_D 250
 
 #define PLATE_PID_INC_LOW_THRESHOLD 40
-#define PLATE_PID_INC_LOW_P 2000
-#define PLATE_PID_INC_LOW_I 1000
-#define PLATE_PID_INC_LOW_D 800
+#define PLATE_PID_INC_LOW_P 600
+#define PLATE_PID_INC_LOW_I 200
+#define PLATE_PID_INC_LOW_D 400
 
 #define PLATE_PID_DEC_HIGH_THRESHOLD 70
 #define PLATE_PID_DEC_HIGH_P 800

diff --git a/arduino/OpenPCR/thermocycler.h b/arduino/OpenPCR/thermocycler.h
@@ -64,7 +64,7 @@ class Thermocycler {
   const char* GetProgName() { return iszProgName; }
   Display* GetDisplay() { return ipDisplay; }
   ProgramComponentPool<Cycle, 4>& GetCyclePool() { return iCyclePool; }
-  ProgramComponentPool<Step, 30>& GetStepPool() { return iStepPool; }
+  ProgramComponentPool<Step, 25>& GetStepPool() { return iStepPool; }
 
   boolean Ramping() { return iRamping; }
   int GetPeltierPwm() { return iPeltierPwm; }
@@ -107,7 +107,7 @@ class Thermocycler {
   Display* ipDisplay;
   SerialControl* ipSerialControl;
   ProgramComponentPool<Cycle, 4> iCyclePool;
-  ProgramComponentPool<Step, 30> iStepPool;
+  ProgramComponentPool<Step, 25> iStepPool;
 
   // state
   ProgramState iProgramState;