Revert "Experiments with CV tester"

This reverts commit f660aec.
timchurches · May 2, 2015 · cfcc896 · cfcc896
1 parent f660aec
commit cfcc896
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/braids/braids.cc b/braids/braids.cc
@@ -127,7 +127,7 @@ void TIM1_UP_IRQHandler(void) {
 
   bool adc_scan_cycle_complete = adc.PipelinedScan();
   if (adc_scan_cycle_complete) {
-    // ui.UpdateCv(adc.channel(0), adc.channel(1), adc.channel(2), adc.channel(3));
+    ui.UpdateCv(adc.channel(0), adc.channel(1), adc.channel(2), adc.channel(3));
     if (trigger_detected_flag) {
       trigger_delay = settings.trig_delay()
           ? (1 << settings.trig_delay()) : 0;
@@ -884,11 +884,7 @@ void RenderBlock() {
      sample_rate_value -= settings.adc_to_fm(adc.channel(3)) >> 9;
      sample_rate_value = ParamClip(sample_rate_value, static_cast<uint8_t>(0), static_cast<uint8_t>(6));
   }
-
-  // Update CV tester values
-  ui.UpdateCv(adc.channel(0), adc.channel(1), ad_value, ad2_value);
-
-
+
   // Copy to DAC buffer with sample rate and bit reduction applied.
   int16_t sample = 0;
   size_t decimation_factor = decimation_factors[sample_rate_value];  

diff --git a/braids/ui.cc b/braids/ui.cc
@@ -116,8 +116,7 @@ void Ui::RefreshDisplay() {
           char text[] = "    ";
           if (!blink_) {
             for (uint8_t i = 0; i < kDisplayWidth; ++i) {
-              // text[i] = '\x90' + (cv_[i] * 7 >> 12);
-              text[i] = '\x90' + (cv_[i] * 7 >> 17);
+              text[i] = '\x90' + (cv_[i] * 7 >> 12);
             }
           }
           display_.Print(text);