From 317899fe435562b4aae4d81752cf2c5075243e09 Mon Sep 17 00:00:00 2001 From: hg Date: Sat, 8 Mar 2014 19:36:00 +0100 Subject: [PATCH] meterBus and nearly everything disabled, still not working --- ThermometerPro.cpp | 29 ++++++++++--------- ...sClient.cpp => meterBusClient.cpp-disabled | 0 meterBusClient.h => meterBusClient.h-disabled | 0 3 files changed, 16 insertions(+), 13 deletions(-) rename meterBusClient.cpp => meterBusClient.cpp-disabled (100%) rename meterBusClient.h => meterBusClient.h-disabled (100%) diff --git a/ThermometerPro.cpp b/ThermometerPro.cpp index 6c2a384..c2c70b3 100644 --- a/ThermometerPro.cpp +++ b/ThermometerPro.cpp @@ -10,33 +10,36 @@ #define ENABLE_CONFIGURATION_INVALID_CMD 1 -static CmdServer cmdServer(&Serial); +//static CmdServer cmdServer(&Serial); #ifdef ENABLE_CONFIGURATION_INVALID_CMD - static ConfigInvalidateCmd configInvalidateCmd; +// static ConfigInvalidateCmd configInvalidateCmd; #endif -static Uptime uptime; -static Thermometer thermometer; +//static Uptime uptime; +//static Thermometer thermometer; void setup() { Serial.begin(9600); - Config::initialize(); + //Config::initialize(); - spiInit(); + //spiInit(); - cmdServer.begin(); + //cmdServer.begin(); #ifdef ENABLE_CONFIGURATION_INVALID_CMD - configInvalidateCmd.registerYourself(&cmdServer); + //configInvalidateCmd.registerYourself(&cmdServer); #endif - uptime.begin(&cmdServer); - thermometer.begin(&cmdServer); + //uptime.begin(&cmdServer); + //thermometer.begin(&cmdServer); } void loop() { - cmdServer.exec(); - uptime.exec(); - thermometer.exec(); + //cmdServer.exec(); + //uptime.exec(); + //thermometer.exec(); + + Serial.println("Tick"); + delay(1000); } diff --git a/meterBusClient.cpp b/meterBusClient.cpp-disabled similarity index 100% rename from meterBusClient.cpp rename to meterBusClient.cpp-disabled diff --git a/meterBusClient.h b/meterBusClient.h-disabled similarity index 100% rename from meterBusClient.h rename to meterBusClient.h-disabled