Skip to content

Fixed flashDfu --file parameter not being parsed #70

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

Fixed flashDfu --file parameter not being parsed #70

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f97e6a3
Fixed flashDfu --file parameter not being parsed
lukepower Nov 14, 2015
5e4e5c3
Modified logMessage to send back messages over JSON
lukepower Dec 17, 2015
42cc792
Made changes to work on python 2.7
lukepower Dec 17, 2015
17affb1
added messageType=getMessages
lukepower Dec 18, 2015
aac18ca
Updated most logMessage calls to include messageType.
lukepower Dec 18, 2015
b4a65f8
Merge branch 'develop' of https://github.com/lukepower/brewpi-script …
lukepower Jan 24, 2016
aafe976
Merge remote-tracking branch 'origin/master' into develop
lukepower Jan 24, 2016
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
5 changes: 5 additions & 0 deletions brewpi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@
# listState = "", "d", "h", "dh" to reflect whether the list is up to date for installed (d) and available (h)
deviceList = dict(listState="", installed=[], available=[])

# Message queue
messageQueue = Queue.Queue()

lcdText = ['Script starting up', ' ', ' ', ' ']

# Read in command line arguments
Expand Down Expand Up @@ -484,6 +487,8 @@ def renameTempKey(key):
conn.send(json.dumps(cs))
elif messageType == "getControlVariables":
conn.send(cv)
elif messageType == "getMessages":
+ conn.send(json.dumps({'messages': getLogMessages()}))
elif messageType == "refreshControlConstants":
bg_ser.write("c")
raise socket.timeout
Expand Down