Index: dialin/dg/events.py =================================================================== diff -u -rcb130637058af1a50ece54c74965099f3ac4a9b1 -r321d7ccfa940f25f70b97cd74916e9bd52141e52 --- dialin/dg/events.py (.../events.py) (revision cb130637058af1a50ece54c74965099f3ac4a9b1) +++ dialin/dg/events.py (.../events.py) (revision 321d7ccfa940f25f70b97cd74916e9bd52141e52) @@ -202,13 +202,13 @@ # Convert the event ID to enum event_state_name = DGEventList(event_id).name # Get the current timestamp and create a tuple of the current events - event_tuple = (datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f'), event_state_name, event_data_1, event_data_2) + event_tuple = (datetime.now().astimezone().strftime('%Y-%m-%d %H:%M:%S.%f'), event_state_name, event_data_1, event_data_2) # Check if the event state name is operation mode change. If it is, get the name of the operation modes # from the op modes enum class if event_state_name == DGEventList.DG_EVENT_OP_MODE_CHANGE.name: event_data_1 = DGOpModes(event_data_1).name event_data_2 = DGOpModes(event_data_2).name - event_tuple = (datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f'), event_state_name, event_data_1, event_data_2) + event_tuple = (datetime.now().astimezone().strftime('%Y-%m-%d %H:%M:%S.%f'), event_state_name, event_data_1, event_data_2) # Check if the event state name is sub mode change. elif event_state_name == DGEventList.DG_EVENT_SUB_MODE_CHANGE.name: # Get the length of the list of the op mode list @@ -221,7 +221,7 @@ else: # No op mode event has been recieved before the submode event was recieved. Use broadcast messages to # determine current op mode. Previous mode can not be known - last_op_tuple = (datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f'), + last_op_tuple = (datetime.now().astimezone().strftime('%Y-%m-%d %H:%M:%S.%f'), DGEventList.DG_EVENT_OP_MODE_CHANGE.name, DGEvents.UNKNOWN_STATE, DGOpModes(self.dg_event_op_mode).name) # Get the current and previous operation modes of the last tuple in the list of the sub modes @@ -277,7 +277,7 @@ previous_sub_mode_enum_class = self._dg_op_mode_2_sub_mode[previous_sub_mode] event_data_1 = previous_sub_mode_enum_class(event_data_1).name event_data_2 = current_sub_mode_enum_class(event_data_2).name - event_tuple = (datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f'), event_state_name, event_data_1, event_data_2) + event_tuple = (datetime.now().astimezone().strftime('%Y-%m-%d %H:%M:%S.%f'), event_state_name, event_data_1, event_data_2) elif event_state_name == DGEventList.DG_EVENT_OPERATION_STATUS.name: event_tuple = (time(), op_mode, sub_mode, sub_state) Index: dialin/hd/hd_events.py =================================================================== diff -u -rcb130637058af1a50ece54c74965099f3ac4a9b1 -r321d7ccfa940f25f70b97cd74916e9bd52141e52 --- dialin/hd/hd_events.py (.../hd_events.py) (revision cb130637058af1a50ece54c74965099f3ac4a9b1) +++ dialin/hd/hd_events.py (.../hd_events.py) (revision 321d7ccfa940f25f70b97cd74916e9bd52141e52) @@ -199,13 +199,13 @@ event_state_name = HDEventList(event_id).name # Get the current timestamp and create a tuple of the current events - event_tuple = (datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f'), event_state_name, event_data_1, event_data_2) + event_tuple = (datetime.now().astimezone().strftime('%Y-%m-%d %H:%M:%S.%f'), event_state_name, event_data_1, event_data_2) # Check if the event state name is operation mode change. If it is, get the name of the operation modes # from the op modes enum class if event_state_name == HDEventList.HD_EVENT_OP_MODE_CHANGE.name: event_data_1 = HDOpModes(event_data_1).name event_data_2 = HDOpModes(event_data_2).name - event_tuple = (datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f'), event_state_name, event_data_1, event_data_2) + event_tuple = (datetime.now().astimezone().strftime('%Y-%m-%d %H:%M:%S.%f'), event_state_name, event_data_1, event_data_2) # Check if the event state name is sub mode change. elif event_state_name == HDEventList.HD_EVENT_SUB_MODE_CHANGE.name: # Get the length of the list of the op mode list @@ -218,7 +218,7 @@ else: # No op mode event has been recieved before the submode event was recieved. Use broadcast messages to # determine current op mode. Previous mode can not be known - last_op_tuple = (datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f'), + last_op_tuple = (datetime.now().astimezone().strftime('%Y-%m-%d %H:%M:%S.%f'), HDEventList.HD_EVENT_OP_MODE_CHANGE.name, HDEvents.UNKNOWN_STATE, HDOpModes(self.hd_event_op_mode).name) @@ -276,7 +276,7 @@ previous_sub_mode_enum_class = self._hd_op_mode_2_sub_mode[previous_sub_mode] event_data_1 = previous_sub_mode_enum_class(event_data_1).name event_data_2 = current_sub_mode_enum_class(event_data_2).name - event_tuple = (datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f'), event_state_name, event_data_1, event_data_2) + event_tuple = (datetime.now().astimezone().strftime('%Y-%m-%d %H:%M:%S.%f'), event_state_name, event_data_1, event_data_2) elif event_state_name == HDEventList.HD_EVENT_OPERATION_STATUS.name: event_tuple = (time(), op_mode, sub_mode, sub_state, fourth_state)