From a6e1d041803e33f4b9a96489f120112ea09500a8 Mon Sep 17 00:00:00 2001 From: Glyn Hudson Date: Wed, 12 Oct 2016 20:35:45 +0100 Subject: [PATCH] fix lib deps --- firmware/platformio.ini | 24 +++++------------------- firmware/src/src.ino | 2 +- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/firmware/platformio.ini b/firmware/platformio.ini index ab39217..3787986 100644 --- a/firmware/platformio.ini +++ b/firmware/platformio.ini @@ -21,10 +21,13 @@ env_default = emonth2 [common] +# http://docs.platformio.org/en/stable/projectconf.html#lib-deps lib_deps_external = DallasTemperature @3.7.7 JeeLib @c057b5f4c0 - SI7021 @c5ce0922ef + Si7021 @c5ce0922ef + +build_flags = -D BUILD_TAG=3.0.0 [env:emonth2] platform = atmelavr @@ -42,24 +45,7 @@ lib_deps = ${common.lib_deps_external} upload_protocol = stk500v2 upload_flags = -Pusb - - -[common] -build_flags = -D BUILD_TAG=2.5.0 - -# http://docs.platformio.org/en/stable/projectconf.html#lib-deps -lib_deps_external = - DallasTemperature @3.7.7 - EmonLib - JeeLib@c057b5f4c0 - -[env:emontx] -platform = atmelavr -framework = arduino -board = uno -build_flags = ${common.build_flags} - -[env:emontx_deploy] +[env:emonth2_deploy] platform = atmelavr framework = arduino board = uno diff --git a/firmware/src/src.ino b/firmware/src/src.ino index 60371ba..f0da5a6 100644 --- a/firmware/src/src.ino +++ b/firmware/src/src.ino @@ -102,7 +102,7 @@ const byte pulse_countINT= 1; // INT 1 / const byte pulse_count_pin=3; // INT 1 / Dig 3 Screw Terminal Block Number 4 on emonTH V1.5 - Change to INT0 DIG2 on emonTH V1.4 #define ONE_WIRE_BUS 17 // D19 emonTH V1.5 const byte DHT22_PWR= 6; // Not used in emonTH V2.0, 10K resistor R1 connects DHT22 pins -const byte DHT22_DATA= 16; // Not used in emonTH V2.0, 10K resistor R1 connects DHT22 pins. +const byte DHT22_DATA= 16; // Not used in emonTH V2.0, 10K resistor R1 connects DHT22 pins. OneWire oneWire(ONE_WIRE_BUS); DallasTemperature sensors(&oneWire);