0.7.9b

Mat1jaczyyy Palette fix

Author: 203Null

Matrix.ino

@@ -4,12 +4,17 @@ Copyright © 203 Industries 2017–2020. All rights reserved.
 
 TODO
 EEPROM load KeyMap
+EEPROM sys stuff
+microsecond timer
 Play Animation
 Play Midi
+Play Text
 NexusRevamped while USB unreconized
 
 */
 
+#define DEBUG
+
 #include <Arduino.h>
 #include <USBMIDI.h>
 #include <USBComposite.h>
@@ -38,6 +43,7 @@ bool flag_leftFN = false;
 void setup()
 {
   setupUSB();
+  digitalWrite(led_pin,LOW);
   loadDeviceConfig();
   setupEEPROM();
   variableLoad();

WIP/Color.cpp

@@ -1,6 +1,6 @@
-#include <colour.h>
+#include <Color.h>
 
-colour::colour(colourMode mode, u32 p1, u8 p2, u8 p3, u8 p4, u8 p5, u8 p6)
+Color::Color(ColorMode mode, u32 p1, u8 p2, u8 p3, u8 p4, u8 p5, u8 p6)
 {
   switch(mode)
   {
@@ -49,11 +49,11 @@ operator u32() const
   return HEX;
 }
 
-u32 applyGamma(u32 colour)
+u32 applyGamma(u32 color)
 {
   HEX =
-  gamma[(colour & 0xff000000) >> 24] * 0x1000000 +
-  gamma[(colour & 0x00ff0000) >> 16] *0x10000 +
-  gamma[(colour & 0x0000ff00) >> 8] *0x100 +
-  gamma[(colour & 0x000000ff)];
+  gamma[(color & 0xff000000) >> 24] * 0x1000000 +
+  gamma[(color & 0x00ff0000) >> 16] *0x10000 +
+  gamma[(color & 0x0000ff00) >> 8] *0x100 +
+  gamma[(color & 0x000000ff)];
 }

WIP/Color.h

@@ -1,16 +1,16 @@
-#ifndef colour_H
-#define colour_H
+#ifndef COLOR_H
+#define COLOR_H
 
 #include "../Core/MatrixSystem.h"
 #include "../Parameter/MatrixParameter.h"
 
-enum colourMode { Off, On, W, RGB, RGBW, HEX, Palette};
-class colour
+enum ColorMode { Off, On, W, RGB, RGBW, HEX, Palette};
+class Color
 {
 public:
-  colour(colourMode mode, u32 p1, u8 p2 = 0, u8 p3 = 0, u8 p4 = 0, u8 p5 = 0);
+  Color(ColorMode mode, u32 p1, u8 p2 = 0, u8 p3 = 0, u8 p4 = 0, u8 p5 = 0);
   operator u32() const;
-  u32 applyGamma(u32 colour);
+  u32 applyGamma(u32 color);
 protected:
   u32 HEX;
   u8 gamma[256] =

WIP/M2P.cpp

@@ -130,7 +130,7 @@ void M2P::sysexSet()
   switch (CompositeSerial.read() & 0x0F)
   {
     case 8:
-    reboot();
+    reset();
     break;
     case 9:
     enterBootloader();

src/Components/Bootanimation/KaskobiBoot.cpp

@@ -7,45 +7,35 @@ extern MIDI Midi;
 void UI::kaskobiWaitAnimation()
 {
   brightness_cache = brightness;
-  if(brightness > 128)
-  LED.setBrightness(128);
+  if(brightness > 160)
+  LED.setBrightness(160);
 
-
-  if(uiTimer.tick(800))
+  if(uiTimer.tick(400))
   {
     if(LED.readXYLED(0x07))
     {
-      for (u8 i = 7; i > 0; i--)
-      {
-        LED.setXYW(0x07, (i*32)-1, true);
-        LED.update();
-        delay(12);
-      }
       LED.offXY(0x07, true);
-      LED.update();
     }
     else
     {
-      for (u8 i = 1; i <= 8; i++)
-      {
-        LED.setXYW(0x07, (i*32)-1, true);
-        LED.update();
-        delay(12);
-      }
+      LED.onXY(0x07, true);
     }
-    uiTimer.recordCurrent();
+    LED.update();
   }
 }
 
 void UI::kaskobiBootAnimation() //8x8 only
 {
   LED.fill(0);
   LED.enableOverlayMode();
-  u16 delay = 8000;
+  //StageOne
+  u16 delay = 60;
   for(s8 y = 7; y >= 0; y--)
   {
     for(u8 x = 0; x < 8; x++)
     {
+      while(!uiTimer.isLonger(delay))
+      {
         // if(Midi.available())
         // {
         //   LED.disableOverlayMode();
@@ -59,14 +49,12 @@ void UI::kaskobiBootAnimation() //8x8 only
           LED.disableOverlayMode();
           return;
         }
-      for(u8 i = 1; i < 4; i++)
-      {
-      LED.setXYW(xytoxy(x, y), (i*64)-1, true);
-      LED.update();
-      delayMicroseconds(delay);
       }
+      uiTimer.recordCurrent();
+      LED.onXY(xytoxy(x, y), true);
+      LED.update();
     }
-    delay = delay * 0.5;
+    delay *= 0.8;
   }
 
   // uiTimer.recordCurrent();
@@ -92,7 +80,8 @@ void UI::kaskobiBootAnimation() //8x8 only
   {
     shuffle[i] = i;
   }
-  randomSeed(analogRead(PC3) * micros());
+  //randomSeed(analogRead(PC3) * analogRead(PC4) * analogRead(PC5));
+  randomSeed(micros());
 
   for (u16 i = 0; i < 500; i++)
   {
@@ -103,7 +92,7 @@ void UI::kaskobiBootAnimation() //8x8 only
     shuffle[r2] = t;
   }
 
-  for(int i = 0; i <NUM_LEDS+10; i++)
+  for(int i = 0; i <NUM_LEDS+15; i++)
   {
 
     while(!uiTimer.isLonger(delay))
@@ -124,15 +113,15 @@ void UI::kaskobiBootAnimation() //8x8 only
     }
     uiTimer.recordCurrent();
     if(i < NUM_LEDS)
-    LED.setPalette(shuffle[i], 1, 13, true);
+    LED.setPalette(shuffle[i], 0, 44, true);
     if(i > 0 && i < NUM_LEDS + 2)
-    LED.setPalette(shuffle[i-2], 1, 9, true);
+    LED.setPalette(shuffle[i-2], 0, 28, true);
     if(i > 1 && i < NUM_LEDS + 4)
-    LED.setPalette(shuffle[i-4], 1, 5, true);
+    LED.setPalette(shuffle[i-4], 0, 12, true);
     if(i > 2 && i < NUM_LEDS + 6)
-    LED.setPalette(shuffle[i-6], 1, 57, true);
+    LED.setPalette(shuffle[i-6], 0, 116, true);
     if(i > 3 && i < NUM_LEDS + 8)
-    LED.setPalette(shuffle[i-8], 1, 49, true);
+    LED.setPalette(shuffle[i-8], 0, 102, true);
     if(i > 4 && i < NUM_LEDS + 10)
     LED.off(shuffle[i-10], true);