Fix OpenHAB discovery (#1153)

* Fix OpenHAB discovery

* Add test for OpenHAB discovery

main/config_mqttDiscovery.h

@@ -118,7 +118,9 @@ void announceDeviceTrigger(bool use_gateway_info,
 
 /*-------------- Auto discovery macros-----------------*/
 // Set the line below to true so as to have autodiscovery working with OpenHAB
-#define OpenHABDiscovery false
+#ifndef OpenHABDiscovery
+#  define OpenHABDiscovery false
+#endif
 
 #if OpenHABDiscovery // OpenHAB autodiscovery value key definition (is defined command is not supported by OpenHAB)
 #  define jsonBatt     "{{ value_json.batt }}"
@@ -190,12 +192,13 @@ void announceDeviceTrigger(bool use_gateway_info,
 #  define jsonTime     "{{ value_json.time | is_defined }}"
 #  define jsonCount    "{{ value_json.count | is_defined }}"
 #  define jsonAlarm    "{{ value_json.alarm | is_defined }}"
-#  define stateClassNone            ""
-#  define stateClassMeasurement     "measurement"
-#  define stateClassTotal           "total"
-#  define stateClassTotalIncreasing "total_increasing"
 #endif
 
+#define stateClassNone            ""
+#define stateClassMeasurement     "measurement"
+#define stateClassTotal           "total"
+#define stateClassTotalIncreasing "total_increasing"
+
 // From https://github.com/home-assistant/core/blob/d7ac4bd65379e11461c7ce0893d3533d8d8b8cbf/homeassistant/const.py#L225
 // List of classes available in Home Assistant
 const char* availableHASSClasses[] = {"battery",

platformio.ini

@@ -76,6 +76,7 @@ extra_configs =
 ;default_envs = uno-fastled
 ;default_envs = atmega-all-test
 ;default_envs = manual-wifi-test
+;default_envs = openhab-test
 ;default_envs = esp32dev-mqtt-fw-test
 ;default_envs = nodemcuv2-mqtt-fw-test
 ;default_envs = nodemcuv2-rs232
@@ -1014,6 +1015,18 @@ build_flags =
   '-DGateway_Name="OpenMQTTGateway_TEST_MANUAL_WIFI"'
 board_build.flash_mode = dout
 
+[env:openhab-test]
+platform = ${com.esp8266_platform}
+board = nodemcuv2
+lib_deps =
+  ${com-esp.lib_deps}
+  ${libraries.wifimanager8266}
+build_flags =
+  ${com-esp.build_flags}
+  '-DOpenHABDiscovery=true'
+  '-DGateway_Name="OpenMQTTGateway_TEST_OPENHAB"'
+board_build.flash_mode = dout
+
 [env:nodemcuv2-mqtt-fw-test]
 platform = ${com.esp8266_platform}
 board = nodemcuv2