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 7f7ef37..44653a4 100644 Binary files a/Server/db.sqlite3 and b/Server/db.sqlite3 differ 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 //TemperaturSensor -#include "DHT.h" +#include +#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 ; //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;