muizenval

commit 23b8632370e1eb00c556be5ed4ee421cc48ed95f
parent 80c65f8c4b3318e5ff66fb18dfe215a8214e6343
Author: Friedel Schön <[email protected]>
Date:   Wed, 18 May 2022 11:27:39 +0200

fucking merge

Diffstat:
M
client/boot.py
 | 
6
++----
M
client/config.py
 | 
24
++++++++++++++++++------
M
client/main.py
 | 
7
+++----

3 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/client/boot.py b/client/boot.py
@@ -2,13 +2,12 @@ import sys
 import config
 import network
 from time import sleep
-from machine import Pin, ADC
+from machine import Pin
 
 led2 = Pin(2, Pin.OUT)
 
 connection = network.WLAN(network.STA_IF)
 
-
 def connect():
 
     if connection.isconnected():
@@ -33,4 +32,4 @@ def connect():
 
 
 if __name__ == "__main__":
-    connect()
-\ No newline at end of file
+    connect()
diff --git a/client/config.py b/client/config.py
@@ -1,8 +1,20 @@
-WIFI_SSID = "gercowifi"
-WIFI_PASSWORD = "password"
-SERVER = "192.168.137.1"
-PORT = "5000"
+where = "laptop"
+if where == "laptop":
+    WIFI_SSID = "gercowifi"
+    WIFI_PASSWORD = "password"
+    SERVER = "192.168.137.1"
+elif where == "pc":
+    WIFI_SSID = "KPN1479E6"
+    WIFI_PASSWORD = "FXR7JX6mfkR2Wbcf"
+    SERVER= "192.168.2.2"
+else: 
+    WIFI_SSID = "gercowifi"
+    WIFI_PASSWORD = "password"
+    SERVER = "192.168.137.1"
+
+DELAY = 1 # secound
+PORT = 5000
 ENDPOINTSTATUS = "/api/update_status"
 ENDPOINTCONNECT = "/api/search_connect"
-MAC_ADDRESS = "0000000000000000"
-SLEEP_TIME = 1 # secound
+
+MAC = "0000000000000001"
diff --git a/client/main.py b/client/main.py
@@ -9,7 +9,6 @@ urlconnect =  f"http://{config.SERVER}:{config.PORT}{config.ENDPOINTCONNECT}"
 led = Pin(23, Pin.OUT)
 trap = Pin(15, Pin.IN, Pin.PULL_DOWN)
 connectbutton = Pin(4, Pin.IN, Pin.PULL_DOWN)
-
 state = False
 #esp32.wake_on_ext1(pins = (button, button2), level = esp32.WAKEUP_ANY_HIGH)
 
@@ -20,16 +19,16 @@ while connection.isconnected():
     led.value(new_state)
 
     if state != new_state:
-        response = requests.post(urlstatus, json={ "mac": config.MAC_ADDRESS, "state": new_state })
+        response = requests.post(urlstatus, json={ "mac": config.MAC, "status": new_state })
         answer = response.json()
         state = new_state
         print(answer)
 
     if connectbutton.value():
-        response = requests.post(urlconnect, json={ "mac": config.MAC_ADDRESS })
+        response = requests.post(urlconnect, json={ "mac": config.MAC })
         answer = response.json()
         print(answer)
 
-    sleep(config.SLEEP_TIME)
+    sleep(config.DELAY)
 
 #deepsleep()