Cynopolis/ABW-DEFIB2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed period bounds and period resolution math

Browse Source 
Fixed the bug where period bounds weren't being updated according to the sample_resolution parameter. Also artificially limited the period resolution to 1ms
This commit is contained in:
Quinn
2021-11-03 22:21:01 -05:00
parent 4341f022b6
commit 4e7eba68ce
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.cpp
View File

@@ -162,7 +162,7 @@ void setup() {
// Initialize timers and encoders // Initialize timers and encoders
amp_encoder.write(new_amp*4); amp_encoder.write(new_amp*4);
period_encoder.write(new_period*4); period_encoder.write(new_period*4/sample_resolution);
// Check single pulse status // Check single pulse status
single_fire_is_enabled = !digitalRead(single_pulse_enable_pin); single_fire_is_enabled = !digitalRead(single_pulse_enable_pin);
@@ -200,6 +200,7 @@ void loop() {
// Read in encoder values // Read in encoder values
new_amp = amp_encoder.read()/4; new_amp = amp_encoder.read()/4;
new_period = period_encoder.read()/4; new_period = period_encoder.read()/4;
new_period = new_period*sample_resolution;
// Check to see if any of the encoder values have changed. If they have, update their values. // Check to see if any of the encoder values have changed. If they have, update their values.
//Handles ampltidue encoder //Handles ampltidue encoder
@@ -237,12 +238,12 @@ void loop() {
// Make sure the value is within a valid range // Make sure the value is within a valid range
if(new_period > 20*sample_resolution){ if(new_period > 20*sample_resolution){
new_period = 20*sample_resolution; new_period = 20*sample_resolution;
period_encoder.write(new_period*4); period_encoder.write(20*4);
} }
//Anything less than three will cause errors //Anything less than three will cause errors
if(new_period < 4){ if(new_period < sample_resolution){
new_period = 4; new_period = sample_resolution;
period_encoder.write(new_period*4); period_encoder.write(sample_resolution);
} }
old_period = new_period; old_period = new_period;
//If serial is enabled, output some serial data //If serial is enabled, output some serial data