..

Author: doctea

include/compatibility.h

@@ -1,4 +1,6 @@
-
+#ifdef CORE_TEENSY
+    #include <Arduino.h>
+#endif
 
 #ifndef FLASHMEM
     #define FLASHMEM

include/parameters/Parameter.h

@@ -949,6 +949,7 @@ class DataParameterBase : public FloatParameter {
                 this->setRangeMinimumLimit(value.toFloat());
                 return true;
             } else if (incoming_key.startsWith(prefix__parameter + label_string + prefix__range_maximum)) {
+                //Serial.printf("load_parse_key_value(%s, %s) found new value to set in %s: %3.3f\n", incoming_key.c_str(), value.c_str(), this->label, value.toFloat());
                 this->setRangeMaximumLimit(value.toFloat());
                 return true;
             } else {

include/voltage_sources/PicoSDKADCVoltageSource.h

@@ -75,8 +75,8 @@ class WorkshopVoltageSource : public WorkshopVoltageSourceBase {
             if (!already_succeeded) 
                 Debug_printf("WorkshopVoltageSource#fetch_current_voltage reading from channel %i, check you're using correct address ADC board if crash here!\n", this->channel);
 
-            digitalWrite(MX_A, bank & 1);
-            digitalWrite(MX_B, bank & 2);
+            gpio_put(MX_A, bank & 1);
+            gpio_put(MX_B, bank & 2);
 
             // NB this seems to need 1us delay for pins to 'settle' before reading.
             sleep_us(1);
@@ -115,4 +115,69 @@ class WorkshopVoltageSource : public WorkshopVoltageSourceBase {
 
 };
 
+#include "ComputerCard.h"
+
+class ComputerCardVoltageSource : public WorkshopVoltageSourceBase {
+    public:
+        byte channel = 0;
+        ComputerCard *sw = nullptr;
+
+        ComputerCardVoltageSource(int global_slot, ComputerCard *sw, byte channel, float maximum_input_voltage = 5.0, bool supports_pitch = false) 
+            : WorkshopVoltageSourceBase(global_slot, supports_pitch) {
+            this->sw = sw;
+            this->channel = channel;
+            this->maximum_input_voltage = maximum_input_voltage;
+            //this->debug = true;
+        }
+
+        // returns the last read raw voltage value
+        virtual float get_voltage() override {
+            //this->update();
+            return this->current_value;
+        }
+
+        bool already_succeeded = false;
+        virtual float fetch_current_voltage() override {
+            if (this->debug) {
+                Serial.printf("in WorkshopVoltageSource#fetch_current_voltage(slot=%i, channel=%i)..", global_slot, channel);
+                //Debug_printf(F("\tads_source is @%p, reading from channel %i\n"), this->ads_source, this->channel);
+            }            
+            if (!already_succeeded) 
+                Debug_printf("WorkshopVoltageSource#fetch_current_voltage reading from channel %i, check you're using correct address ADC board if crash here!\n", this->channel);
+
+            
+            int adcReading = channel < 3 ? sw->KnobVal((ComputerCard::Knob)channel) : 
+                             channel==3 ?  sw->SwitchVal() : sw->CVIn(channel-4);
+
+            float voltageFromAdc = this->adcread_to_voltage(adcReading);
+
+            if (this->debug) {
+                Serial.printf("WorkshopVoltageSource channel %i read ADC voltageFromAdc %i\t :", channel, adcReading); Serial_flush();
+            }
+
+            float voltageCorrected = this->get_corrected_voltage(voltageFromAdc);
+
+            if (this->debug) {
+                Serial.print(F(" after correction stage 2 got "));
+                Serial.println(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
+            return voltageFromAdc;
+        }
+
+        virtual float get_corrected_voltage(float voltageFromAdc) {
+            return (voltageFromAdc * correction_value_1) + correction_value_2;
+            //return (voltageFromAdc + correction_value_2) * correction_value_1;
+            //return (voltageFromAdc - 0.25) * 2.0;
+        }
+
+};
+
 #endif

library.json

@@ -1,6 +1,6 @@
 { 
 	"name": "parameters",
-	"version": "0.0.43.1",
+	"version": "0.0.43.2",
 	"repository":
 	{
 		"type": "git",