tvolkmann/smart_garden
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolved unresolved merge conflict xD

Browse Source
This commit is contained in:
Timo Volkmann 2020-07-14 18:23:29 +02:00
parent d5aede9895
commit decdf72f7d
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/header.h
View File

@ -55,13 +55,7 @@
// MQTT // MQTT
#define MQTT_HOST "mqtt.timovolkmann.de" #define MQTT_HOST "mqtt.timovolkmann.de"
#define MQTT_PORT 1883 #define MQTT_PORT 1883
<<<<<<< HEAD
#define MQTT_DEVICE_ID "esp-andy"
||||||| cbf5199
#define MQTT_DEVICE_ID "esp-timo" #define MQTT_DEVICE_ID "esp-timo"
=======
#define MQTT_DEVICE_ID "esp-sebastian"
>>>>>>> 18b5c0bfeceb30e12c570e73ae16fb9bc390c4e1
#define MQTT_TOPIC_BASE_SUB "smartgarden/commands" #define MQTT_TOPIC_BASE_SUB "smartgarden/commands"
#define MQTT_TOPIC_BASE_PUB "smartgarden/updates" #define MQTT_TOPIC_BASE_PUB "smartgarden/updates"
#define MQTT_PATH_PUB MQTT_TOPIC_BASE_PUB "/" MQTT_DEVICE_ID "/" #define MQTT_PATH_PUB MQTT_TOPIC_BASE_PUB "/" MQTT_DEVICE_ID "/"