rename + count topic

Author: pilotak

.gitignore

@@ -1,3 +1,3 @@
 .piolibdeps
 .pioenvs
-EthernetRelayTemp/settings.h
+ethernet_relay_temp/settings.h

.travis.yml

@@ -0,0 +1,20 @@
+language: python
+python:
+ - "2.7"
+
+sudo: false
+cache:
+ directories:
+ - "~/.platformio"
+
+install:
+ - pip install -U platformio
+ - platformio update
+
+script:
+ - platformio run
+
+notifications:
+ email:
+ on_success: change
+ on_failure: change

EthernetRelayTemp/ethernet.h renamed to ethernet_relay_temp/ethernet.h

@@ -14,6 +14,7 @@
 #define MQTT_TOPIC_ANALOG_TEMP MQTT_BASE_TOPIC"/atemp" // will result ie. someName/atemp/* where aterisk is temp index
 #define MQTT_TOPIC_WILL MQTT_BASE_TOPIC"/status"
 #define MQTT_TOPIC_ERROR MQTT_BASE_TOPIC"/err"
+#define MQTT_TOPIC_COUNT MQTT_BASE_TOPIC"/count"
 #define MQTT_STATUS_ON "1"
 #define MQTT_STATUS_OFF "0"
 #define MQTT_RELAY_TOPIC_STATE MQTT_BASE_TOPIC"/relay/0" // will result ie. someName/relay/0
@@ -30,7 +31,7 @@
 #define RELAY_PIN PA0
 #define ONE_WIRE_PIN PB9
 #define ETH_RST_PIN PB0
-#define ANALOG_TEMPS 2
+#define ANALOG_TEMPS 1
 #define TEMPERATURE_PRECISION 11
 const int a_temp_pin[ANALOG_TEMPS] = {PB1, PA1};
 #define RELAY_PIN PA0

EthernetRelayTemp/EthernetRelayTemp.ino renamed to ethernet_relay_temp/ethernet_relay_temp.ino

@@ -18,8 +18,6 @@ const char * hex = "0123456789ABCDEF";
 uint8_t ds12b20_count = 0;
 
 void tempSetup() {
- bool error = false;
-
  for (uint8_t i = 0; i < ANALOG_TEMPS; i++) {
  pinMode(a_temp_pin[i], INPUT_ANALOG);
  aHysteresis[i].set(10);
@@ -37,18 +35,12 @@ void tempSetup() {
 
  ds12b20_count = (ds12b20_count > MAX_DS18B20 ? MAX_DS18B20 : ds12b20_count); // prevent overflow
 
- if (ds12b20_count == 0) {
- #if defined(ENABLE_DEBUG)
- debugPort.println("Sending message: error, no dallas devices");
- #endif
-
- char data[2];
- data[0] = MAX_DS18B20 + '0';
- data[1] = 0;
- sendData(MQTT_TOPIC_ERROR, data, true);
- error = true;
+ char data[2];
+ data[0] = ds12b20_count + '0';
+ data[1] = 0;
+ sendData(MQTT_TOPIC_COUNT, data, true);
 
- } else {
+ if (ds12b20_count != 0) {
  for (uint8_t i = 0; i < ds12b20_count; i++) {
  dHysteresis[i].set(10);
  dHysteresis[i].prev(LONG_MIN);
@@ -67,8 +59,6 @@ void tempSetup() {
  data[1] = i + '0';
  data[2] = 0;
  sendData(MQTT_TOPIC_ERROR, data, true);
- error = true;
-
 
  #if defined(ENABLE_DEBUG)
  debugPort.print("Sending message: Dallas ");
@@ -80,17 +70,6 @@ void tempSetup() {
  iwdg_feed();
  }
  }
-
- if (!error) {
- #if defined(ENABLE_DEBUG)
- debugPort.println("Sending message: no error");
- #endif
-
- char data[2];
- data[0] = ds12b20_count + '0';
- data[1] = 0;
- sendData(MQTT_TOPIC_ERROR, data, true);
- }
 }
 
 void readTemp() {
@@ -113,7 +92,14 @@ void readTemp() {
  debugPort.println(tempC, 3);
  #endif
 
- dHysteresis[i].add(dAverage[i].add(static_cast<int32_t>(tempC * 100)));
+ if (tempC != -127.0) {
+ dHysteresis[i].add(dAverage[i].add(static_cast<int32_t>(tempC * 100)));
+
+ } else {
+ dHysteresis[i].prev(LONG_MIN);
+ dAverage[i].reset();
+ }
+
  iwdg_feed();
  }
 

EthernetRelayTemp/settings.example.h renamed to ethernet_relay_temp/settings.example.h

@@ -1,8 +1,8 @@
 [platformio]
-env_default = mqtt_temp_relay_v1
-src_dir = EthernetRelayTemp
+env_default = ethernet-relay-temp-v1-debug
+src_dir = ethernet_relay_temp
 
-[env:mqtt_temp_relay_v1]
+[env:ethernet-relay-temp-v1-debug]
 platform = ststm32
 board = genericSTM32F103C8
 framework = arduino
@@ -14,3 +14,15 @@ lib_deps =
  DallasTemperature
  PubSubClient
  UIPEthernet
+
+[env:ethernet-relay-temp-v1]
+platform = ststm32
+board = genericSTM32F103C8
+framework = arduino
+upload_protocol = stlink
+lib_deps =
+ MovingAverage
+ https://github.com/pilotak/Hysteresis
+ DallasTemperature
+ PubSubClient
+ UIPEthernet