smash/esp8266-geigercounter
1
0
Fork 0
forked from github/esp8266-geigercounter
Code Issues Pull requests Projects Releases Wiki Activity

Use constants instead of static strings

Browse source
This commit is contained in:
schinken 2017-03-11 11:39:51 +01:00
parent 3c78d20461
commit 6f2dd1b703
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
esp8266-geigercounter.ino
View file

@ -19,13 +19,12 @@ float lastuSv = 0, currentuSv = 0;
void setup() { void setup() {
WiFi.hostname(WIFI_HOSTNAME);
WiFi.mode(WIFI_STA);
Serial.begin(115200); Serial.begin(115200);
geigerCounterSerial.begin(BAUD_GEIGERCOUNTER); geigerCounterSerial.begin(BAUD_GEIGERCOUNTER);
delay(10); delay(10);
WiFi.hostname(WIFI_HOSTNAME);
WiFi.mode(WIFI_STA);
WiFi.begin(WIFI_SSID, WIFI_PASSWORD); WiFi.begin(WIFI_SSID, WIFI_PASSWORD);
while (WiFi.status() != WL_CONNECTED) { while (WiFi.status() != WL_CONNECTED) {
@ -34,7 +33,7 @@ void setup() {
} }
mqttClient.setClient(wifiClient); mqttClient.setClient(wifiClient);
mqttClient.setServer(mqttHost, 1883); mqttClient.setServer(MQTT_HOST, 1883);
ArduinoOTA.setHostname(WIFI_HOSTNAME); ArduinoOTA.setHostname(WIFI_HOSTNAME);
ArduinoOTA.setPassword(OTA_PASSWORD); ArduinoOTA.setPassword(OTA_PASSWORD);
@ -69,7 +68,7 @@ void updateRadiationValues() {
void connectMqtt() { void connectMqtt() {
while (!mqttClient.connected()) { while (!mqttClient.connected()) {
if (mqttClient.connect("geigercounter", MQTT_TOPIC_LAST_WILL, 1, true, "disconnected")) { if (mqttClient.connect(WIFI_HOSTNAME, MQTT_TOPIC_LAST_WILL, 1, true, "disconnected")) {
mqttClient.publish(MQTT_TOPIC_LAST_WILL, "connected", true); mqttClient.publish(MQTT_TOPIC_LAST_WILL, "connected", true);
} else { } else {
delay(1000); delay(1000);

2
settings.h.example
View file

@ -15,7 +15,7 @@
#define BAUD_GEIGERCOUNTER 9600 #define BAUD_GEIGERCOUNTER 9600
const char* WIFI_HOSTNAME = "ESP-GeigerCounter"; const char* HOSTNAME = "ESP-GeigerCounter";
const char* WIFI_SSID = "----"; const char* WIFI_SSID = "----";
const char* WIFI_PASSWORD = "----"; const char* WIFI_PASSWORD = "----";