From: Mark Tearle Date: Mon, 2 May 2005 10:06:43 +0000 (+0000) Subject: bug fixes X-Git-Tag: IMPORT-FROM-UCCCVS~37 X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=fb54b540bdce8da94ec98ff78b62e390c69f18aa;p=uccvend-vendserver.git bug fixes abstract out state changing mechanism text speed into contstant --- diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py index ce82535..19d3a30 100755 --- a/sql-edition/servers/VendServer.py +++ b/sql-edition/servers/VendServer.py @@ -53,6 +53,8 @@ STATE_GETTING_PIN = 5 STATE_GET_SELECTION = 6 STATE_GRANDFATHER_CLOCK = 7 +TEXT_SPEED = 0.8 + class DispenseDatabaseException(Exception): pass class DispenseDatabase: @@ -86,8 +88,8 @@ class DispenseDatabase: def scroll_options(username, mk, welcome = False): if welcome: - msg = [(center('WELCOME'), False, 0.8), - (center(username), False, 0.8)] + msg = [(center('WELCOME'), False, TEXT_SPEED), + (center(username), False, TEXT_SPEEd)] else: msg = [] choices = ' '*10+'CHOICES: ' @@ -252,6 +254,21 @@ class VendState: self.last_timeout_refresh = None + def change_state(self,newstate,newcounter=None): + if self.state != newstate: + #print "Changing state from: ", + #print self.state, + #print " to ", + #print newstate + self.state = newstate + + if newcounter is not None and self.counter != newcounter: + #print "Changing counter from: ", + #print self.counter, + #print " to ", + #print newcounter + self.counter = newcounter + def handle_tick_event(event, params, v, vstatus): @@ -293,7 +310,7 @@ def handle_get_selection_idle(state, event, params, v, vstatus): vstatus.cur_selection = '' idle_in(vstatus,2) - vstatus.state = STATE_IDLE + vstatus.change_state(STATE_IDLE) vstatus.mk.set_message(GREETING) @@ -330,7 +347,7 @@ def handle_get_selection_key(state, event, params, v, vstatus): vstatus.cur_selection = '' idle_in(vstatus,2) - vstatus.state = STATE_IDLE + vstatus.change_state(STATE_IDLE) vstatus.mk.set_messages( [(center('BYE!'), False, 1.5), @@ -400,7 +417,7 @@ def handle_getting_pin_key(state, event, params, v, vstatus): vstatus.mk.set_message(GREETING) idle_in(vstatus,5) - vstatus.state = STATE_IDLE + vstatus.change_state(STATE_IDLE) return vstatus.cur_pin = '' @@ -413,7 +430,7 @@ def handle_getting_pin_key(state, event, params, v, vstatus): if vstatus.username: v.beep(0, False) vstatus.cur_selection = '' - vstatus.state = STATE_GET_SELECTION + vstatus.change_state(STATE_GET_SELECTION) scroll_options(vstatus.username, vstatus.mk, True) return else: @@ -426,7 +443,7 @@ def handle_getting_pin_key(state, event, params, v, vstatus): vstatus.cur_pin = '' idle_in(vstatus,5) - vstatus.state = STATE_IDLE + vstatus.change_state(STATE_IDLE) return @@ -441,7 +458,7 @@ def handle_getting_uid_key(state, event, params, v, vstatus): vstatus.mk.set_message(GREETING) idle_in(vstatus,5) - vstatus.state = STATE_IDLE + vstatus.change_state(STATE_IDLE) return vstatus.cur_user += chr(key + ord('0')) @@ -458,7 +475,7 @@ def handle_getting_uid_key(state, event, params, v, vstatus): vstatus.cur_pin = '' idle_in(vstatus,5) - vstatus.state = STATE_IDLE + vstatus.change_state(STATE_IDLE) return @@ -466,7 +483,7 @@ def handle_getting_uid_key(state, event, params, v, vstatus): vstatus.cur_pin = '' vstatus.mk.set_message('PIN: ') logging.info('need pin for user %s'%vstatus.cur_user) - vstatus.state = STATE_GETTING_PIN + vstatus.change_state(STATE_GETTING_PIN) return @@ -482,7 +499,7 @@ def handle_idle_key(state, event, params, v, vstatus): choose_idler() return - vstatus.state = STATE_GETTING_UID + vstatus.change_state(STATE_GETTING_UID) run_handler(event, key, v, vstatus) @@ -504,9 +521,10 @@ def handle_idle_tick(state, event, params, v, vstatus): ### vstatus.mk.update_display() - - vstatus.state = STATE_GRANDFATHER_CLOCK + + vstatus.change_state(STATE_GRANDFATHER_CLOCK) run_handler(event, params, v, vstatus) + sleep(0.05) def beep_on(when, before=0): start = int(when - before) @@ -528,7 +546,7 @@ def handle_idle_grandfather_tick(state, event, params, v, vstatus): hourfromnow = localtime(time() + 3600) - #onthehour = mktime([now[0],now[1],now[2],now[3],27,0,now[6],now[7],now[8]]) + #onthehour = mktime([now[0],now[1],now[2],now[3],03,0,now[6],now[7],now[8]]) onthehour = mktime([hourfromnow[0],hourfromnow[1],hourfromnow[2],hourfromnow[3], \ 0,0,hourfromnow[6],hourfromnow[7],hourfromnow[8]]) @@ -539,11 +557,10 @@ def handle_idle_grandfather_tick(state, event, params, v, vstatus): or beep_on(quarterhour,0) \ or beep_on(threequarterhour,0) \ or beep_on(fivetothehour,0): - vstatus.state = STATE_GRANDFATHER_CLOCK - vstatus.counter = 2 + vstatus.change_state(STATE_GRANDFATHER_CLOCK,2) run_handler(event, params, v, vstatus) else: - vstatus.state = STATE_IDLE + vstatus.change_state(STATE_IDLE) def handle_grandfather_tick(state, event, params, v, vstatus): go_idle = 1 @@ -559,7 +576,7 @@ def handle_grandfather_tick(state, event, params, v, vstatus): hourfromnow = localtime(time() + 3600) - #onthehour = mktime([now[0],now[1],now[2],now[3],27,0,now[6],now[7],now[8]]) +# onthehour = mktime([now[0],now[1],now[2],now[3],03,0,now[6],now[7],now[8]]) onthehour = mktime([hourfromnow[0],hourfromnow[1],hourfromnow[2],hourfromnow[3], \ 0,0,hourfromnow[6],hourfromnow[7],hourfromnow[8]]) @@ -571,41 +588,47 @@ def handle_grandfather_tick(state, event, params, v, vstatus): next_hour=((hourfromnow[3] + 11) % 12) + 1 if onthehour - time() < next_hour and onthehour - time() > 0: v.beep(0, False) - msg.append((" DING!", False, None)) + + t = int(time()) + if (t % 2) == 0: + msg.append(("DING!", False, None)) + else: + msg.append((" DING!", False, None)) elif int(onthehour - time()) == 0: v.beep(255, False) - msg.append((" DING!", False, None)) - msg.append((" IT'S "+ str(next_hour) + "O'CLOCK AND ALL IS WELL .....", False, None)) + msg.append((" BONG!", False, None)) + msg.append((" IT'S "+ str(next_hour) + "O'CLOCK AND ALL IS WELL .....", False, TEXT_SPEED*4)) elif beep_on(halfhour,0): go_idle = 0 v.beep(0, False) - msg.append((" HALFHOUR ", False, None)) + msg.append((" HALFHOUR ", False, 50)) elif beep_on(quarterhour,0): go_idle = 0 v.beep(0, False) - msg.append((" QTR HOUR ", False, None)) + msg.append((" QTR HOUR ", False, 50)) elif beep_on(threequarterhour,0): go_idle = 0 v.beep(0, False) - msg.append((" 3 QTR HOUR ", False, None)) + msg.append((" 3 QTR HR ", False, 50)) elif beep_on(fivetothehour,0): go_idle = 0 v.beep(0, False) - msg.append(("Quick run to your lectures! Hurry! Hurry!", False, None)) + msg.append(("Quick run to your lectures! Hurry! Hurry!", False, TEXT_SPEED*4)) else: go_idle = 1 ## check for X seconds to the hour - - vstatus.mk.set_messages(msg) + + if len(msg): + vstatus.mk.set_messages(msg) + sleep(1) + vstatus.mk.update_display() - sleep(1) ## if no longer case, return to idle ## change idler to be clock if go_idle and vstatus.mk.done(): - vstatus.counter = 1 - vstatus.state = STATE_IDLE + vstatus.change_state(STATE_IDLE,1) def handle_door_idle(state, event, params, v, vstatus): # don't care right now. @@ -615,14 +638,14 @@ def handle_door_event(state, event, params, v, vstatus): vstatus.time_to_idle = None if params == 1: #door open - vstatus.state = STATE_DOOR_OPENING + vstatus.change_state(STATE_DOOR_OPENING) logging.warning("Entering open door mode") v.display("-FEED ME-") #door_open_mode(v); vstatus.cur_user = '' vstatus.cur_pin = '' elif params == 0: #door closed - vstatus.state = STATE_DOOR_CLOSING + vstatus.change_state(STATE_DOOR_CLOSING) idle_in(vstatus, 5) logging.warning('Leaving open door mode') @@ -634,11 +657,11 @@ def idle_in(vstatus,seconds): def return_to_idle(state,event,params,v,vstatus): if vstatus.time_to_idle is not None and time() > vstatus.time_to_idle: vstatus.mk.set_message(GREETING) - vstatus.state = STATE_IDLE + vstatus.change_state(STATE_IDLE) return if not vstatus.time_to_idle: vstatus.mk.set_message(GREETING) - vstatus.state = STATE_IDLE + vstatus.change_state(STATE_IDLE) return def create_state_table(vstatus): @@ -702,6 +725,8 @@ def run_forever(rfh, wfh, options, cf): # # ( return state - not currently implemented ) + vstatus.change_state(STATE_IDLE,1) + while True: if USE_DB: try: @@ -713,7 +738,6 @@ def run_forever(rfh, wfh, options, cf): e = v.next_event(0) (event, params) = e - vstatus.counter=1 run_handler(event, params, v, vstatus) # logging.debug('Got event: ' + repr(e))