DHT-usage switchable, MQTT authentication optional, soil-sensor-parameter moved to config-file
This commit is contained in:
@@ -7,5 +7,12 @@
|
||||
const char *MQTT_BROKER = "192.168.178.74";
|
||||
const char *MQTT_SENSOR_TOPIC = "living/sensor2";
|
||||
const char *MQTT_CLIENT_ID = "living_mobile_sensor";
|
||||
const char *MQTT_LAST_WILL_TOPIC = "living/sensor2/status";
|
||||
const char *MQTT_LAST_WILL_MSG = "offline";
|
||||
const char *MQTT_CLIENT_USER = "NULL"; // if NULL, no username or password is used
|
||||
const char *MQTT_CLIENT_PW = "NULL"; // if NULL, no password is used
|
||||
|
||||
const int AirValue = 800; //replace the value with value when placed in air
|
||||
const int WaterValue = 345; //replace the value with value when placed in water
|
||||
|
||||
#endif
|
||||
@@ -36,9 +36,8 @@ uint8_t rh_buf[RH_BUF_LEN];
|
||||
* */
|
||||
#include "config.h"
|
||||
|
||||
|
||||
const int AirValue = 800; //replace the value with value when placed in air
|
||||
const int WaterValue = 345; //replace the value with value when placed in water
|
||||
// const int AirValue = 800; //replace the value with value when placed in air
|
||||
// const int WaterValue = 345; //replace the value with value when placed in water
|
||||
|
||||
volatile boolean new_value = false;
|
||||
|
||||
@@ -55,6 +54,7 @@ RH_ASK driver(RH_SPEED, RH_RX_PIN);
|
||||
#define MSG_BAT 0x20
|
||||
#define MSG_TEMPHUM 0x30
|
||||
#define MSG_ERR 0x40
|
||||
#define MSG_HUM 0x50
|
||||
|
||||
char buff[20];
|
||||
|
||||
@@ -170,6 +170,14 @@ void loop()
|
||||
Serial.println(SoilHumidity);
|
||||
new_value = true;
|
||||
break;
|
||||
case MSG_HUM:
|
||||
Serial.println("Soil Humidity");
|
||||
memcpy(&soil, &rh_buf[1], 2);
|
||||
Serial.println(soil);
|
||||
SoilHumidity = (float)(map(soil, AirValue, WaterValue, 0, 100));
|
||||
Serial.println(SoilHumidity);
|
||||
new_value = true;
|
||||
break;
|
||||
case MSG_BAT:
|
||||
// battery data
|
||||
digitalWrite(LED_BUILTIN, LOW);
|
||||
@@ -215,7 +223,9 @@ void reconnect()
|
||||
{
|
||||
Serial.println("INFO: Attempting MQTT connection...");
|
||||
// Attempt to connect
|
||||
if (mqttClient.connect(MQTT_CLIENT_ID))
|
||||
|
||||
// Should work without authentication, if credentials are NULL
|
||||
if (mqttClient.connect(MQTT_CLIENT_ID, MQTT_CLIENT_USER, MQTT_CLIENT_PW))
|
||||
{
|
||||
Serial.println("INFO: connected");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user