Klagarge/RealtimeOscilloscope
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

fix fs @100kHz

Browse Source
This commit is contained in:
Rémi Heredero
2024-01-16 16:17:59 +01:00
parent e0ea7d4cc2
commit 58e7081738
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/oscilloscopecontroller.cpp
View File

@@ -111,15 +111,15 @@ void Controller::onCheckBoxTriggerCheckState(bool checked)
void Controller::doShowAnalogSignal() {
/*
* 460px for 8 div
* 640px for 8 div
* fs = 100kHz => 100 samples/ms
* 500 us/div => 400 samples => scale = 400/460 = 0,870
* 1 ms/div => 800 samples => scale = 800/460 = 1,739
* 2 ms/div => 1600 samples => scale = 1600/460 = 3,478
* 5 ms/div => 4000 samples => scale = 4000/460 = 8,696
* 10 ms/div => 8000 samples => scale = 8000/460 = 17,391
* 500 us/div => 400 samples => scale = 400/640 = 0,625
* 1 ms/div => 800 samples => scale = 800/640 = 1,25
* 2 ms/div => 1600 samples => scale = 1600/640 = 2,5
* 5 ms/div => 4000 samples => scale = 4000/640 = 6,25
* 10 ms/div => 8000 samples => scale = 8000/640 = 12,5
*/
static float scales[7] = {0.87,0.87,1.739,3.478,8.696,17.391,17.391};
static float scales[7] = {0.625, 0.625, 1.25, 2.5, 6.25, 12.5, 12.5}; // tab for 100kHz
float scale = scales[this->_tdivValue];
gui().drawGraphPoints(_adcValuesBuffer, _adcValuesBufferSize, scale);
}