fixed sample rate issues; up to 88kS/s

3 files changed, 10 insertions, 8 deletions

diff --git a/source/adc.cpp b/source/adc.cpp
index c28c38f..6e02dde 100644
--- a/source/adc.cpp
+++ b/source/adc.cpp
@@ -29,7 +29,7 @@ static ADCConversionGroup adc_group_config = {
     .cfgr2 = 0,
     .tr1 = ADC_TR(0, 4095),
     .smpr = {
-        ADC_SMPR1_SMP_AN5(ADC_SMPR_SMP_2P5), 0
+        ADC_SMPR1_SMP_AN5(ADC_SMPR_SMP_12P5), 0
     },
     .sqr = {
         ADC_SQR1_SQ1_N(ADC_CHANNEL_IN5),
@@ -38,7 +38,7 @@ static ADCConversionGroup adc_group_config = {
 };
 
 constexpr static const GPTConfig gpt_config = {
-    .frequency = 600000,
+    .frequency = 8000000,
     .callback = nullptr,
     .cr2 = TIM_CR2_MMS_1, /* TRGO */
     .dier = 0
@@ -65,7 +65,7 @@ namespace adc
         adc_is_read_finished = false;
         adc_group_config.circular = false;
         adcStartConversion(adcd, &adc_group_config, buffer, count);
-        gptStartContinuous(gptd, 5);
+        gptStartContinuous(gptd, 2);
         while (!adc_is_read_finished);
         return buffer;
     }
@@ -77,7 +77,7 @@ namespace adc
         adc_operation_func = operation_func;
         adc_group_config.circular = true;
         adcStartConversion(adcd, &adc_group_config, buffer, count);
-        gptStartContinuous(gptd, 5);
+        gptStartContinuous(gptd, 2);
     }
 
     void read_set_operation_func(operation_t operation_func)
@@ -113,7 +113,7 @@ namespace adc
             val = ADC_SMPR1_SMP_AN5(ADC_SMPR_SMP_24P5);
             break;
         case rate::R47P5:
-            val = ADC_SMPR1_SMP_AN5(ADC_SMPR_SMP_47P5);
+            val = ADC_SMPR1_SMP_AN5(ADC_SMPR_SMP_47P5);////
             break;
         case rate::R92P5:
             val = ADC_SMPR1_SMP_AN5(ADC_SMPR_SMP_92P5);
diff --git a/source/dac.cpp b/source/dac.cpp
index 9f5e457..e0f62a5 100644
--- a/source/dac.cpp
+++ b/source/dac.cpp
@@ -28,7 +28,7 @@ constexpr static const DACConversionGroup dac_group_config = {
 };
 
 constexpr static const GPTConfig gpt_config = {
-  .frequency = 600000,
+  .frequency = 440000,
   .callback = nullptr,
   .cr2 = TIM_CR2_MMS_1, /* TRGO */
   .dier = 0
diff --git a/source/main.cpp b/source/main.cpp
index 800005c..9dcd72f 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -19,7 +19,7 @@
 
 #include <array>
 
-constexpr unsigned int MAX_SAMPLE_BUFFER_SIZE = 2048;
+constexpr unsigned int MAX_SAMPLE_BUFFER_SIZE = 8000;//2048;
 
 enum class RunStatus : char
 {
@@ -54,7 +54,7 @@ CC_ALIGN(CACHE_LINE_SIZE)
 #endif
 static std::array<dacsample_t, CACHE_SIZE_ALIGN(dacsample_t, MAX_SAMPLE_BUFFER_SIZE)> dac_samples;
 
-static uint8_t elf_file_store[8192];
+static uint8_t elf_file_store[12288];
 static elf::entry_t elf_entry = nullptr;
 
 static void signal_operate(adcsample_t *buffer, size_t count);
@@ -161,6 +161,8 @@ void main_loop()
                     if (unsigned int binarySize = cmd[1] | (cmd[2] << 8); binarySize < sizeof(elf_file_store)) {
                         usbserial::read(elf_file_store, binarySize);
                         elf_entry = elf::load(elf_file_store);
+                    } else {
+                        elf_entry = nullptr;
                     }
                     break;