Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Various improvements and bug-fixes #91

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
GlassesToCSharp wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Various improvements and bug-fixes #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
cf2924e
Various changes
GlassesToCSharp Jan 4, 2020
eb88c57
Imrpoved debugging and readability
GlassesToCSharp Jan 5, 2020
2489eea
Cut down duplicate code in NOAA processing files
GlassesToCSharp Jan 5, 2020
f07bd46
Created and implemented debugEcho function for shell scripts.
GlassesToCSharp Jan 5, 2020
4c0f7d3
Renamed `obrazek` to `image`.
GlassesToCSharp Jan 8, 2020
87c36d6
Removed "RAW" enhancement and added `mapOutline` configuration property.
GlassesToCSharp Jan 10, 2020
089eb20
Implemented imageExtension property
GlassesToCSharp Jan 25, 2020
c1b75ff
Removed unnecessary debug code
GlassesToCSharp Jan 26, 2020
bf7c8fd
Removed traces of Flask
GlassesToCSharp Jan 26, 2020
d19f5fd
Codacy fixes
GlassesToCSharp Jan 27, 2020
0923008
Codacy fixes 2
GlassesToCSharp Jan 29, 2020
95340da
Codacy fixes 3
GlassesToCSharp Jan 29, 2020
594caad
Codacy fixes 4
GlassesToCSharp Feb 2, 2020
d432e40
Codacy fixes 5
GlassesToCSharp Feb 2, 2020
e34d28f
Added removing of ol data for NOAA images
GlassesToCSharp Aug 15, 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
2 changes: 0 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,3 @@ var/dongleshift.txt
var/gsm_channel.txt
var/www/*.html
var/www/*.tmp
modules/noaa/noaa.conf
modules/meteor-m2/meteor.conf
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ Variable data.
dongleshift.txt - current dongle shift
nextpass.* - list and plot of the next passes
tle/ - directory with tle data
flask/ - flask webserver stuff (see flask documentation):
node/ - NodeJS webserver stuff (see NodeJS documentation):
static/ - css, js
templates/ - html template(s)
www/ - stuff for static webpages; templates and output data
Expand All @@ -273,7 +273,7 @@ The web page is generated into `/var/www/` (the default location).

# Webserver

autowx2 is equipped with a simple flask webserver showing what is going on - displaying current logs (with some limitations, i.e., not showing logs of external programs - solution needed) and updated pass list.
autowx2 is equipped with a simple NodeJS webserver showing what is going on - displaying current logs (with some limitations, i.e., not showing logs of external programs - solution needed) and updated pass list.

![static web page](docs/www-dynamic+shadow.jpg)

Expand Down
3 changes: 2 additions & 1 deletion _listvars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ echo $stationName
# add some environmental variables
#

export autowx2version=$(cd $baseDir && git describe --tags)
export autowx2version=$(cd $baseDir && git describe --all)

26 changes: 16 additions & 10 deletions autowx2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,28 @@
#

# from autowx2_conf import * # configuration
from autowx2_functions import * # all functions and magic hidden here
# all functions and magic hidden here
from autowx2_conf import cleanupRtl
from autowx2_functions import log, saveToFile, wwwDir, time, debugPrint
from autowx2_functions import killRtl, mainLoop, process

# ------------------------------------------------------------------------------------------------------ #


if __name__ == "__main__":
log("⚡ Program start")
saveToFile("%s/start.tmp" % (wwwDir), str(time.time())) # saves program start date to file
# saves program start date to file
saveToFile("%s/start.tmp" % (wwwDir), str(time.time()))

debugPrint("Main program started")

if cleanupRtl:
log("Killing all remaining rtl_* processes...")
justRun(["bin/kill_rtl.sh"], loggingDir)
killRtl()

while True:
t1 = Thread(target = mainLoop)
t1.setDaemon(True)
t1.start()
# app.run(debug=True, port=webInterfacePort)

socketio.run(app, port=webInterfacePort, debug=False)
debugPrint("Main loop started")
try:
mainLoop()
finally:
print("[MAIN] Main loop exited for some reason. Check the logs.")
process.terminate()
Loading