diff --git a/_device_main.py b/_device_main.py index a1e5f47..4fa229e 100644 --- a/_device_main.py +++ b/_device_main.py @@ -439,6 +439,8 @@ if __name__ == "__main__": window['-DateTime-'].update(data['datetime'].strftime('%d-%m-%Y %H:%M:%S:%f')[:-3]) window['-TTerm1-'].update('T терм 1: '+shorten(data['Temp_Ext_1'])+' C') window['-TTerm2-'].update('T терм 2: '+shorten(data['Temp_Ext_2'])+' C') + window['-I1_PANEL-'].update('I1: '+shorten(data['I1'])+' мА') + window['-I2_PANEL-'].update('I2: '+shorten(data['I2'])+' мА') window['-3V3-'].update('3V3: '+shorten(data['MON_3V3'])+' В') window['-5V1-'].update('5V1: '+shorten(data['MON_5V1'])+' В') window['-5V2-'].update('5V2: '+shorten(data['MON_5V2'])+' В') @@ -466,4 +468,3 @@ if __name__ == "__main__": dev.close_connection(prt) - diff --git a/gui.py b/gui.py index f651a1b..7b3772f 100644 --- a/gui.py +++ b/gui.py @@ -205,7 +205,8 @@ def setup_gui(params): [sg.HSeparator(pad=(25,10))], [sg.Text('', size=((3 if COMPACT_LAYOUT else 7),1)), - sg.Text('T терм 1:', size=(VOLTAGE_TEXT_WIDTH,1), key='-TTerm1-'), sg.Text('T терм 2:', size=(VOLTAGE_TEXT_WIDTH,1), key='-TTerm2-'), + sg.Text('T терм 1:', size=(VOLTAGE_TEXT_WIDTH,1), key='-TTerm1-'), sg.Text('T терм 2:', size=(VOLTAGE_TEXT_WIDTH,1), key='-TTerm2-'), + sg.Text('I1:', size=(VOLTAGE_TEXT_WIDTH,1), key='-I1_PANEL-'), sg.Text('I2:', size=(VOLTAGE_TEXT_WIDTH,1), key='-I2_PANEL-'), sg.Text('3V3:', size=(VOLTAGE_TEXT_WIDTH,1), key='-3V3-'), sg.Text('5V1:', size=(VOLTAGE_TEXT_WIDTH,1), key='-5V1-'), sg.Text('5V2:', size=(VOLTAGE_TEXT_WIDTH,1), key='-5V2-'), sg.Text('7V0:', size=(VOLTAGE_TEXT_WIDTH,1), key='-7V0-'), sg.Push(), sg.Text('', key='-DateTime-', pad=(1,10)),