Skip to content

Commit

Permalink
Add OTA
Browse files Browse the repository at this point in the history
  • Loading branch information
schinken committed Mar 5, 2017
1 parent 6d88f6c commit 3c78d20
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 15 deletions.
24 changes: 11 additions & 13 deletions esp8266-geigercounter.ino
@@ -1,6 +1,7 @@
#include <ESP8266WiFi.h>
#include <PubSubClient.h>
#include <SoftwareSerial.h>
#include <ArduinoOTA.h>
#include <SimpleTimer.h>

#include "settings.h"
Expand All @@ -18,31 +19,26 @@ float lastuSv = 0, currentuSv = 0;

void setup() {

WiFi.hostname("ESP-GeigerCounter");
WiFi.hostname(WIFI_HOSTNAME);
WiFi.mode(WIFI_STA);

mqttClient.setClient(wifiClient);
mqttClient.setServer(mqttHost, 1883);

Serial.begin(115200);
geigerCounterSerial.begin(BAUD_GEIGERCOUNTER);

delay(10);

Serial.print("Connecting to ");
Serial.println(ssid);

WiFi.begin(ssid, password);
WiFi.begin(WIFI_SSID, WIFI_PASSWORD);

while (WiFi.status() != WL_CONNECTED) {
Serial.print(".");
delay(500);
}

Serial.println("");
Serial.println("WiFi connected");
Serial.println("IP address: ");
Serial.println(WiFi.localIP());
mqttClient.setClient(wifiClient);
mqttClient.setServer(mqttHost, 1883);

ArduinoOTA.setHostname(WIFI_HOSTNAME);
ArduinoOTA.setPassword(OTA_PASSWORD);
ArduinoOTA.begin();

timer.setInterval(UPDATE_INTERVAL_SECONDS * 1000L, updateRadiationValues);
}
Expand Down Expand Up @@ -150,4 +146,6 @@ void loop() {

Serial.write(in);
}

ArduinoOTA.handle();
}
7 changes: 5 additions & 2 deletions settings.h.example
Expand Up @@ -15,8 +15,11 @@

#define BAUD_GEIGERCOUNTER 9600

const char* ssid = "----";
const char* password = "----";
const char* WIFI_HOSTNAME = "ESP-GeigerCounter";
const char* WIFI_SSID = "----";
const char* WIFI_PASSWORD = "----";

const char* OTA_PASSWORD = "foobar";

#define MQTT_TOPIC_CPM "sensor/radiation/cpm"
#define MQTT_TOPIC_USV "sensor/radiation/uSv"
Expand Down

0 comments on commit 3c78d20

Please sign in to comment.