Skip to content

Start stop #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
metaMMA wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Start stop #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a89cf27
Update version number.
metaMMA Apr 22, 2020
9a1dd7d
Add .lock file to .gitignore.
metaMMA Apr 22, 2020
86a1851
Update version number in config file.
metaMMA Apr 22, 2020
3d50107
Ensure that config version is updated after app upgrade.
metaMMA Apr 22, 2020
d6687d4
Wrap code in loop to allow for start and stop.
metaMMA Apr 22, 2020
5557f1e
Add start and stop methods.
metaMMA Apr 22, 2020
d09c9eb
Add start-stop slider and JS method.
metaMMA Apr 22, 2020
16d397e
Allow new stop-method to be activated by keyboard.
metaMMA Apr 22, 2020
e587b1e
Fix version number and imports.
metaMMA Apr 22, 2020
45d98d7
Revert version number.
metaMMA Apr 23, 2020
59c9cfc
Revert version number.
metaMMA Apr 23, 2020
3470212
Ignore all log files.
metaMMA Apr 23, 2020
4827863
Refactor abbreviation methods.
metaMMA Apr 23, 2020
ab8ba5e
Refactor other abbreviation method.
metaMMA Apr 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ config.py
config.json
*.pyc
*.swp
.log
.log*
.lock
11 changes: 11 additions & 0 deletions config_page.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,17 @@ def upload(self):
json.dump(input_json, f, indent=2, separators=(',', ': '))
self.index()

@cherrypy.expose
def start(self):
with open(".lock", 'w') as f:
f.write("1")
self.index()

@cherrypy.expose
def stop(self):
with open(".lock", 'w') as f:
f.write("0")
self.index()

@cherrypy.expose
def log(self):
Expand Down
27 changes: 27 additions & 0 deletions html/config.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,25 @@
<head>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="serialize_script.js"></script>
<script>
// Run the start or stop method from config_webpage.py depending on slider position.
function startstop() {
var xhr = new XMLHttpRequest();
if (document.getElementById('start').checked == false) {
xhr.open('GET', 'stop', true);
xhr.onload = function () {
console.log(xhr.responseURL);
};
xhr.send(null);
} else {
xhr.open('GET', 'start', true);
xhr.onload = function () {
console.log(xhr.responseURL);
};
xhr.send(null);
}
}
</script>
<script>
function config_save() {
json_obj = $('#config_data').serializeJSON({checkboxUncheckedValue: "false", parseBooleans: true});
Expand Down Expand Up @@ -96,6 +115,14 @@
<div id="lcloud"><img src="chancetstorms.png" height="256" width="256"></div>
<div id="rcloud"><img src="chancetstorms.png" height="256" width="256"></div>
<div class="page_title">PiWeatherRock Configuration Page</div>
<div id="start_toggle">
<div class="left">Stop</div>
<label class="switch">
<input type="checkbox" id="start" onclick="startstop()">
<span class="slider round"></span>
</label>
<div class="right">Start</div>
</div>
<div name="version" id="version"></div>
<!-- Rounded switch -->
<div id="toggle">
Expand Down
3 changes: 3 additions & 0 deletions scripts/upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@
if key not in old_config.keys():
old_config[key] = new_config[key]

# Update version
old_config["version"] = new_config["version"]

with open("config.json", "w") as f:
json.dump(old_config, f)

Loading