From f00cc573fb412354775dda0a14cddc2632f01aed Mon Sep 17 00:00:00 2001
From: "thuenemann.nico@gmail.com" <thuenemann.nico@gmail.com>
Date: Thu, 2 Jan 2025 22:39:27 +0100
Subject: [PATCH] did some shit

---
 ...ts_client_alter_client_options_and_more.py |  33 ++++++++++++++++++
 .../0003_alter_moisture_moisture.py           |  18 ++++++++++
 Server/api/models.py                          |   2 +-
 Server/api/views.py                           |   2 +-
 Server/core/settings.py                       |   3 +-
 Server/db.sqlite3                             | Bin 163840 -> 163840 bytes
 WorkerNode/NodeMCWifi/NodeMCWifiPump.ino      |  13 ++++---
 WorkerNode/TestSensorFiles/dht.ino            |   2 +-
 WorkerNode/TestSensorFiles/moisture.ino       |   4 +--
 WorkerNode/TestSensorFiles/pump.ino           |   2 +-
 WorkerNode/TestSensorFiles/waterlevel.ino     |   4 +--
 11 files changed, 67 insertions(+), 16 deletions(-)
 create mode 100644 Server/api/migrations/0002_rename_clients_client_alter_client_options_and_more.py
 create mode 100644 Server/api/migrations/0003_alter_moisture_moisture.py

diff --git a/Server/api/migrations/0002_rename_clients_client_alter_client_options_and_more.py b/Server/api/migrations/0002_rename_clients_client_alter_client_options_and_more.py
new file mode 100644
index 0000000..a1db65b
--- /dev/null
+++ b/Server/api/migrations/0002_rename_clients_client_alter_client_options_and_more.py
@@ -0,0 +1,33 @@
+# Generated by Django 5.0.3 on 2025-01-02 20:18
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='Clients',
+            new_name='Client',
+        ),
+        migrations.AlterModelOptions(
+            name='client',
+            options={'ordering': ['id']},
+        ),
+        migrations.AlterModelOptions(
+            name='moisture',
+            options={'ordering': ['id']},
+        ),
+        migrations.AlterModelOptions(
+            name='temperature',
+            options={'ordering': ['id']},
+        ),
+        migrations.AlterModelOptions(
+            name='waterlevel',
+            options={'ordering': ['id']},
+        ),
+    ]
diff --git a/Server/api/migrations/0003_alter_moisture_moisture.py b/Server/api/migrations/0003_alter_moisture_moisture.py
new file mode 100644
index 0000000..d9ff44d
--- /dev/null
+++ b/Server/api/migrations/0003_alter_moisture_moisture.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0.3 on 2025-01-02 21:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0002_rename_clients_client_alter_client_options_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='moisture',
+            name='moisture',
+            field=models.FloatField(),
+        ),
+    ]
diff --git a/Server/api/models.py b/Server/api/models.py
index baee685..336d4db 100644
--- a/Server/api/models.py
+++ b/Server/api/models.py
@@ -26,7 +26,7 @@ class Temperature(models.Model):
 
 class Moisture(models.Model):
     id = models.AutoField(primary_key=True, auto_created=True, editable=False)
-    moisture = models.IntegerField()
+    moisture = models.FloatField()
     created_by = models.ForeignKey(Client, on_delete=models.CASCADE)
     created_at = models.DateTimeField(auto_now_add=True)
 
diff --git a/Server/api/views.py b/Server/api/views.py
index 874b1f5..951c320 100644
--- a/Server/api/views.py
+++ b/Server/api/views.py
@@ -34,7 +34,7 @@ def temperature(request):
 def moisture(request):
     client = Client.objects.get(hostname=request.data['hostname'])
     temp = Moisture(
-        moisture=request.data['moistrue'],
+        moisture=request.data['moisture'],
         created_by=client
     )
     temp.save()
diff --git a/Server/core/settings.py b/Server/core/settings.py
index 5ff8c66..35f4ccf 100644
--- a/Server/core/settings.py
+++ b/Server/core/settings.py
@@ -26,7 +26,8 @@ SECRET_KEY = 'django-insecure-(6h_gl6)e$xf3^^ds6-iyjxa^kbgr51%tu79urm1lrl31ov%65
 DEBUG = True
 
 ALLOWED_HOSTS = [
-    '*'
+    '192.168.178.122',
+    '127.0.0.1'
 ]
 
 
diff --git a/Server/db.sqlite3 b/Server/db.sqlite3
index 7f7ef373977e4bec066e68b7cf791533d877a7a7..44653a4a3a5451676d5d7eeafd2f695673502418 100644
GIT binary patch
delta 4167
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
YnaPr1lWV#x3C43*f$_~Vv!9~>0-n$lmH+?%

delta 3865
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
E3k}})X8-^I

diff --git a/WorkerNode/NodeMCWifi/NodeMCWifiPump.ino b/WorkerNode/NodeMCWifi/NodeMCWifiPump.ino
index 8cf2ac2..38d3b95 100644
--- a/WorkerNode/NodeMCWifi/NodeMCWifiPump.ino
+++ b/WorkerNode/NodeMCWifi/NodeMCWifiPump.ino
@@ -3,11 +3,13 @@
 #include <ArduinoJson.h>
 
 //TemperaturSensor
-#include "DHT.h"
+#include <DHT.h>
+#define DHT_PIN D5
 #define DHT_TYPE DHT22
+DHT dht(DHT_PIN, DHT_TYPE);
 
 //WaterLevelSensor
-#define waterlevel_pin D2
+#define waterlevel_pin D1
 #define waterlevelread_pin A0
 
 //moistureSensor
@@ -20,16 +22,12 @@
 int val = 0;
 int test = 0;
 
-//Temperature and humidity sensor
-const int DHT_PIN = D5;
-DHT dht(DHT_PIN, DHT_TYPE);
-
 //Wlan configuration
 const char* ssid = "Andy";
 const char* password = "AndyNicoChiara";
 
 //api and host configuration
-const char* serverName = "http://192.168.178.45:8000/api/";
+const char* serverName = "http://192.168.178.122:8000/api/";
 String hostname = "ESP8266NodeTemperature1";
 
 
@@ -180,6 +178,7 @@ int postRequest(String requestBody, String api) {
     urlName = serverName + api;
     WiFiClient client;
     HTTPClient http;
+    Serial.println(urlName);
     http.begin(client, urlName);
     http.addHeader("Content-Type", "application/json");
     int httpResponseCode = http.POST(requestBody);
diff --git a/WorkerNode/TestSensorFiles/dht.ino b/WorkerNode/TestSensorFiles/dht.ino
index 29f28a1..e74e3c5 100644
--- a/WorkerNode/TestSensorFiles/dht.ino
+++ b/WorkerNode/TestSensorFiles/dht.ino
@@ -2,7 +2,7 @@
 #include <DHT.h>;
 
 //Constants
-#define DHTPIN 2     // what pin we're connected to
+#define DHTPIN D2     // Sensor out
 #define DHTTYPE DHT22   // DHT 22  (AM2302)
 DHT dht(DHTPIN, DHTTYPE); //// Initialize DHT sensor for normal 16mhz Arduino
 
diff --git a/WorkerNode/TestSensorFiles/moisture.ino b/WorkerNode/TestSensorFiles/moisture.ino
index 4f73630..98f8b72 100644
--- a/WorkerNode/TestSensorFiles/moisture.ino
+++ b/WorkerNode/TestSensorFiles/moisture.ino
@@ -1,6 +1,6 @@
 // Sensor pins
-#define sensorPower 7
-#define sensorPin A0
+#define sensorPower D3	// Sensor D0
+#define sensorPin A0	// Sensor A0
 
 void setup() {
 	pinMode(sensorPower, OUTPUT);
diff --git a/WorkerNode/TestSensorFiles/pump.ino b/WorkerNode/TestSensorFiles/pump.ino
index e815df9..f43dedd 100644
--- a/WorkerNode/TestSensorFiles/pump.ino
+++ b/WorkerNode/TestSensorFiles/pump.ino
@@ -1,5 +1,5 @@
 // pump
-#define pump D8
+#define pump D2 // Relay S
 
 
 //needs some work, needs special logic board to function properly
diff --git a/WorkerNode/TestSensorFiles/waterlevel.ino b/WorkerNode/TestSensorFiles/waterlevel.ino
index a415773..4ef7be6 100644
--- a/WorkerNode/TestSensorFiles/waterlevel.ino
+++ b/WorkerNode/TestSensorFiles/waterlevel.ino
@@ -1,6 +1,6 @@
 // Sensor pins
-#define sensorPower 7
-#define sensorPin A0
+#define sensorPower D2 	// Sensor +
+#define sensorPin A0	// Sensor S
 
 // Value for storing water level
 int val = 0;