Index: DG/DG_Firmware_Simulator.py =================================================================== diff -u -r68137f3ef7ad8dac0e1209b50272ba613543e2d9 -r0a66cef524a41670eed7b9204163bb9634a2f919 --- DG/DG_Firmware_Simulator.py (.../DG_Firmware_Simulator.py) (revision 68137f3ef7ad8dac0e1209b50272ba613543e2d9) +++ DG/DG_Firmware_Simulator.py (.../DG_Firmware_Simulator.py) (revision 0a66cef524a41670eed7b9204163bb9634a2f919) @@ -4,7 +4,6 @@ dialin_messenger = DenaliCanMessenger() # Building response message - response_msg = DenaliMessage.build_message(channel_id=DenaliChannels.dg_to_hd_ch_id, message_id=1000, payload=[1]) Index: DG/DialysateGenerator.py =================================================================== diff -u -r68137f3ef7ad8dac0e1209b50272ba613543e2d9 -r0a66cef524a41670eed7b9204163bb9634a2f919 --- DG/DialysateGenerator.py (.../DialysateGenerator.py) (revision 68137f3ef7ad8dac0e1209b50272ba613543e2d9) +++ DG/DialysateGenerator.py (.../DialysateGenerator.py) (revision 0a66cef524a41670eed7b9204163bb9634a2f919) @@ -1,14 +1,14 @@ ########################################################################### # -# Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved. +# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. # # THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN # WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. # # @file DialysateGenerator.py # -# @date 16-Oct-2019 -# @author L. Baloa +# @date 31-Mar-2019 +# @author P. Lucia # # @brief This class allows sending to and receiving from the DG device. # Index: DialIn/CoreCANProtocol.py =================================================================== diff -u -r68137f3ef7ad8dac0e1209b50272ba613543e2d9 -r0a66cef524a41670eed7b9204163bb9634a2f919 --- DialIn/CoreCANProtocol.py (.../CoreCANProtocol.py) (revision 68137f3ef7ad8dac0e1209b50272ba613543e2d9) +++ DialIn/CoreCANProtocol.py (.../CoreCANProtocol.py) (revision 0a66cef524a41670eed7b9204163bb9634a2f919) @@ -1,14 +1,14 @@ ########################################################################### # -# Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved. +# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. # # THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN # WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. # # @file CoreCANProtocol.py # -# @date 25-Mar-2020 -# @authors L. Baloa, P. Lucia +# @date 31-Mar-2020 +# @author P. Lucia # # @brief Classes in this file facilitate sending and receiving of Denali Messages over CAN # @@ -265,7 +265,11 @@ class DenaliChannels: - # All the available channels + """ + Convenience class listing all the possible CAN channels used in the denali system. + Updates made to the "Message List.xlsx" document found in the Diality Software Team SharePoint, + specifically in the CAN Channels sheet, should also be applied here. + """ hd_alarm_broadcast_ch_id = 0x001 dg_alarm_broadcast_ch_id = 0x002 @@ -274,6 +278,7 @@ dg_to_hd_ch_id = 0x010 hd_to_ui_ch_id = 0x020 hd_sync_broadcast_ch_id = 0x040 + dg_to_ui_ch_id = 0x070 dg_sync_broadcast_ch_id = 0x080 ui_to_hd_ch_id = 0x100 ui_sync_broadcast_ch_id = 0x200