M-Labs
/
kirdy
3
0
Fork 1
Code Issues 11 Pull Requests Projects Releases Wiki Activity

Compare commits

base: M-Labs:3f9a4bf140cb7cc4978d32448073d76e2559d58a
Branches Tags
M-Labs:master
..
compare: M-Labs:98d577bed59f6cf71602a01c2daa58fa7a9d4bc6
Branches Tags
M-Labs:master

4 Commits
3f9a4bf140 ... 98d577bed5

Author SHA1 Message Date
linuswck 98d577bed5 main: allow loading flash without device settings 2024-07-25 18:36:58 +08:00
linuswck b84cf77805 ld_pwr_exc_protector: clear irq bit at pwr up 2024-07-25 18:36:58 +08:00
linuswck 49cff8e2a3 ld: cfg hardware when pd_mon params changes 2024-07-25 18:36:58 +08:00
linuswck 73796a4728 gui: move unit to ctrl panel params' titles 2024-07-25 18:36:41 +08:00
2 changed files with 7 additions and 9 deletions
Show Stats Expand all files Collapse all files

2
pykirdy/kirdy_qt.py
View File

@ -371,7 +371,7 @@ class MainWindow(QtWidgets.QMainWindow):
{'name': 'LD Power Limit', 'type': 'float', 'value': 0, 'step': 0.001, 'decimals': 6, 'limits': (0, float("inf")), {'name': 'LD Power Limit', 'type': 'float', 'value': 0, 'step': 0.001, 'decimals': 6, 'limits': (0, float("inf")),
'unit': 'mW', 'lock': False, 'target': 'laser', 'action': 'set_ld_pwr_limit'}, 'unit': 'mW', 'lock': False, 'target': 'laser', 'action': 'set_ld_pwr_limit'},
{'name': 'Responsitivity', 'type': 'float', 'value': 0, 'step': 0.001, 'decimals': 6, 'limits': (0, float("inf")), {'name': 'Responsitivity', 'type': 'float', 'value': 0, 'step': 0.001, 'decimals': 6, 'limits': (0, float("inf")),
'unit': 'mA/W', 'lock': False, 'target': 'laser', 'action': 'set_pd_mon_responsitivity'}, 'unit': 'mA/W', 'siPrefix': True, 'lock': False, 'target': 'laser', 'action': 'set_pd_mon_responsitivity'},
{'name': 'Dark Current', 'type': 'float', 'value': 0, 'step': 1, 'decimals': 6, 'limits': (0, float("inf")), {'name': 'Dark Current', 'type': 'float', 'value': 0, 'step': 1, 'decimals': 6, 'limits': (0, float("inf")),
'unit': 'uA', 'lock': False, 'target': 'laser', 'action': 'set_pd_mon_dark_current'}, 'unit': 'uA', 'lock': False, 'target': 'laser', 'action': 'set_pd_mon_dark_current'},
]}, ]},

14
src/laser_diode/ld_pwr_exc_protector.rs
View File

@ -211,14 +211,12 @@ impl LdPwrExcProtector {
pub fn pwr_on_and_arm_protection() { pub fn pwr_on_and_arm_protection() {
if let Some(ref mut wdg) = LdPwrExcProtector::get() { if let Some(ref mut wdg) = LdPwrExcProtector::get() {
if !wdg.alarm_status.pwr_excursion { wdg.alarm_status = Status::default();
wdg.alarm_status = Status::default(); LdPwrExcProtector::clear_interrupt_bit();
LdPwrExcProtector::clear_interrupt_bit(); LdPwrExcProtector::pwr_on();
LdPwrExcProtector::pwr_on(); // Interrupt should be enabled after power on to tackle the following edge case:
// Interrupt should be enabled after power on to tackle the following edge case: // Pd_Mon pin voltage has already exceed threshold before LD Power is on.
// Pd_Mon pin voltage has already exceed threshold before LD Power is on. LdPwrExcProtector::enable_watchdog_interrupt();
LdPwrExcProtector::enable_watchdog_interrupt();
}
} }
} }