still WIP, but kinda working better

Author: doctea

include/ParameterManager.h

@@ -663,17 +663,17 @@ class ParameterManager {
                     continue;
                 float v = p->getLastModulatedNormalValue();
                 int pos = constrain((float)columns * v, 0, columns-1);
-                line[pos] = '0' + i;
+                line[pos] = '0' +  (i % '9');
             }
 
-            for (uint_fast8_t i = 0 ; i < this->available_inputs->size() ; i++) {
+            /*for (uint_fast8_t i = 0 ; i < this->available_inputs->size() ; i++) {
                 BaseParameterInput *p = this->available_inputs->get(i);
                 //if (strcmp(p->label,"None")==0)
                 //    continue;
                 float v = p->get_normal_value_unipolar();
                 int pos = constrain((float)(columns * v), 0, columns-1);
                 line[pos] = 'A' + i;
-            }
+            }*/
 
             Serial.printf(line);
 

include/parameter_inputs/ThresholdToggleParameterInput.h

@@ -29,6 +29,11 @@ class ThresholdToggleParameterInput : public VoltageParameterInput {
         virtual void read() override {
             //Serial.printf("ThresholdToggleParameterInput::read() %s\n", this->name);
             float readValue = this->voltage_source->get_voltage_normal();
+            if (inverted) {
+                readValue = 1.0f - readValue;
+            }
+
+            if (this->debug) Serial.printf("ThresholdToggleParameterInput::read() %s readValue %f\n", this->name, readValue);
 
             if (firstRun || this->is_significant_change(readValue, this->lastValue)) {
                 this->lastValue = readValue;

include/parameters/Parameter.h

@@ -892,12 +892,18 @@ class DataParameterBase : public FloatParameter {
             float constrained_value = this->constrainNormal(value);
             this->lastModulatedNormalValue = constrained_value;
             //this->lastOutputNormalValue = this->lastModulatedNormalValue; // = value;
-            if (debug && Serial) Serial.printf("%s#setTargetValueFromNormal(%3.3f) got modulated value %3.3f, ", this->label, value, constrained_value);
+            if (debug && Serial) { 
+                Serial.printf("%s#setTargetValueFromNormal(%3.3f) got modulated value %3.3f, ", this->label, value, constrained_value);
+                Serial.flush();
+            }
 
             float slewed_value = constrained_value;
             if (slewing || lastModulatedNormalValue!=lastOutputNormalValue) {
                 slewed_value = this->get_slewed_value(constrained_value);
-                if (this->debug && Serial) Serial.printf("%s:\tslewed from\t%3.3f\tto %3.3f\n", this->label, constrained_value, slewed_value);
+                if (this->debug && Serial) {
+                    Serial.printf("%s:\tslewed from\t%3.3f\tto %3.3f\n", this->label, constrained_value, slewed_value);
+                    Serial.flush();
+                }
             }
 
             //float slewed_value = this->get_slewed_value(constrained_value);          

include/voltage_sources/PicoSDKADCVoltageSource.h

@@ -149,6 +149,12 @@ class ComputerCardVoltageSource : public WorkshopVoltageSourceBase {
             int adcReading = channel < 3 ? sw->KnobVal((ComputerCard::Knob)channel) : 
                              channel==3 ?  sw->SwitchVal() : sw->CVIn(channel-4);
 
+            if (channel > 3) {
+                //adcReading *= 2; // scale up the CV inputs to match the 0-5V range of the knobs
+                // todo: fix this properly?
+                adcReading += 2047; // 0-5V range
+            }
+
             float voltageFromAdc = this->adcread_to_voltage(adcReading);
 
             if (this->debug) {
@@ -162,13 +168,16 @@ class ComputerCardVoltageSource : public WorkshopVoltageSourceBase {
                 Serial.println(voltageCorrected);
             }
 
-            if (this->debug) Serial.printf("in WorkshopVoltageSource#fetch_current_voltage() finishing (and returning %f)\n", voltageCorrected);
+            if (this->debug) Serial.printf("in WorkshopVoltageSource#fetch_current_voltage() finishing!! (and returning %f)\n", voltageCorrected);
 
             return maximum_input_voltage - voltageCorrected;
         }
 
         virtual float adcread_to_voltage(int16_t adcReading) {
             float voltageFromAdc = float(adcReading) * (maximum_input_voltage / 4095.0); // 12 bit ADC, 0-4095
+            if (this->debug) {
+                Serial.printf("ComputerCardVoltageSource channel %i read ADC voltageFromAdc %i, converted to voltageFromAdc %3.3f\t :", channel, adcReading, voltageFromAdc); Serial_flush();
+            }
             return voltageFromAdc;
         }