brian/xevi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move all the LED things to a separate file, as mentioned in comments

Browse source
This commit is contained in:
John Stäck 2019-07-27 00:42:27 +02:00
parent 3903ec7b98
commit 3ae4147d7e
7 changed files with 76 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

46
NuEVI/NuEVI.ino
View file

@ -11,6 +11,7 @@
#include "menu.h"
#include "config.h"
#include "settings.h"
#include "led.h"
/*
NAME: NuEVI
@ -233,9 +234,6 @@ byte slurSustain = 0;
byte parallelChord = 0;
byte subOctaveDouble = 0;
const int breathLedBrightness = 500; // up to 4095, PWM
const int portamLedBrightness = 500; // up to 4095, PWM
Adafruit_MPR121 touchSensor = Adafruit_MPR121(); // This is the 12-input touch sensor
FilterOnePole breathFilter;
@ -291,7 +289,7 @@ void setup() {
vibZero += touchRead(vibratoPin);
breathCalZero += analogRead(breathSensorPin);
if (biteJumper) vibZeroBite += analogRead(A7); else vibZeroBite += touchRead(bitePin);
digitalWrite( statusLedPin, i&1 );
statusLed(i&1);
delay(fastBoot?75:250); //Shorter delay for fastboot
}
@ -687,7 +685,7 @@ void loop() {
} else {
if (slowMidi) breath();
extraController();
statusLEDs();
updateSensorLEDs();
doorKnobCheck();
}
ccSendTime = millis();
@ -778,23 +776,6 @@ int patchLimit(int value) {
//**************************************************************
void statusLEDs() {
if (breathLevel > breathThrVal) { // breath indicator LED, labeled "B" on PCB
//analogWrite(bLedPin, map(breathLevel,0,4096,5,breathLedBrightness));
analogWrite(bLedPin, map(constrain(breathLevel, breathThrVal, breathMaxVal), breathThrVal, breathMaxVal, 5, breathLedBrightness));
} else {
analogWrite(bLedPin, 0);
}
if (portIsOn) { // portamento indicator LED, labeled "P" on PCB
//analogWrite(pLedPin, map(biteSensor,0,4096,5,portamLedBrightness));
analogWrite(pLedPin, map(constrain(oldport, 0, 127), 0, 127, 5, portamLedBrightness));
} else {
analogWrite(pLedPin, 0);
}
}
//**************************************************************
void breath() {
int breathCCval, breathCCvalFine,breathCC2val;
unsigned int breathCCvalHires;
@ -1170,24 +1151,3 @@ void readSwitches() {
}
lastFingering = fingeredNoteRead;
}
void statusLedOn() {
digitalWrite(statusLedPin, HIGH);
}
void statusLedOff() {
digitalWrite(statusLedPin, LOW);
}
void statusLedFlip() {
digitalWrite(statusLedPin, !digitalRead(statusLedPin));
}
void statusLedFlash(uint16_t delayTime) {
statusLedOff();
delay(delayTime/2);
statusLedOn();
delay(delayTime/2);
}