diff options
| author | Clyne Sullivan <clyne@bitgloo.com> | 2020-10-20 20:14:08 -0400 |
|---|---|---|
| committer | Clyne Sullivan <clyne@bitgloo.com> | 2020-10-20 20:14:08 -0400 |
| commit | ee274be303987c28fd26e88411378557f1ff566b (patch) | |
| tree | 082be80436ac4402d1b2fa30a53a46230c3cb179 /source | |
| parent | 30cd119dba0e2caf48b6bf5016f60dcede62f511 (diff) | |
firmware can port to L432KC; gui: edit buffer size
Diffstat (limited to 'source')
| -rw-r--r-- | source/adc.cpp | 2 | ||||
| -rw-r--r-- | source/main.cpp | 40 |
2 files changed, 20 insertions, 22 deletions
diff --git a/source/adc.cpp b/source/adc.cpp index 6c1af7b..84620a2 100644 --- a/source/adc.cpp +++ b/source/adc.cpp @@ -12,7 +12,7 @@ #include "adc.hpp" constexpr static const auto adcd = &ADCD1; -constexpr static const auto gptd = &GPTD4; +constexpr static const auto gptd = &GPTD7; constexpr static const ADCConfig adc_config = { .difsel = 0 diff --git a/source/main.cpp b/source/main.cpp index 63bd66b..7a55b6c 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -19,7 +19,7 @@ #include <array> -constexpr unsigned int MAX_ELF_FILE_SIZE = 12 * 1024; +constexpr unsigned int MAX_ELF_FILE_SIZE = 8 * 1024; constexpr unsigned int MAX_ERROR_QUEUE_SIZE = 8; constexpr unsigned int MAX_SAMPLE_BUFFER_SIZE = 8000; @@ -118,8 +118,8 @@ int main() static unsigned int dac_sample_count = MAX_SAMPLE_BUFFER_SIZE; static unsigned int dac2_sample_count = MAX_SAMPLE_BUFFER_SIZE; static unsigned int adc_sample_count = MAX_SAMPLE_BUFFER_SIZE; -static bool adc_preloaded = false; -static bool dac_preloaded = false; +//static bool adc_preloaded = false; +//static bool dac_preloaded = false; void main_loop() { @@ -138,8 +138,6 @@ void main_loop() usbserial::read(&adc_samples[0], adc_sample_count * sizeof(adcsample_t)); break; - case 'b': - break; case 'B': if (run_status == RunStatus::Idle) { if (usbserial::read(&cmd[1], 2) == 2) { @@ -225,9 +223,9 @@ void main_loop() if (run_status == RunStatus::Idle) { run_status = RunStatus::Running; dac_samples.fill(0); - if (!adc_preloaded) + //if (!adc_preloaded) adc::read_start(signal_operate_measure, &adc_samples[0], adc_sample_count); - if (!dac_preloaded) + //if (!dac_preloaded) dac::write_start(0, &dac_samples[0], dac_sample_count); } else { error_queue_add(Error::NotIdle); @@ -246,30 +244,30 @@ void main_loop() if (run_status == RunStatus::Idle) { run_status = RunStatus::Running; dac_samples.fill(0); - if (!adc_preloaded) + //if (!adc_preloaded) adc::read_start(signal_operate, &adc_samples[0], adc_sample_count); - if (!dac_preloaded) + //if (!dac_preloaded) dac::write_start(0, &dac_samples[0], dac_sample_count); } else { error_queue_add(Error::NotIdle); } break; - case 'r': - if (usbserial::read(&cmd[1], 1) == 1) { - adc_preloaded = cmd[1] & (1 << 0); - dac_preloaded = cmd[1] & (1 << 1); - } else { - error_queue_add(Error::BadParamSize); - } - break; + //case 'r': + // if (usbserial::read(&cmd[1], 1) == 1) { + // adc_preloaded = cmd[1] & (1 << 0); + // dac_preloaded = cmd[1] & (1 << 1); + // } else { + // error_queue_add(Error::BadParamSize); + // } + // break; // 'S' - Stops the continuous sampling/conversion. case 'S': if (run_status == RunStatus::Running) { - if (!dac_preloaded) + //if (!dac_preloaded) dac::write_stop(0); - if (!adc_preloaded) + //if (!adc_preloaded) adc::read_stop(); run_status = RunStatus::Idle; } @@ -295,9 +293,9 @@ void main_loop() void conversion_abort() { elf_entry = nullptr; - if (!dac_preloaded) + //if (!dac_preloaded) dac::write_stop(0); - if (!adc_preloaded) + //if (!adc_preloaded) adc::read_stop(); error_queue_add(Error::ConversionAborted); } |