v0.1.7 updated pixel programs handling

Author: neroroxxx

docs/leds-and-pixels.md

@@ -199,6 +199,14 @@ uint8_t getPixelCustomStateBrightness(uint8_t n);
 
 uint32_t getPixelStates();
 
+// available if pixel programs compiled
+// change the current pixel program
+void setPixelProgram(uint8_t t_program);
+
+// available if pixel programs compiled
+// get the current pixel program
+uint8_t getPixelProgram();
+
 // ** RGB PIXELS **
 
 // get RgbPixel Data

library.properties

@@ -1,5 +1,5 @@
 name=BMC
-version=0.1.6
+version=0.1.7
 author=Nero Rox
 maintainer=Nero Rox <info@roxxxtar.com>
 sentence=Fully featured MIDI Controller Library with a Companion Editor App. For Teensy

src/BMC-Api.h

@@ -1027,6 +1027,16 @@ class BMCApi : public BMC {
   uint32_t getPixelStates(){
     return pixelStates;
   }
+  #if BMC_MAX_PIXEL_PROGRAMS > 0
+    // change the current pixel program
+    void setPixelProgram(uint8_t t_program){
+      pixelPrograms.setProgram(t_program);
+    }
+    // get the current pixel program
+    uint8_t getPixelProgram(){
+      return pixelPrograms.getProgram();
+    }
+  #endif
 #endif
 
 #if BMC_MAX_RGB_PIXELS > 0

src/BMC-Version.h

@@ -23,7 +23,7 @@
 // BMC Version stored in EEPROM (for editor usage)
 #define BMC_VERSION_MAJ 0
 #define BMC_VERSION_MIN 1
-#define BMC_VERSION_PATCH 6
+#define BMC_VERSION_PATCH 7
 
 //16 bits unsigned, LSB byte is minor, MSB byte is major
 #define BMC_VERSION ((BMC_VERSION_MAJ<<8) | BMC_VERSION_MIN)

src/BMC.cpp

@@ -206,7 +206,7 @@ void BMC::update(){
   readHardware();
 
 #if BMC_MAX_PIXEL_PROGRAMS > 0
-    pixelPrograms.update(midiClock.isEigthNote());
+    pixelPrograms.update(midiClock.isEigthNote(), midiClock.isActive());
 #endif
 
   // handle callbacks for presets and setlist

src/midi/BMC-MidiClock.h

@@ -20,7 +20,8 @@
 #define BMC_MIDI_CLOCK_FLAG_MASTER 0
 #define BMC_MIDI_CLOCK_FLAG_BEAT 1
 #define BMC_MIDI_CLOCK_FLAG_BPM_CHANGED 2
-#define BMC_MIDI_CLOCK_FLAG_EIGTH 3
+#define BMC_MIDI_CLOCK_FLAG_ACTIVE 3
+#define BMC_MIDI_CLOCK_FLAG_EIGTH 4
 
 #define BMC_CLOCK_BPM_AVG 4
 #define BMC_MICROS_SECOND 0x3938700
@@ -51,6 +52,7 @@ class BMCMidiClock {
     }
     // If BMC is set to Master Clock
     if(isMaster()){
+      flags.on(BMC_MIDI_CLOCK_FLAG_ACTIVE);
       // check if the timer is active and complete, in which case we assign
       // a new BPM, this timer is started when a new BPM is set via the API
       if(bpmSetTimer.complete()){
@@ -80,6 +82,11 @@ class BMCMidiClock {
         }
       }
     } else if(incoming && midi.isIncomingClockPort()){
+      timeout.start(2000);
+      flags.on(BMC_MIDI_CLOCK_FLAG_ACTIVE);
+      if(timeout.complete()){
+        flags.off(BMC_MIDI_CLOCK_FLAG_ACTIVE);
+      }
       // the ticks variable is only used by the master clock
       ticks = 0;
       // the bmp calculator that a PPQN was received
@@ -121,6 +128,9 @@ class BMCMidiClock {
     }
     return bpmCalc.isEigthNote();
   }
+  bool isActive(){
+    return flags.read(BMC_MIDI_CLOCK_FLAG_ACTIVE);
+  }
 
   void setMaster(bool value){
     if(isMaster()!=value){
@@ -239,6 +249,7 @@ class BMCMidiClock {
   elapsedMicros masterTimer;
   BMCBpmCalculator bpmCalc;
   BMCTimer bpmSetTimer;
+  BMCTimer timeout;
   void assignBpm(uint16_t tempo){
     if(isMaster() && BMCBpmCalculator::isValidBpm(tempo)){
       if(bpm!=tempo){

src/utility/BMC-PixelPrograms.h

@@ -10,7 +10,8 @@
 #include "utility/BMC-Def.h"
 #if BMC_MAX_PIXELS > 0 && BMC_MAX_PIXEL_PROGRAMS > 0
 
-#define BMC_PIXEL_PROGRAMS_FLAG_BLACKOUT 0
+#define BMC_PIXEL_PROGRAMS_FLAG_ACTIVE 0
+#define BMC_PIXEL_PROGRAMS_FLAG_BLACKOUT 1
 
 class BMCPixelPrograms {
 private:
@@ -26,15 +27,15 @@ class BMCPixelPrograms {
   void reassign(){
 
   }
-  void update(bool isEigthNote){
-    if(isEigthNote){
+  void update(bool t_eigth, bool t_active){
+    if(t_eigth){
       eigthNotes++;
-      if(eigthNotes>8){
+      if(eigthNotes>16){
         eigthNotes = 1;
       }
     }
     uint8_t duration = ((global.pixelPrograms[program].events[currentItem]>>4)&0x0F)+1;
-
+    flags.write(BMC_PIXEL_PROGRAMS_FLAG_ACTIVE, t_active);
     if(eigthNotes == duration){
       currentItem++;
       if(currentItem >= global.pixelPrograms[program].length){
@@ -54,7 +55,7 @@ class BMCPixelPrograms {
     setBlackout(!flags.read(BMC_PIXEL_PROGRAMS_FLAG_BLACKOUT));
   }
   uint8_t getColor(){
-    if(flags.read(BMC_PIXEL_PROGRAMS_FLAG_BLACKOUT)){
+    if(isBlackout() || !isActive()){
       return 0;
     }
     return global.pixelPrograms[program].events[currentItem] & 0x0F;
@@ -66,8 +67,15 @@ class BMCPixelPrograms {
     if(t_value<BMC_MAX_PIXEL_PROGRAMS){
       program = t_value;
       currentItem = 0;
+      eigthNotes = 0;
     }
   }
+  bool isBlackout(){
+    return flags.read(BMC_PIXEL_PROGRAMS_FLAG_BLACKOUT);
+  }
+  bool isActive(){
+    return flags.read(BMC_PIXEL_PROGRAMS_FLAG_ACTIVE);
+  }
   void scrollUp(bool endless, uint8_t min, uint8_t max){
     scroll(true, endless, min, max);
   }