btclock/btclock_v3
3
1
Fork 2
Code Issues Pull requests 1 Projects Releases 14 Wiki Activity Actions

exclude light sensor calls on unsupported devices

Browse source 
add mqtt default host define
This commit is contained in:
Sander 2024-12-06 11:08:55 +01:00
parent adf6b38bfb
commit ee81edbcd2
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/lib/defaults.hpp
View file

@ -57,6 +57,7 @@
#define DEFAULT_BITAXE_HOSTNAME "bitaxe1" #define DEFAULT_BITAXE_HOSTNAME "bitaxe1"
#define DEFAULT_MQTT_ENABLED false #define DEFAULT_MQTT_ENABLED false
#define DEFAULT_MQTT_HOST ""
#define DEFAULT_MQTT_ROOTTOPIC "home/" #define DEFAULT_MQTT_ROOTTOPIC "home/"
#define DEFAULT_ZAP_NOTIFY_ENABLED false #define DEFAULT_ZAP_NOTIFY_ENABLED false

6
src/lib/mqtt.cpp
View file

@ -6,8 +6,10 @@ WiFiClient wifiClient;
PubSubClient client(wifiClient); PubSubClient client(wifiClient);
// avoid circular deps, just forward declare externs used here. // avoid circular deps, just forward declare externs used here.
#ifdef HAS_FRONTLIGHT
bool hasLightLevel(); bool hasLightLevel();
float getLightLevel(); float getLightLevel();
#endif
String getMyHostname(); String getMyHostname();
void onMqttCallback(char* topic, byte* payload, unsigned int length) void onMqttCallback(char* topic, byte* payload, unsigned int length)
@ -43,7 +45,7 @@ boolean connectMqtt()
void setupMqtt() void setupMqtt()
{ {
const String host = preferences.getString("mqttHost", ""); const String host = preferences.getString("mqttHost", DEFAULT_MQTT_HOST);
if (host == "") if (host == "")
{ {
Serial.println("[MQTT] host not set"); Serial.println("[MQTT] host not set");
@ -80,11 +82,13 @@ void mqttTask(void *pvParameters)
continue; continue;
} }
#ifdef HAS_FRONTLIGHT
if (hasLightLevel()) if (hasLightLevel())
{ {
std::string lux_s = std::to_string(static_cast<int>(std::round(getLightLevel()))); std::string lux_s = std::to_string(static_cast<int>(std::round(getLightLevel())));
publish("sensors/lux", lux_s.c_str()); publish("sensors/lux", lux_s.c_str());
} }
#endif
if (WiFi.isConnected()) if (WiFi.isConnected())
{ {
int8_t rssi = WiFi.RSSI(); int8_t rssi = WiFi.RSSI();