Commit 51ab19e
committed
Handle camera trigger defaults & trigger-aware startup
Populate gentl trigger defaults on save and allow saving configs with empty DLCLive model path. Add _with_camera_defaults_for_save to ensure CameraTriggerSettings are present for gentl cameras and thread through allow_empty_model_path in _dlc_settings_from_ui/_current_config so configs can be saved without a model while preserving existing DLC fields.
Improve multi-camera runtime robustness: treat TimeoutError from hardware-trigger backends as an expected 'no trigger' event (don't count as a camera failure) and add _trigger_role_from_settings/_camera_start_priority helpers. Start active cameras sorted by trigger role so trigger-waiting (external/follower) devices are armed before masters. Also extend DLCLive configuration error handling to include RuntimeError.1 parent 97fa138 commit 51ab19e
2 files changed
Lines changed: 104 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
| 59 | + | |
59 | 60 | | |
60 | 61 | | |
61 | 62 | | |
| |||
854 | 855 | | |
855 | 856 | | |
856 | 857 | | |
857 | | - | |
| 858 | + | |
| 859 | + | |
| 860 | + | |
| 861 | + | |
| 862 | + | |
| 863 | + | |
| 864 | + | |
| 865 | + | |
| 866 | + | |
| 867 | + | |
| 868 | + | |
| 869 | + | |
| 870 | + | |
| 871 | + | |
| 872 | + | |
| 873 | + | |
| 874 | + | |
| 875 | + | |
| 876 | + | |
| 877 | + | |
| 878 | + | |
858 | 879 | | |
| 880 | + | |
859 | 881 | | |
860 | 882 | | |
861 | 883 | | |
862 | 884 | | |
863 | 885 | | |
864 | | - | |
865 | | - | |
| 886 | + | |
| 887 | + | |
866 | 888 | | |
867 | 889 | | |
868 | 890 | | |
| |||
874 | 896 | | |
875 | 897 | | |
876 | 898 | | |
877 | | - | |
| 899 | + | |
878 | 900 | | |
879 | 901 | | |
880 | 902 | | |
881 | 903 | | |
882 | 904 | | |
883 | | - | |
| 905 | + | |
| 906 | + | |
| 907 | + | |
| 908 | + | |
| 909 | + | |
| 910 | + | |
| 911 | + | |
| 912 | + | |
| 913 | + | |
| 914 | + | |
| 915 | + | |
| 916 | + | |
884 | 917 | | |
885 | 918 | | |
886 | 919 | | |
| |||
965 | 998 | | |
966 | 999 | | |
967 | 1000 | | |
968 | | - | |
| 1001 | + | |
969 | 1002 | | |
970 | 1003 | | |
971 | 1004 | | |
| |||
1611 | 1644 | | |
1612 | 1645 | | |
1613 | 1646 | | |
1614 | | - | |
| 1647 | + | |
1615 | 1648 | | |
1616 | 1649 | | |
1617 | 1650 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
99 | 99 | | |
100 | 100 | | |
101 | 101 | | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
102 | 125 | | |
103 | 126 | | |
104 | 127 | | |
| |||
138 | 161 | | |
139 | 162 | | |
140 | 163 | | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
141 | 204 | | |
142 | 205 | | |
143 | 206 | | |
| |||
180 | 243 | | |
181 | 244 | | |
182 | 245 | | |
| 246 | + | |
183 | 247 | | |
184 | 248 | | |
185 | 249 | | |
| |||
0 commit comments