From f36129d4bb600587700317ab9f2e53d80b825bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20St=C3=A4ck?= Date: Wed, 16 Oct 2019 15:28:01 +0200 Subject: [PATCH] Make IntervalTimer stub so simulator works --- NuEVI/NuEVI.ino | 19 ++++++++++--------- simulation/include/interrupts.h | 17 +++++++++++++++++ simulation/src/nuevisim.cpp | 1 + 3 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 simulation/include/interrupts.h diff --git a/NuEVI/NuEVI.ino b/NuEVI/NuEVI.ino index d394fb1..ff47543 100644 --- a/NuEVI/NuEVI.ino +++ b/NuEVI/NuEVI.ino @@ -261,6 +261,16 @@ bool configManagementMode = false; //_______________________________________________________________________________________________ SETUP +//Update CV output pin, run from timer. +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)); + } +} + void setup() { analogReadResolution(12); // set resolution of ADCs to 12 bit @@ -802,15 +812,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 diff --git a/simulation/include/interrupts.h b/simulation/include/interrupts.h new file mode 100644 index 0000000..1da6763 --- /dev/null +++ b/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 diff --git a/simulation/src/nuevisim.cpp b/simulation/src/nuevisim.cpp index 3388e1e..6b2d46b 100644 --- a/simulation/src/nuevisim.cpp +++ b/simulation/src/nuevisim.cpp @@ -15,6 +15,7 @@ #include "examples/imgui_impl_opengl3.h" #include "EEPROM.h" #include "simusbmidi.h" +#include "interrupts.h" #include