Merge branch 'ui_dev' into test_UI_new_state_machines_merge
Branches test_UI_new_state_machines_merge
Showing
- NativeUI/NativeUI.py 67 additions, 11 deletionsNativeUI/NativeUI.py
- NativeUI/alarm_widgets/alarm_popup.py 34 additions, 28 deletionsNativeUI/alarm_widgets/alarm_popup.py
- NativeUI/alarm_widgets/alarm_table.py 25 additions, 38 deletionsNativeUI/alarm_widgets/alarm_table.py
- NativeUI/configs/clinical_config.json 1 addition, 1 deletionNativeUI/configs/clinical_config.json
- NativeUI/configs/colors.json 10 additions, 10 deletionsNativeUI/configs/colors.json
- NativeUI/configs/mode_config.json 2 additions, 2 deletionsNativeUI/configs/mode_config.json
- NativeUI/global_widgets/global_send_popup.py 18 additions, 14 deletionsNativeUI/global_widgets/global_send_popup.py
- NativeUI/global_widgets/global_typeval_popup.py 12 additions, 9 deletionsNativeUI/global_widgets/global_typeval_popup.py
- NativeUI/global_widgets/tab_modeswitch_button.py 34 additions, 68 deletionsNativeUI/global_widgets/tab_modeswitch_button.py
- NativeUI/mode_widgets/clinical_handler.py 7 additions, 0 deletionsNativeUI/mode_widgets/clinical_handler.py
- NativeUI/mode_widgets/mode_handler.py 17 additions, 1 deletionNativeUI/mode_widgets/mode_handler.py
- NativeUI/ui_layout.py 8 additions, 7 deletionsNativeUI/ui_layout.py
- NativeUI/ui_widgets.py 10 additions, 8 deletionsNativeUI/ui_widgets.py
- NativeUI/widget_library/expert_handler.py 3 additions, 0 deletionsNativeUI/widget_library/expert_handler.py
- NativeUI/widget_library/page_buttons_widget.py 23 additions, 33 deletionsNativeUI/widget_library/page_buttons_widget.py
- NativeUI/widget_library/plot_widget.py 7 additions, 7 deletionsNativeUI/widget_library/plot_widget.py
- NativeUI/widget_library/spin_buttons_widget.py 0 additions, 1 deletionNativeUI/widget_library/spin_buttons_widget.py
- NativeUI/widget_library/switchable_stack_widget.py 6 additions, 1 deletionNativeUI/widget_library/switchable_stack_widget.py
- raspberry-dataserver/CommsCommon.py 17 additions, 0 deletionsraspberry-dataserver/CommsCommon.py
- raspberry-dataserver/hevserver.py 123 additions, 67 deletionsraspberry-dataserver/hevserver.py
Please register or sign in to comment