(defaultData, (set) => {
if (browser) {
- const source = new EventSource('http://10.50.0.113/events');
+ const source = new EventSource(`${url}/events`);
source.addEventListener('open', () => {
console.log('Connected');
});
source.addEventListener('message', (e) => {
- const data: SensorData = JSON.parse(e.data);
- set(data);
+ set(JSON.parse(e.data));
});
}
});
+
+export async function setOutput(pin: number, value: boolean) {
+ await fetch(`${url}/set`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ Accept: 'application/json',
+ },
+ body: JSON.stringify({ pin, value }),
+ });
+}
+
+export async function setOnTemp(temp: number) {
+ await fetch(`${url}/settings`, {
+ method: 'PATCH',
+ headers: {
+ 'Content-Type': 'application/json',
+ Accept: 'application/json',
+ },
+ body: JSON.stringify({ onTemp: temp }),
+ });
+}
+
+export async function setOnHum(hum: number) {
+ await fetch(`${url}/settings`, {
+ method: 'PATCH',
+ headers: {
+ 'Content-Type': 'application/json',
+ Accept: 'application/json',
+ },
+ body: JSON.stringify({ onHum: hum }),
+ });
+}
diff --git a/dashboard/src/routes/+layout.svelte b/dashboard/src/routes/+layout.svelte
new file mode 100644
index 0000000..da212a0
--- /dev/null
+++ b/dashboard/src/routes/+layout.svelte
@@ -0,0 +1,5 @@
+
+
+
diff --git a/dashboard/src/routes/+page.svelte b/dashboard/src/routes/+page.svelte
index 1eecc28..b947987 100644
--- a/dashboard/src/routes/+page.svelte
+++ b/dashboard/src/routes/+page.svelte
@@ -1,8 +1,56 @@
-{#if $sensor}
- Temperature {$sensor.temp} °C
- Humidity {$sensor.hum}%
-{/if}
+Temperature {$sensor.temp} °C
+Humidity {$sensor.hum} %
+
+
+
+
+ {temp}
+
+ {hum}%
+
+
diff --git a/dashboard/svelte.config.js b/dashboard/svelte.config.js
index 7209408..a01d3b5 100644
--- a/dashboard/svelte.config.js
+++ b/dashboard/svelte.config.js
@@ -1,18 +1,24 @@
+import preprocess from 'svelte-preprocess';
import adapter from '@sveltejs/adapter-static';
import { vitePreprocess } from '@sveltejs/kit/vite';
/** @type {import('@sveltejs/kit').Config} */
const config = {
- preprocess: vitePreprocess(),
+ preprocess: [
+ vitePreprocess(),
+ preprocess({
+ postcss: true,
+ }),
+ ],
kit: {
adapter: adapter({
pages: 'build',
assets: 'build',
fallback: null,
precompress: false,
- strict: true
- })
- }
+ strict: true,
+ }),
+ },
};
export default config;
diff --git a/dashboard/tailwind.config.cjs b/dashboard/tailwind.config.cjs
new file mode 100644
index 0000000..74dd938
--- /dev/null
+++ b/dashboard/tailwind.config.cjs
@@ -0,0 +1,9 @@
+const config = {
+ content: ['./src/**/*.{html,js,svelte,ts}'],
+ theme: {
+ extend: {},
+ },
+ plugins: [require('daisyui')],
+};
+
+module.exports = config;
diff --git a/dashboard/tsconfig.json b/dashboard/tsconfig.json
index 6ae0c8c..61d2009 100644
--- a/dashboard/tsconfig.json
+++ b/dashboard/tsconfig.json
@@ -10,6 +10,7 @@
"sourceMap": true,
"strict": true
}
+
// Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias
//
// If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes
diff --git a/dashboard/vite.config.ts b/dashboard/vite.config.ts
index bbf8c7d..fce9e87 100644
--- a/dashboard/vite.config.ts
+++ b/dashboard/vite.config.ts
@@ -2,5 +2,5 @@ import { sveltekit } from '@sveltejs/kit/vite';
import { defineConfig } from 'vite';
export default defineConfig({
- plugins: [sveltekit()]
+ plugins: [sveltekit()],
});
diff --git a/lib/settings/settings.cpp b/lib/settings/settings.cpp
index a26d73a..c2b5912 100644
--- a/lib/settings/settings.cpp
+++ b/lib/settings/settings.cpp
@@ -4,6 +4,12 @@
Settings::Settings() {
refreshInterval = 1000;
sensorPin = 26;
+ onTemp = 26.0;
+ onHum = 60.0;
+ tempOffset = 2.0;
+ humOffset = -2.0;
+ heaterOn = false;
+ dehumOn = false;
}
void Settings::load() {
@@ -28,4 +34,46 @@ void Settings::setSensorPin(unsigned int sensorPin) {
save();
}
-unsigned int Settings::getSensorPin() { return sensorPin; }
\ No newline at end of file
+unsigned int Settings::getSensorPin() { return sensorPin; }
+
+void Settings::setOnTemp(float temp) {
+ onTemp = temp;
+ save();
+}
+
+float Settings::getOnTemp() { return onTemp; }
+
+void Settings::setOnHum(float hum) {
+ onHum = hum;
+ save();
+}
+
+float Settings::getOnHum() { return onHum; }
+
+void Settings::setTempOffset(float temp) {
+ tempOffset = temp;
+ save();
+}
+
+float Settings::getTempOffset() { return tempOffset; }
+
+void Settings::setHumOffset(float hum) {
+ humOffset = hum;
+ save();
+}
+
+float Settings::getHumOffset() { return humOffset; }
+
+void Settings::setHeaterOn(bool on) {
+ heaterOn = on;
+ save();
+}
+
+bool Settings::getHeaterOn() { return heaterOn; }
+
+void Settings::setDehumOn(bool on) {
+ dehumOn = on;
+ save();
+}
+
+bool Settings::getDehumOn() { return dehumOn; }
\ No newline at end of file
diff --git a/lib/settings/settings.h b/lib/settings/settings.h
index 8fb6836..870aeaa 100644
--- a/lib/settings/settings.h
+++ b/lib/settings/settings.h
@@ -11,9 +11,33 @@ public:
void setSensorPin(unsigned int);
unsigned int getSensorPin();
+ void setOnTemp(float temp);
+ float getOnTemp();
+
+ void setOnHum(float hum);
+ float getOnHum();
+
+ void setTempOffset(float temp);
+ float getTempOffset();
+
+ void setHumOffset(float hum);
+ float getHumOffset();
+
+ void setHeaterOn(bool on);
+ bool getHeaterOn();
+
+ void setDehumOn(bool on);
+ bool getDehumOn();
+
private:
unsigned long refreshInterval;
unsigned int sensorPin;
+ float onTemp;
+ float onHum;
+ float tempOffset;
+ float humOffset;
+ bool heaterOn;
+ bool dehumOn;
void save();
};
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index 4e5b108..ed715a6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -8,11 +8,11 @@
#include
#include
-void sendSensorData();
+void readSensor();
void setupSensor();
-const char *ssid = "stoenka";
-const char *password = "topavem2020";
+const char *ssid = "Vegova RVP4";
+const char *password = "Vegova_RVP4";
DHT *dht;
Settings settings;
@@ -35,7 +35,7 @@ void setupWifi() {
void onConnect(AsyncEventSourceClient *client) {
Serial.println("New client connected");
- sendSensorData();
+ readSensor();
}
void setupServer() {
@@ -44,11 +44,30 @@ void setupServer() {
return;
}
+ // POST /set - set the output pin
+ AsyncCallbackJsonWebHandler *setHandler = new AsyncCallbackJsonWebHandler(
+ "/set", [](AsyncWebServerRequest *req, JsonVariant &json) {
+ if (json["pin"].isNull() || json["value"].isNull()) {
+ req->send(400);
+ return;
+ }
+ digitalWrite(json["pin"].as(), json["value"].as());
+ readSensor();
+ req->send(200);
+ });
+ server.addHandler(setHandler);
+
// GET /settings - Get the current settings
server.on("/settings", HTTP_GET, [](AsyncWebServerRequest *req) {
StaticJsonDocument<200> json;
json["refreshInterval"] = settings.getRefreshInterval();
json["sensorPin"] = settings.getSensorPin();
+ json["onTemp"] = settings.getOnTemp();
+ json["onHum"] = settings.getOnHum();
+ json["tempOffset"] = settings.getTempOffset();
+ json["humOffset"] = settings.getHumOffset();
+ json["heaterOn"] = settings.getHeaterOn();
+ json["dehumOn"] = settings.getDehumOn();
String buffer;
serializeJson(json, buffer);
@@ -67,10 +86,30 @@ void setupServer() {
settings.setSensorPin(json["sensorPin"].as());
setupSensor();
}
+ if (!json["onTemp"].isNull()) {
+ settings.setOnTemp(json["onTemp"].as());
+ }
+ if (!json["onHum"].isNull()) {
+ settings.setOnHum(json["onHum"].as());
+ }
+ if (!json["tempOffset"].isNull()) {
+ settings.setTempOffset(json["tempOffset"].as());
+ }
+ if (!json["humOffset"].isNull()) {
+ settings.setHumOffset(json["humOffset"].as());
+ }
req->send(200);
});
server.addHandler(settingsHandler);
+ server.onNotFound([](AsyncWebServerRequest *request) {
+ if (request->method() == HTTP_OPTIONS) {
+ request->send(200);
+ } else {
+ request->send(404);
+ }
+ });
+
events.onConnect(onConnect);
server.addHandler(&events);
server.serveStatic("/", SPIFFS, "/").setDefaultFile("index.html");
@@ -84,10 +123,33 @@ void setupSensor() {
dht->begin();
}
-void sendSensorData() {
+void readSensor() {
+ float temp = dht->readTemperature();
+ float hum = dht->readHumidity();
+
+ float onTemp = settings.getOnTemp();
+ float offTemp = onTemp + settings.getTempOffset();
+
+ float onHum = settings.getOnHum();
+ float offHum = onHum + settings.getHumOffset();
+
+ if (temp <= onTemp) {
+ digitalWrite(16, HIGH);
+ } else {
+ digitalWrite(16, LOW);
+ }
+
+ if (hum >= onHum) {
+ digitalWrite(17, HIGH);
+ } else {
+ digitalWrite(17, LOW);
+ }
+
StaticJsonDocument<200> json;
- json["temp"] = (int)(dht->readTemperature() * 100 + 0.5) / 100.0;
- json["hum"] = dht->readHumidity();
+ json["temp"] = (int)(temp * 100 + 0.5) / 100.0;
+ json["hum"] = hum;
+ json["out1"] = (bool)digitalRead(16);
+ json["out2"] = (bool)digitalRead(17);
String buffer;
serializeJson(json, buffer);
@@ -98,6 +160,9 @@ void sendSensorData() {
void setup() {
Serial.begin(115200);
+ pinMode(16, OUTPUT);
+ pinMode(17, OUTPUT);
+
setupWifi();
setupServer();
@@ -112,6 +177,6 @@ void loop() {
unsigned long currMillis = millis();
if (currMillis - prevMillis > settings.getRefreshInterval()) {
prevMillis = currMillis;
- sendSensorData();
+ readSensor();
}
}
\ No newline at end of file