Version 0.9, mostly works, REST API for changing settings is clunky
This commit is contained in:
76
LED.py
Normal file
76
LED.py
Normal file
@@ -0,0 +1,76 @@
|
||||
from machine import Pin
|
||||
|
||||
from time import sleep
|
||||
|
||||
|
||||
|
||||
LEDPin=Pin(2,Pin.OUT)
|
||||
|
||||
|
||||
|
||||
def Blink(number,timeon=0.2,timeoff=0.2):
|
||||
|
||||
n=0
|
||||
|
||||
while n<number:
|
||||
|
||||
LEDPin.off()
|
||||
|
||||
sleep(timeon)
|
||||
|
||||
LEDPin.on()
|
||||
|
||||
sleep(timeoff)
|
||||
|
||||
n +=1
|
||||
|
||||
|
||||
|
||||
def Pulse(seconds,Speed):
|
||||
|
||||
LEDPin.off()
|
||||
|
||||
sleep(seconds)
|
||||
|
||||
LEDPin.on()
|
||||
|
||||
sleep (0.1*Speed)
|
||||
|
||||
|
||||
|
||||
def Morse(text,Speed=1):
|
||||
|
||||
Speed=1/Speed
|
||||
|
||||
Dot=0.1*Speed
|
||||
|
||||
Dash=0.3*Speed
|
||||
|
||||
SpaceInLetter=0.1*Speed
|
||||
|
||||
SpaceBetweenLetters=0.3*Speed
|
||||
|
||||
Space=0.7*Speed
|
||||
|
||||
alphabet={' ':' ',
|
||||
|
||||
'a':'.-',
|
||||
|
||||
'b':'-...',
|
||||
|
||||
'c':'-.-.',
|
||||
|
||||
'd':'-..',
|
||||
|
||||
'e':'.',
|
||||
|
||||
'f':'..-.',
|
||||
|
||||
'g':'--.',
|
||||
|
||||
'h':'....',
|
||||
|
||||
'i':'..',
|
||||
|
||||
'j':'.---',
|
||||
|
||||
18
boot.py
18
boot.py
@@ -1,9 +1,9 @@
|
||||
# This file is executed on every boot (including wake-boot from deepsleep)
|
||||
#import esp
|
||||
#esp.osdebug(None)
|
||||
import uos, machine
|
||||
#uos.dupterm(None, 1) # disable REPL on UART(0)
|
||||
import gc
|
||||
#import webrepl
|
||||
#webrepl.start()
|
||||
gc.collect()
|
||||
# This file is executed on every boot (including wake-boot from deepsleep)
|
||||
import esp
|
||||
#esp.osdebug(None)
|
||||
import uos, machine
|
||||
#uos.dupterm(None, 1) # disable REPL on UART(0)
|
||||
import gc
|
||||
#import webrepl
|
||||
#webrepl.start()
|
||||
gc.collect()
|
||||
|
||||
128
garage.py
128
garage.py
@@ -1,32 +1,96 @@
|
||||
import tinyweb
|
||||
from machine import Pin
|
||||
from time import sleep
|
||||
|
||||
# Create web server application
|
||||
app = tinyweb.webserver()
|
||||
Button=Pin(2,Pin.OUT)
|
||||
Button.on()
|
||||
|
||||
# Index page
|
||||
@app.route('/')
|
||||
async def index(request, response):
|
||||
# Start HTTP response with content-type text/html
|
||||
await response.start_html()
|
||||
# Send actual HTML page
|
||||
await response.send('<html><body><h1>Hi George!</h1><a href="button/1">Push the garage door button</a></html>\n')
|
||||
|
||||
|
||||
# Another one, more complicated page
|
||||
@app.route('/button/<nr>')
|
||||
async def table(request, response,nr):
|
||||
# Start HTTP response with content-type text/html
|
||||
Button.off()
|
||||
sleep(1)
|
||||
Button.on()
|
||||
await response.start_html()
|
||||
await response.send('<html><body><h1>Hi George!</h1>Button number %s pushed. <a href="/">Go back.</a> <a href="button">Or push it again.</a></html>\n'%nr)
|
||||
|
||||
|
||||
def run():
|
||||
print ("running app")
|
||||
app.run(host='0.0.0.0', port=80)
|
||||
import tinyweb
|
||||
from machine import Pin
|
||||
from machine import reset
|
||||
from time import sleep
|
||||
import json
|
||||
|
||||
settings=json.loads(''.join(open('settings.json').readlines()))
|
||||
|
||||
# Create web server application
|
||||
app = tinyweb.webserver()
|
||||
Button={}
|
||||
for name in settings["buttons"].keys():
|
||||
Button[name]=Pin(settings["buttons"][name]["pin"],Pin.OUT)
|
||||
Button[name].off()
|
||||
|
||||
# Index page
|
||||
@app.route('/')
|
||||
async def index(request, response):
|
||||
# Start HTTP response with content-type text/html
|
||||
await response.start_html()
|
||||
# Send actual HTML page
|
||||
await response.send('''<html><head>
|
||||
<style>.button { display: inline-block; border-radius: 4px; background-color: #00001e; border: none; color: #FFFFFF; text-align: center; font-size: 28px; padding: 20px; width: 200px; transition: all 0.5s; cursor: pointer; margin: 5px;}</style>
|
||||
</head><body><h1>George\'s Garage</h1>
|
||||
<a href="button/1"><button class="button">1</button></a>
|
||||
<a href="button/2"><button class="button">2</button></a>
|
||||
<a href="button/3"><button class="button">3</button></a>
|
||||
</html>\n''')
|
||||
|
||||
@app.route('/reset')
|
||||
async def index(request, response):
|
||||
# Start HTTP response with content-type text/html
|
||||
await response.start_html()
|
||||
# Send actual HTML page
|
||||
await response.send('''<html><head>
|
||||
<style>.button { display: inline-block; border-radius: 4px; background-color: #00001e; border: none; color: #FFFFFF; text-align: center; font-size: 28px; padding: 20px; width: 200px; transition: all 0.5s; cursor: pointer; margin: 5px;}</style>
|
||||
</head><body><h1>|RESETTING...</h1>
|
||||
</html>\n''')
|
||||
reset()
|
||||
|
||||
@app.route('/button/<nr>')
|
||||
async def button(request, response,nr):
|
||||
# Start HTTP response with content-type text/html
|
||||
Button[nr].on()
|
||||
sleep(settings['buttons'][nr]['delay'])
|
||||
Button[str(nr)].off()
|
||||
print ('button %s (Pin %s) pressed for %s seconds'%(nr,Button[nr],settings['buttons'][nr]['delay']))
|
||||
await response.start_html()
|
||||
await response.send('<html><head><meta http-equiv="refresh" content="0;url=/" /></head><body><h1>Hi George!</h1>Button number %s pushed for %s seconds. <a href="/">Go back.</a></html>\n'%(nr,settings['buttons'][str(nr)]['delay']))
|
||||
|
||||
def Write_Settings():
|
||||
File=open('settings.json','w')
|
||||
File.write(json.dumps(settings))
|
||||
File.close()
|
||||
|
||||
#@app.route('/config',save_headers=[])
|
||||
class config():
|
||||
def get(self,data):
|
||||
SanitizedSettings=settings.copy()
|
||||
if 'password' in SanitizedSettings:
|
||||
SanitizedSettings['password']='*not displayed*'
|
||||
if 'AP-password' in SanitizedSettings:
|
||||
SanitizedSettings['AP-password']='*not displayed*'
|
||||
return SanitizedSettings
|
||||
def post(self, data):
|
||||
print (data)
|
||||
for Setting in data.keys():
|
||||
settings[Setting]=data[Setting]
|
||||
print("Setting %s to %s"%(Setting,data[Setting]))
|
||||
Write_Settings()
|
||||
return data
|
||||
|
||||
def delete(self,data):
|
||||
for Setting in data.keys():
|
||||
settings.pop(Setting)
|
||||
Write_Settings()
|
||||
return data
|
||||
|
||||
#await response.start_html()
|
||||
# print (request.query_string)
|
||||
# a=tinyweb.server.parse_query_string(request.query_string)
|
||||
# print (a)
|
||||
# configs=str(a)
|
||||
# await response.send(configs)
|
||||
|
||||
|
||||
def run():
|
||||
print ("running app")
|
||||
app.add_resource(config,"/config")
|
||||
app.run(host='0.0.0.0', port=80)
|
||||
|
||||
#
|
||||
# form='''<html><head></head><body><h1>Settings</h1><form method='post'><table>'''
|
||||
# form += "<tr><td>AP-ssid</td><td><input type='text' name='AP-ssid'>%s</input></td></tr>"%settings['AP-ssid']
|
||||
# form +="</table><input type='submit'></body></html>"
|
||||
# return form
|
||||
95
main.py
95
main.py
@@ -1,42 +1,53 @@
|
||||
import network
|
||||
import json
|
||||
import time
|
||||
|
||||
settings=json.loads(''.join(open('settings.json').readlines()))
|
||||
|
||||
def netstop():
|
||||
n=network.WLAN(network.STA_IF)
|
||||
n.active(False)
|
||||
n=network.WLAN(network.AP_IF)
|
||||
n.active(False)
|
||||
|
||||
def STA():
|
||||
sta=network.WLAN(network.STA_IF)
|
||||
if sta.isconnected():
|
||||
return True
|
||||
sta.active(True)
|
||||
if ('NetMask') in settings and 'DNS' in settings and 'Gateway' in settings and 'IP' in settings:
|
||||
print("Static configuration active")
|
||||
sta.ifconfig((settings["IP"],settings["NetMask"],settings["Gateway"],settings["DNS"]))
|
||||
else:
|
||||
print("DHCP active")
|
||||
sta.connect(settings['ssid'],settings['password'])
|
||||
timeout=0
|
||||
while timeout < 60:
|
||||
if sta.isconnected():
|
||||
return True
|
||||
else:
|
||||
time.sleep(1)
|
||||
timeout += 1
|
||||
print("Time waiting: %s sec"%timeout)
|
||||
sta.active(False)
|
||||
return False
|
||||
|
||||
def AP():
|
||||
ap=network.WLAN(network.AP_IF)
|
||||
ap.active(True)
|
||||
ap.config(essid=settings['AP-ssid'],password=settings['AP-password'])
|
||||
print("AP configured")
|
||||
|
||||
import garage
|
||||
#garage.run()
|
||||
import network
|
||||
import json
|
||||
import time
|
||||
from machine import Pin
|
||||
import LED
|
||||
import garage
|
||||
|
||||
#import settings
|
||||
settings=json.loads(''.join(open('settings.json').readlines()))
|
||||
|
||||
def netstop():
|
||||
n=network.WLAN(network.STA_IF)
|
||||
n.active(False)
|
||||
n=network.WLAN(network.AP_IF)
|
||||
n.active(False)
|
||||
|
||||
def STA():
|
||||
"""Connects Board as Client to WiFi-Network. LED.Blinks 5 times short if successful"""
|
||||
sta=network.WLAN(network.STA_IF)
|
||||
if sta.isconnected():
|
||||
LED.Blink(5)
|
||||
return True
|
||||
sta.active(True)
|
||||
if ('NetMask') in settings and 'DNS' in settings and 'Gateway' in settings and 'IP' in settings:
|
||||
print("Static configuration active")
|
||||
sta.ifconfig((settings["IP"],settings["NetMask"],settings["Gateway"],settings["DNS"]))
|
||||
else:
|
||||
print("DHCP active")
|
||||
sta.connect(settings['ssid'],settings['password'])
|
||||
timeout=0
|
||||
while timeout < 30:
|
||||
if sta.isconnected():
|
||||
LED.Morse('ip %s'%sta.ifconfig()[0],1)
|
||||
return True
|
||||
else:
|
||||
LED.Blink(1,.05,.95)
|
||||
timeout += 1
|
||||
print("Time waiting: %s sec"%timeout)
|
||||
sta.active(False)
|
||||
return False
|
||||
|
||||
def AP():
|
||||
"""Provides Access point with settings in settings.json. LED.Blinks 3 long, 3 short on success"""
|
||||
ap=network.WLAN(network.AP_IF)
|
||||
ap.active(True)
|
||||
ap.config(essid=settings['AP-ssid'],password=settings['AP-password'])
|
||||
print("AP configured")
|
||||
LED.Morse ('AP')
|
||||
|
||||
netstop()
|
||||
if STA() != True:
|
||||
AP()
|
||||
garage.run()
|
||||
|
||||
@@ -1,14 +1,4 @@
|
||||
{"password": "blueground856",
|
||||
|
||||
"AP-password": "OpenSesame2020",
|
||||
|
||||
"DNS": "8.8.8.8", "IP":
|
||||
|
||||
"192.168.1.234",
|
||||
|
||||
"AP-ssid": "Georges Garage Door Prototype",
|
||||
|
||||
"NetMask": "255.255.255.0",
|
||||
|
||||
"buttons": {
|
||||
|
||||
{"password": "blueground856",
|
||||
"DNS": "8.8.8.8",
|
||||
"AP-password": "OpenSesame2020",
|
||||
"buttons": {"1": {"pin": 5, "delay": 2}, "3": {"pin": 13, "delay": 2}, "2": {"pin": 4, "delay": 2}}, "AP-ssid": "Georges Garage Door Prototype", "NetMask": "255.255.255.0", "ssid": "BLUEGROUND 856", "Gateway": "192.168.1.1"}
|
||||
Reference in New Issue
Block a user