diff options
| author | Josh Perfetto <josh@snowrise.com> | 2011-06-22 10:37:37 -0700 |
|---|---|---|
| committer | Josh Perfetto <josh@snowrise.com> | 2011-06-22 10:37:37 -0700 |
| commit | 0efcb4d375d03512a200a25a492047738f86362a (patch) | |
| tree | 808d75bc8cab5d47ffef5b364d9aa75eac87e475 | |
| parent | 67e00774661148f82111f293efe1303ce2e48970 (diff) | |
| download | openpcr-0efcb4d375d03512a200a25a492047738f86362a.tar.gz openpcr-0efcb4d375d03512a200a25a492047738f86362a.zip | |
Remove hard-coded program
| -rw-r--r-- | arduino/OpenPCR/display.cpp | 2 | ||||
| -rw-r--r-- | arduino/OpenPCR/openpcr.pde | 15 |
2 files changed, 8 insertions, 9 deletions
diff --git a/arduino/OpenPCR/display.cpp b/arduino/OpenPCR/display.cpp index 1737d76..a74adf1 100644 --- a/arduino/OpenPCR/display.cpp +++ b/arduino/OpenPCR/display.cpp @@ -28,7 +28,7 @@ const char HEATING_STR[] PROGMEM = "Heating"; const char COOLING_STR[] PROGMEM = "Cooling"; const char LIDWAIT_STR[] PROGMEM = "Heating Lid"; -const char STOPPED_STR[] PROGMEM = "Standing By"; +const char STOPPED_STR[] PROGMEM = "Ready"; const char LID_FORM_STR[] PROGMEM = "Lid: %3d C"; // #define DEBUG_DISPLAY diff --git a/arduino/OpenPCR/openpcr.pde b/arduino/OpenPCR/openpcr.pde index f423a14..da39997 100644 --- a/arduino/OpenPCR/openpcr.pde +++ b/arduino/OpenPCR/openpcr.pde @@ -16,33 +16,32 @@ * the OpenPCR control software. If not, see <http://www.gnu.org/licenses/>. */ -#include "pcr_includes.h" #include <LiquidCrystal.h> - +#include "pcr_includes.h" #include "thermocycler.h" #include "program.h" -#include <Wire.h> Thermocycler* gpThermocycler = NULL; void setup() { gpThermocycler = new Thermocycler(); - //create program +/* + //create test program Cycle* pMaster = new Cycle(1); pMaster->AddComponent(new Step("IDenaturing", 10, 95)); Cycle* pMain = new Cycle(1); pMain->AddComponent(new Step("Denaturing", 10, 95)); -// pMain->AddComponent(new Step("Annealing", 10, 55)); + pMain->AddComponent(new Step("Annealing", 10, 55)); pMain->AddComponent(new Step("Extending", 10, 72)); pMaster->AddComponent(pMain); pMaster->AddComponent(new Step("FExtending", 10, 72)); -// pMaster->AddComponent(new Step("Holding", 0, 50)); + pMaster->AddComponent(new Step("Holding", 0, 50)); gpThermocycler->SetProgram(pMaster, pMain, "Test Name", 110); - delay(1000); - + delay(1000); gpThermocycler->Start(); +*/ } void loop() { |