Rename 'isQueueEmpty' to 'queueIsEmpty', more readable to me
This commit is contained in:
parent
d2b1788d23
commit
1d12cb7f21
2 changed files with 8 additions and 8 deletions
12
fallout.py
12
fallout.py
|
@ -5,7 +5,7 @@ import fallout_locked as locked
|
||||||
import fallout_hack as hack
|
import fallout_hack as hack
|
||||||
import fallout_selection as select
|
import fallout_selection as select
|
||||||
import fallout_data as data
|
import fallout_data as data
|
||||||
from fallout_functions import soundTest, isQueueEmpty, addSound
|
from fallout_functions import soundTest, queueIsEmpty, addSound
|
||||||
from time import sleep
|
from time import sleep
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
@ -22,10 +22,10 @@ if '--preload' in sys.argv:
|
||||||
|
|
||||||
try:
|
try:
|
||||||
addSound("poweron")
|
addSound("poweron")
|
||||||
while not isQueueEmpty():
|
while not queueIsEmpty():
|
||||||
sleep(0.2)
|
sleep(0.2)
|
||||||
if skip or boot.beginBoot(hard):
|
if skip or boot.beginBoot(hard):
|
||||||
while not isQueueEmpty():
|
while not queueIsEmpty():
|
||||||
sleep(0.2)
|
sleep(0.2)
|
||||||
pwd = None
|
pwd = None
|
||||||
if not skip:
|
if not skip:
|
||||||
|
@ -34,12 +34,12 @@ try:
|
||||||
pwd = "VERYVERYSECUREPASSWORD"
|
pwd = "VERYVERYSECUREPASSWORD"
|
||||||
if pwd != None:
|
if pwd != None:
|
||||||
login.beginLogin(hard, 'ADMIN', pwd)
|
login.beginLogin(hard, 'ADMIN', pwd)
|
||||||
while not isQueueEmpty():
|
while not queueIsEmpty():
|
||||||
sleep(0.2)
|
sleep(0.2)
|
||||||
sel = 0
|
sel = 0
|
||||||
while sel != 3:
|
while sel != 3:
|
||||||
sel = select.beginSelection(data.ROBCO_HEADERS, data.SOFT_HEADERS, data.MAIN_MENU)
|
sel = select.beginSelection(data.ROBCO_HEADERS, data.SOFT_HEADERS, data.MAIN_MENU)
|
||||||
while not isQueueEmpty():
|
while not queueIsEmpty():
|
||||||
sleep(0.2)
|
sleep(0.2)
|
||||||
if sel == 0:
|
if sel == 0:
|
||||||
loc = 0
|
loc = 0
|
||||||
|
@ -78,5 +78,5 @@ except KeyboardInterrupt:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
addSound("poweroff")
|
addSound("poweroff")
|
||||||
while not isQueueEmpty():
|
while not queueIsEmpty():
|
||||||
sleep(0.2)
|
sleep(0.2)
|
||||||
|
|
|
@ -122,7 +122,7 @@ def _playQueue():
|
||||||
sleep(0.02)
|
sleep(0.02)
|
||||||
|
|
||||||
|
|
||||||
def isQueueEmpty():
|
def queueIsEmpty():
|
||||||
"""
|
"""
|
||||||
Check if the sound queue is empty
|
Check if the sound queue is empty
|
||||||
"""
|
"""
|
||||||
|
@ -143,7 +143,7 @@ def soundTest():
|
||||||
addSound("poweroff")
|
addSound("poweroff")
|
||||||
addSound("poweroff")
|
addSound("poweroff")
|
||||||
global _soundQueue
|
global _soundQueue
|
||||||
while not isQueueEmpty():
|
while not queueIsEmpty():
|
||||||
sleep(0.2)
|
sleep(0.2)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue