Merge pull request #33 from Trasselfrisyr/miscfix

Miscfix

NuEVI/NuEVI.ino

@@ -89,9 +89,6 @@ uint16_t trill3_interval;
 uint16_t fastBoot;
 uint16_t dacMode;
 
-volatile uint16_t dacModeCopy;
-volatile unsigned short brZero;
-
 byte rotatorOn = 0;
 byte currentRotation = 0;
 uint16_t rotations[4]; // semitones { -5, -10, -7, -14 };
@@ -261,6 +258,16 @@ bool configManagementMode = false;
 
 //_______________________________________________________________________________________________ SETUP
 
+//Update CV output pin, run from timer.
+void cvUpdate(){
+  int cvPressure = analogRead(breathSensorPin);
+  if(dacMode == DAC_MODE_PITCH){
+    analogWrite(pwmDacPin,cvPressure);
+  } else { //DAC_MODE_BREATH
+    analogWrite(dacPin,map(constrain(cvPressure,breathThrVal,4095),breathThrVal,4095,0,4095));
+  }
+}
+
 void setup() {
 
   analogReadResolution(12);   // set resolution of ADCs to 12 bit
@@ -789,10 +796,6 @@ void loop() {
   } else if(dacMode == DAC_MODE_BREATH) { // else breath CV on DAC pin, directly to unused pin of MIDI DIN jack
     //analogWrite(dacPin,breathCurve(map(constrain(pressureSensor,breathThrVal,breathMaxVal),breathThrVal,breathMaxVal,0,4095)));
   }
-  noInterrupts();
-  dacModeCopy = dacMode;
-  brZero = breathThrVal;
-  interrupts();
 
   midiDiscardInput();
 
@@ -802,15 +805,6 @@ void loop() {
 
 //_______________________________________________________________________________________________ FUNCTIONS
 
-void cvUpdate(){
-  int cvPressure = analogRead(breathSensorPin);
-  if(dacModeCopy == DAC_MODE_PITCH){
-    analogWrite(pwmDacPin,cvPressure);
-  } else { //DAC_MODE_BREATH
-    analogWrite(dacPin,map(constrain(cvPressure,brZero,4095),brZero,4095,0,4095));
-  }
-}
-
 
 // non linear mapping function (http://playground.arduino.cc/Main/MultiMap)
 // note: the _in array should have increasing values
@@ -924,36 +918,36 @@ void pitch_bend() {
     }
     if (vibReadBite < vibThrBite) {
       if (UPWD == vibDirection) {
-        vibSignal = vibSignal * 0.5 + 0.5 * map(constrain(vibReadBite, (vibZeroBite - vibMaxBite), vibThrBite), vibThrBite, (vibZeroBite - vibMaxBite), 0, calculatedPBdepth * vibDepth[vibrato]);
+        vibSignal = (vibSignal + map(constrain(vibReadBite, (vibZeroBite - vibMaxBite), vibThrBite), vibThrBite, (vibZeroBite - vibMaxBite), 0, calculatedPBdepth * vibDepth[vibrato]))/2;
       } else {
-        vibSignal = vibSignal * 0.5 + 0.5 * map(constrain(vibReadBite, (vibZeroBite - vibMaxBite), vibThrBite), vibThrBite, (vibZeroBite - vibMaxBite), 0, (0 - calculatedPBdepth * vibDepth[vibrato]));
+        vibSignal = (vibSignal + map(constrain(vibReadBite, (vibZeroBite - vibMaxBite), vibThrBite), vibThrBite, (vibZeroBite - vibMaxBite), 0, (0 - calculatedPBdepth * vibDepth[vibrato])))/2;
       }
     } else if (vibReadBite > vibThrBiteLo) {
       if (UPWD == vibDirection) {
-        vibSignal = vibSignal * 0.5 + 0.5 * map(constrain(vibReadBite, vibThrBiteLo, (vibZeroBite + vibMaxBite)), vibThrBiteLo, (vibZeroBite + vibMaxBite), 0, (0 - calculatedPBdepth * vibDepth[vibrato]));
+        vibSignal = (vibSignal + map(constrain(vibReadBite, vibThrBiteLo, (vibZeroBite + vibMaxBite)), vibThrBiteLo, (vibZeroBite + vibMaxBite), 0, (0 - calculatedPBdepth * vibDepth[vibrato])))/2;
       } else {
-        vibSignal = vibSignal * 0.5 + 0.5 * map(constrain(vibReadBite, vibThrBiteLo, (vibZeroBite + vibMaxBite)), vibThrBiteLo, (vibZeroBite + vibMaxBite), 0, calculatedPBdepth * vibDepth[vibrato]);
+        vibSignal = (vibSignal + map(constrain(vibReadBite, vibThrBiteLo, (vibZeroBite + vibMaxBite)), vibThrBiteLo, (vibZeroBite + vibMaxBite), 0, calculatedPBdepth * vibDepth[vibrato]))/2;
       }
     } else {
-      vibSignal = vibSignal * 0.5;
+      vibSignal = vibSignal / 2;
     }
   }
   if (vibControl != 1) { //lever vibrato
     vibRead = touchRead(vibratoPin); // SENSOR PIN 15 - built in var cap
     if (vibRead < vibThr) {
       if (UPWD == vibDirection) {
-        vibSignal = vibSignal * 0.5 + 0.5 * map(constrain(vibRead, (vibZero - vibMax), vibThr), vibThr, (vibZero - vibMax), 0, calculatedPBdepth * vibDepth[vibrato]);
+        vibSignal = (vibSignal + map(constrain(vibRead, (vibZero - vibMax), vibThr), vibThr, (vibZero - vibMax), 0, calculatedPBdepth * vibDepth[vibrato]))/2;
       } else {
-        vibSignal = vibSignal * 0.5 + 0.5 * map(constrain(vibRead, (vibZero - vibMax), vibThr), vibThr, (vibZero - vibMax), 0, (0 - calculatedPBdepth * vibDepth[vibrato]));
+        vibSignal = (vibSignal + map(constrain(vibRead, (vibZero - vibMax), vibThr), vibThr, (vibZero - vibMax), 0, (0 - calculatedPBdepth * vibDepth[vibrato])))/2;
       }
     } else if (vibRead > vibThrLo) {
       if (UPWD == vibDirection) {
-        vibSignal = vibSignal * 0.5 + 0.5 * map(constrain(vibRead, vibThrLo, (vibZero + vibMax)), vibThrLo, (vibZero + vibMax), 0, (0 - calculatedPBdepth * vibDepth[vibrato]));
+        vibSignal = (vibSignal + map(constrain(vibRead, vibThrLo, (vibZero + vibMax)), vibThrLo, (vibZero + vibMax), 0, (0 - calculatedPBdepth * vibDepth[vibrato])))/2;
       } else {
-        vibSignal = vibSignal * 0.5 + 0.5 * map(constrain(vibRead, vibThrLo, (vibZero + vibMax)), vibThrLo, (vibZero + vibMax), 0, calculatedPBdepth * vibDepth[vibrato]);
+        vibSignal = (vibSignal + map(constrain(vibRead, vibThrLo, (vibZero + vibMax)), vibThrLo, (vibZero + vibMax), 0, calculatedPBdepth * vibDepth[vibrato]))/2;
       }
     } else {
-      vibSignal = vibSignal * 0.5;
+      vibSignal = vibSignal / 2;
     }
   }
 
@@ -1026,10 +1020,7 @@ void pitch_bend() {
 //***********************************************************
 
 void doorKnobCheck() {
-  int touchValue[12];
+
-  for (byte i = 0; i < 12; i++) {
-    touchValue[i] = touchSensor.filteredData(i);
-  }
   if (gateOpenEnable){
     if (K4 && R1 && R2 && R3) { // doorknob grip on canister
       if (!gateOpen && (pbUp > ((pitchbMaxVal + pitchbThrVal) / 2))) {
@@ -1053,8 +1044,8 @@ void doorKnobCheck() {
 //***********************************************************
 
 void extraController() {
-  bool CC2sw;
+  bool CC2sw = false;
-  bool CC1sw;
+  bool CC1sw = false;
   int extracCC;
   // Extra Controller is the lip touch sensor (proportional) in front of the mouthpiece
   exSensor = exSensor * 0.6 + 0.4 * touchRead(extraPin); // get sensor data, do some smoothing - SENSOR PIN 16 - PCB PIN "EC" (marked K4 on some prototype boards)
@@ -1074,17 +1065,17 @@ void extraController() {
   } else if (pinkySetting == ECSW){
     if (pinkyKey){
       //send extra controller CC2 only
-      CC2sw = 1;
+      CC2sw = true;
-      CC1sw = 0;
+      CC1sw = false;
     } else {
       //send extra controller primary CC only
-      CC2sw = 0;
+      CC2sw = false;
-      CC1sw = 1;
+      CC1sw = true;
     }
   } else {
     //send both primary CC and CC2
-    CC2sw = 1;
+    CC2sw = true;
-    CC1sw = 1;
+    CC1sw = true;
   }
   if ((extraCT || extraCT2) && (exSensor >= extracThrVal)) { // if we are enabled and over the threshold, send data
     if (!extracIsOn) {

simulation/include/interrupts.h

@@ -0,0 +1,17 @@
+#ifndef __INTERRUPTS_H
+#define __INTERRUPTS_H
+
+//Dummy functions, used by macros for interrupts() / noInterrupts()
+void __enable_irq() {}
+void __disable_irq() {}
+
+
+struct IntervalTimer
+{
+    public:
+        IntervalTimer() {};
+        bool begin(void (*funct)(), unsigned int microseconds) { };
+
+};
+
+#endif

simulation/src/nuevisim.cpp

@@ -15,6 +15,7 @@
 #include "examples/imgui_impl_opengl3.h"
 #include "EEPROM.h"
 #include "simusbmidi.h"
+#include "interrupts.h"
 
 #include <Arduino.h>