From a415ffc396f52893e1bd70b5c92959f21ab6b15b Mon Sep 17 00:00:00 2001 From: dslak Date: Mon, 8 May 2023 16:56:58 +0200 Subject: [PATCH] check --- Arduino/Sensors/Sensors.ino | 7 ++++--- TEST/windDir/windDir.ino | 12 ++++++------ Web/weather/src/api/station.php | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Arduino/Sensors/Sensors.ino b/Arduino/Sensors/Sensors.ino index c7b45ec..7ceab40 100644 --- a/Arduino/Sensors/Sensors.ino +++ b/Arduino/Sensors/Sensors.ino @@ -13,8 +13,9 @@ #define SERIAL_RO D7 // 10 #define SERIAL_DI D8 // 11 -#define WIFIUSR "NETGEAR41" -#define WIFIPWD "magicalbanana0" +#define WIFIUSR "weather" +#define WIFIPWD "dslakweatherpwd" +#define DATA_DELAY 10000 ESP8266WiFiMulti WiFiMulti; BME280I2C bme; @@ -78,5 +79,5 @@ void loop() { Serial.println(pressure); sendData(); - delay(10000); + delay(DATA_DELAY); } diff --git a/TEST/windDir/windDir.ino b/TEST/windDir/windDir.ino index 3355e46..c28ce7d 100644 --- a/TEST/windDir/windDir.ino +++ b/TEST/windDir/windDir.ino @@ -1,15 +1,15 @@ #include #include -#define RE 7 -#define DE 8 +#define RE D5 +#define DE D6 const byte O2[] = {0x01 ,0x03 ,0x00 ,0x00 ,0x00 ,0x02 ,0xC4 ,0x0B}; byte values[20]; -SoftwareSerial mod(10, 11); // RO / DI +SoftwareSerial mod(D7, D8); // RO / DI void setup() { -Serial.begin(4800); +Serial.begin(9600); mod.begin(4800); pinMode(RE, OUTPUT); pinMode(DE, OUTPUT); @@ -18,7 +18,7 @@ pinMode(DE, OUTPUT); void loop() { int val1 = 0 ; Calculate(); - val1 = ((values[5]*256)+values[8]); + val1 = values[4]; Serial.print("v: "); Serial.println(val1); @@ -28,7 +28,7 @@ void loop() { byte Calculate() { digitalWrite(DE, HIGH); -digitalWrite(RE, HIGH); +digitalWrite(RE, LOW); delay(10); if (mod.write(O2, sizeof(O2)) == 8) { digitalWrite(DE, LOW); diff --git a/Web/weather/src/api/station.php b/Web/weather/src/api/station.php index 4422569..0042bb1 100644 --- a/Web/weather/src/api/station.php +++ b/Web/weather/src/api/station.php @@ -6,7 +6,7 @@ $conn = @mysqli_connect($CONF['DB']['HOST'], $CONF['DB']['USER'], $CONF['DB']['P $data = explode('|',$_GET['data']); -$query = "INSERT INTO `data` VALUES(NULL, '".$data[0]."', NOW(), ".$data[1].", ".$data[2].", ".$data[3].", ".$data[4].", ".$data[4].")"; +$query = "INSERT INTO `data` VALUES(NULL, '".$data[0]."', NOW(), ".$data[1].", ".$data[2].", ".$data[3].", ".$data[4].", ".$data[5].")"; if(mysqli_query($conn, $query)) { http_response_code(200);