diff --git a/src/custom/my_custom_fan_template.cpp b/src/custom/my_custom_fan_template.cpp index a8775242..5de68952 100644 --- a/src/custom/my_custom_fan_template.cpp +++ b/src/custom/my_custom_fan_template.cpp @@ -13,7 +13,7 @@ #include "hasplib.h" -#if defined(HASP_USE_CUSTOM) && false // <-- set this to true in your code +#if defined(HASP_USE_CUSTOM) && HASP_USE_CUSTOM > 0 && false // <-- set this to true in your code #include "hasp_debug.h" diff --git a/src/custom/my_custom_template.cpp b/src/custom/my_custom_template.cpp index 358bbd0f..e32ea4f6 100644 --- a/src/custom/my_custom_template.cpp +++ b/src/custom/my_custom_template.cpp @@ -6,7 +6,7 @@ #include "hasplib.h" -#if defined(HASP_USE_CUSTOM) && false // <-- set this to true in your code +#if defined(HASP_USE_CUSTOM) && HASP_USE_CUSTOM > 0 && false // <-- set this to true in your code #include "hasp_debug.h" diff --git a/src/custom/my_custom_template.h b/src/custom/my_custom_template.h index 3e25c031..5f156e85 100644 --- a/src/custom/my_custom_template.h +++ b/src/custom/my_custom_template.h @@ -9,7 +9,7 @@ #define HASP_CUSTOM_H #include "hasplib.h" -#if defined(HASP_USE_CUSTOM) +#if defined(HASP_USE_CUSTOM) && HASP_USE_CUSTOM > 0 /* This function is called at boot */ void custom_setup(); diff --git a/src/hasp/hasp_dispatch.cpp b/src/hasp/hasp_dispatch.cpp index 33cffc77..c8988f85 100644 --- a/src/hasp/hasp_dispatch.cpp +++ b/src/hasp/hasp_dispatch.cpp @@ -452,7 +452,7 @@ void dispatch_topic_payload(const char* topic, const char* payload, bool update, } #endif -#if defined(HASP_USE_CUSTOM) +#if defined(HASP_USE_CUSTOM) && HASP_USE_CUSTOM > 0 if(topic == strstr_P(topic, PSTR(MQTT_TOPIC_CUSTOM "/"))) { // startsWith custom topic += 7u; custom_topic_payload(topic, (char*)payload, source); @@ -1295,7 +1295,7 @@ void dispatch_send_sensordata(const char*, const char*, uint8_t source) haspDevice.get_sensors(doc); -#if defined(HASP_USE_CUSTOM) +#if defined(HASP_USE_CUSTOM) && HASP_USE_CUSTOM > 0 custom_get_sensors(doc); #endif diff --git a/src/hasp/hasp_task.cpp b/src/hasp/hasp_task.cpp index 272285d7..09650380 100644 --- a/src/hasp/hasp_task.cpp +++ b/src/hasp/hasp_task.cpp @@ -32,7 +32,7 @@ void task_every_second_cb(lv_task_t* task) telnetEverySecond(); #endif -#if defined(HASP_USE_CUSTOM) +#if defined(HASP_USE_CUSTOM) && HASP_USE_CUSTOM > 0 custom_every_second(); #endif // debugEverySecond(); @@ -53,7 +53,7 @@ void task_every_second_cb(lv_task_t* task) break; case 3: -#if defined(HASP_USE_CUSTOM) +#if defined(HASP_USE_CUSTOM) && HASP_USE_CUSTOM > 0 custom_every_5seconds(); #endif break; diff --git a/src/hasplib.h b/src/hasplib.h index d4b578ad..0c621f12 100644 --- a/src/hasplib.h +++ b/src/hasplib.h @@ -70,6 +70,6 @@ #endif #endif -#if defined(HASP_USE_CUSTOM) +#if defined(HASP_USE_CUSTOM) && HASP_USE_CUSTOM > 0 #include "custom/my_custom.h" #endif \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index c68c2bf4..4d428db4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -136,7 +136,7 @@ void setup() slaveSetup(); #endif -#if defined(HASP_USE_CUSTOM) +#if defined(HASP_USE_CUSTOM) && HASP_USE_CUSTOM > 0 custom_setup(); #endif @@ -195,7 +195,7 @@ IRAM_ATTR void loop() consoleLoop(); #endif -#if defined(HASP_USE_CUSTOM) +#if defined(HASP_USE_CUSTOM) && HASP_USE_CUSTOM > 0 custom_loop(); #endif @@ -222,7 +222,7 @@ IRAM_ATTR void loop() telnetEverySecond(); #endif -#if defined(HASP_USE_CUSTOM) +#if defined(HASP_USE_CUSTOM) && HASP_USE_CUSTOM > 0 custom_every_second(); #endif // debugEverySecond(); @@ -243,7 +243,7 @@ IRAM_ATTR void loop() // gpioEvery5Seconds(); #endif -#if defined(HASP_USE_CUSTOM) +#if defined(HASP_USE_CUSTOM) && HASP_USE_CUSTOM > 0 custom_every_5seconds(); #endif break; diff --git a/src/mqtt/hasp_mqtt_esp.cpp b/src/mqtt/hasp_mqtt_esp.cpp index f19f3c5d..7d076d15 100644 --- a/src/mqtt/hasp_mqtt_esp.cpp +++ b/src/mqtt/hasp_mqtt_esp.cpp @@ -371,7 +371,7 @@ void onMqttConnect(esp_mqtt_client_handle_t client) // mqttSubscribeTo(mqttGroupTopic + subtopic); // mqttSubscribeTo(mqttNodeTopic + subtopic); -#if defined(HASP_USE_CUSTOM) +#if defined(HASP_USE_CUSTOM) && HASP_USE_CUSTOM > 0 String subtopic = F(MQTT_TOPIC_CUSTOM "/#"); mqttSubscribeTo(mqttGroupCommandTopic + subtopic); mqttSubscribeTo(mqttNodeCommandTopic + subtopic); diff --git a/src/mqtt/hasp_mqtt_paho_async.cpp b/src/mqtt/hasp_mqtt_paho_async.cpp index a75bb699..176d6bc4 100644 --- a/src/mqtt/hasp_mqtt_paho_async.cpp +++ b/src/mqtt/hasp_mqtt_paho_async.cpp @@ -328,7 +328,7 @@ static void onConnect(void* context, MQTTAsync_successData* response) topic = mqttNodeTopic + "config/#"; mqtt_subscribe(mqtt_client, topic.c_str()); -#if defined(HASP_USE_CUSTOM) +#if defined(HASP_USE_CUSTOM) && HASP_USE_CUSTOM > 0 topic = mqttGroupTopic + MQTT_TOPIC_CUSTOM "/#"; mqtt_subscribe(mqtt_client, topic.c_str()); diff --git a/src/mqtt/hasp_mqtt_paho_single.cpp b/src/mqtt/hasp_mqtt_paho_single.cpp index 2d1565b3..010320d7 100644 --- a/src/mqtt/hasp_mqtt_paho_single.cpp +++ b/src/mqtt/hasp_mqtt_paho_single.cpp @@ -269,7 +269,7 @@ static void onConnect(void* context) topic = mqttNodeTopic + "config/#"; mqtt_subscribe(mqtt_client, topic.c_str()); -#if defined(HASP_USE_CUSTOM) +#if defined(HASP_USE_CUSTOM) && HASP_USE_CUSTOM > 0 topic = mqttGroupTopic + MQTT_TOPIC_CUSTOM "/#"; mqtt_subscribe(mqtt_client, topic.c_str()); diff --git a/src/mqtt/hasp_mqtt_pubsubclient.cpp b/src/mqtt/hasp_mqtt_pubsubclient.cpp index 84e2a2b5..e72e468f 100644 --- a/src/mqtt/hasp_mqtt_pubsubclient.cpp +++ b/src/mqtt/hasp_mqtt_pubsubclient.cpp @@ -311,7 +311,7 @@ void mqttStart() snprintf_P(topic, sizeof(topic), PSTR("%s" MQTT_TOPIC_CONFIG "/#"), mqttNodeTopic); mqttSubscribeTo(topic); -#if defined(HASP_USE_CUSTOM) +#if defined(HASP_USE_CUSTOM) && HASP_USE_CUSTOM > 0 snprintf_P(topic, sizeof(topic), PSTR("%s" MQTT_TOPIC_CUSTOM "/#"), mqttGroupTopic); mqttSubscribeTo(topic); snprintf_P(topic, sizeof(topic), PSTR("%s" MQTT_TOPIC_CUSTOM "/#"), mqttNodeTopic); diff --git a/src/sys/gpio/hasp_gpio.cpp b/src/sys/gpio/hasp_gpio.cpp index 52b60a96..ec083dcd 100644 --- a/src/sys/gpio/hasp_gpio.cpp +++ b/src/sys/gpio/hasp_gpio.cpp @@ -776,7 +776,7 @@ bool gpioIsSystemPin(uint8_t gpio) return true; } -#if defined(HASP_USE_CUSTOM) +#if defined(HASP_USE_CUSTOM) && HASP_USE_CUSTOM > 0 if(custom_pin_in_use(gpio)) { LOG_DEBUG(TAG_GPIO, F(D_BULLET D_GPIO_PIN " %d => Custom"), gpio); return true;