diff --git a/mesh_bot.py b/mesh_bot.py index 5646cdc..f879058 100755 --- a/mesh_bot.py +++ b/mesh_bot.py @@ -211,7 +211,8 @@ def handleDopeWars(nodeID, message, rxNode): else: logger.debug("System: DopeWars: last_cmd: " + str(last_cmd)) msg = playDopeWars(nodeID, message) - + # wait a second to keep from message collision + time.sleep(1) return msg def handleLemonade(nodeID, message): @@ -237,7 +238,8 @@ def handleLemonade(nodeID, message): create_player(nodeID) msg = start_lemonade(nodeID=nodeID, message=message, celsius=False) - + # wait a second to keep from message collision + time.sleep(1) return msg def handle_wxc(message_from_id, deviceID, cmd): diff --git a/modules/lemonade.py b/modules/lemonade.py index 32dbc61..a0d7f18 100644 --- a/modules/lemonade.py +++ b/modules/lemonade.py @@ -469,7 +469,7 @@ def start_lemonade(nodeID, message, celsius=False): total = 0 msg += "\nWeekly Summary" for i in range(len(weeks.summary)): - msg += " Week " + str(i + 1).rjust(pad_week) + ": " + str(weeks.summary[i]['sales']).rjust(pad_sale) + \ + msg += " Week " + str(weeks.current).rjust(pad_week) + ": " + str(weeks.summary[i]['sales']).rjust(pad_sale) + \ " sold x " + locale.currency(weeks.summary[i]['price'], grouping=True) + " ea." total = total + weeks.summary[i]['sales']