atse/thermostat
1
0
Fork 0
forked from M-Labs/thermostat
Code Issues Pull Requests Activity

Compare commits

base: atse:c0bddc03b9c58cf82a6bfb20de1ce0447d819638
Branches Tags
atse:master
atse:GUI
atse:improve-pyproject-metadata
atse:flake-dev-conveniences
atse:readme-resistive-heater-guide
atse:GUI-ultimate-rebased
atse:dev-gui-rebased
atse:correct-clock
atse:readme-clamped-pwm-units
atse:gui_dev-ctrl_panel
atse:GUI-gui_dev-ctrl_panel
atse:readme-pid-limits-units
atse:GUI-rebased
atse:gui_dev-fix_asyncio
atse:uom-constants
atse:dev
atse:remove-pub
atse:pre-commit_hooks
atse:feature/show-firmware-ver
atse:command_parser_refactor
atse:no-tec_i-reads-pre-3.0
atse:calibration
atse:softspi
M-Labs:master
M-Labs:dev-gui
M-Labs:GUI
M-Labs:softspi
..
compare: atse:45129be83685d731ff0566e9d335ab74ff1b77da
Branches Tags
atse:GUI
atse:improve-pyproject-metadata
atse:master
atse:flake-dev-conveniences
atse:readme-resistive-heater-guide
atse:GUI-ultimate-rebased
atse:dev-gui-rebased
atse:correct-clock
atse:readme-clamped-pwm-units
atse:gui_dev-ctrl_panel
atse:GUI-gui_dev-ctrl_panel
atse:readme-pid-limits-units
atse:GUI-rebased
atse:gui_dev-fix_asyncio
atse:uom-constants
atse:dev
atse:remove-pub
atse:pre-commit_hooks
atse:feature/show-firmware-ver
atse:command_parser_refactor
atse:no-tec_i-reads-pre-3.0
atse:calibration
atse:softspi
M-Labs:master
M-Labs:dev-gui
M-Labs:GUI
M-Labs:softspi

3 Commits
c0bddc03b9 ... 45129be836

Author SHA1 Message Date
atse
45129be836 PwmLimits: Save user set value into flash 
In place of the machine values derived from the PWM duty / center point
calculations
 2024-08-15 17:08:35 +08:00
atse
227a157e9e README: Document PWM value clamping 2024-08-15 17:08:35 +08:00
atse
e34196267b PwmSummary: Show set value instead of max 
Show in summary the set value, before all PWM duty calculations instead
of the maximum value.

Putting the maximum in PwmSummary has little use - the maximum never
changes throughout the runtime of the firmware and can be replaced by
documentation elsewhere.
 2024-08-15 17:08:35 +08:00
1 changed files with 6 additions and 3 deletions
Show Stats Expand all files Collapse all files

9
src/channels.rs
View File

@ -444,7 +444,8 @@ impl Channels {
pub fn set_max_v(&mut self, channel: usize, max_v: ElectricPotential) -> (ElectricPotential, ElectricPotential) { pub fn set_max_v(&mut self, channel: usize, max_v: ElectricPotential) -> (ElectricPotential, ElectricPotential) {
let max = 4.0 * ElectricPotential::new::<volt>(3.3); let max = 4.0 * ElectricPotential::new::<volt>(3.3);
let duty = (max_v.min(MAX_TEC_V).max(ElectricPotential::zero()) / max).get::<ratio>(); let max_v = max_v.min(MAX_TEC_V).max(ElectricPotential::zero());
let duty = (max_v / max).get::<ratio>();
let duty = self.set_pwm(channel, PwmPin::MaxV, duty); let duty = self.set_pwm(channel, PwmPin::MaxV, duty);
self.channel_state(channel).pwm_limits.max_v = max_v.get::<volt>(); self.channel_state(channel).pwm_limits.max_v = max_v.get::<volt>();
(duty * max, max) (duty * max, max)
@ -452,7 +453,8 @@ impl Channels {
pub fn set_max_i_pos(&mut self, channel: usize, max_i_pos: ElectricCurrent) -> (ElectricCurrent, ElectricCurrent) { pub fn set_max_i_pos(&mut self, channel: usize, max_i_pos: ElectricCurrent) -> (ElectricCurrent, ElectricCurrent) {
let max = ElectricCurrent::new::<ampere>(3.0); let max = ElectricCurrent::new::<ampere>(3.0);
let duty = (max_i_pos.min(MAX_TEC_I).max(ElectricCurrent::zero()) / max).get::<ratio>(); let max_i_pos = max_i_pos.min(MAX_TEC_I).max(ElectricCurrent::zero());
let duty = (max_i_pos / max).get::<ratio>();
let duty = self.set_pwm(channel, PwmPin::MaxIPos, duty); let duty = self.set_pwm(channel, PwmPin::MaxIPos, duty);
self.channel_state(channel).pwm_limits.max_i_pos = max_i_pos.get::<ampere>(); self.channel_state(channel).pwm_limits.max_i_pos = max_i_pos.get::<ampere>();
(duty * max, max) (duty * max, max)
@ -460,7 +462,8 @@ impl Channels {
pub fn set_max_i_neg(&mut self, channel: usize, max_i_neg: ElectricCurrent) -> (ElectricCurrent, ElectricCurrent) { pub fn set_max_i_neg(&mut self, channel: usize, max_i_neg: ElectricCurrent) -> (ElectricCurrent, ElectricCurrent) {
let max = ElectricCurrent::new::<ampere>(3.0); let max = ElectricCurrent::new::<ampere>(3.0);
let duty = (max_i_neg.min(MAX_TEC_I).max(ElectricCurrent::zero()) / max).get::<ratio>(); let max_i_neg = max_i_neg.min(MAX_TEC_I).max(ElectricCurrent::zero());
let duty = (max_i_neg / max).get::<ratio>();
let duty = self.set_pwm(channel, PwmPin::MaxINeg, duty); let duty = self.set_pwm(channel, PwmPin::MaxINeg, duty);
self.channel_state(channel).pwm_limits.max_i_neg = max_i_neg.get::<ampere>(); self.channel_state(channel).pwm_limits.max_i_neg = max_i_neg.get::<ampere>();
(duty * max, max) (duty * max, max)