More fixes for spark

StoneOrbits · Nov 14, 2023 · 062f2bb · 062f2bb
1 parent 76eb434
commit 062f2bb
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/VortexEngine/src/Buttons/Button.cpp b/VortexEngine/src/Buttons/Button.cpp
@@ -50,13 +50,16 @@ bool Button::init(uint8_t pin)
   m_longClick = false;
 
   m_pinNum = pin;
+#ifdef VORTEX_EMBEDDED
+  pinMode(m_pinNum, INPUT_PULLUP);
+#endif
   return true;
 }
 
 bool Button::check()
 {
 #ifdef VORTEX_EMBEDDED
-  return digitalRead(m_pinNum) == HIGH;
+  return digitalRead(m_pinNum) == LOW;
 #else
   return (Vortex::vcallbacks()->checkPinHook(m_pinNum) == 0);
 #endif

diff --git a/VortexEngine/src/Buttons/Buttons.cpp b/VortexEngine/src/Buttons/Buttons.cpp
@@ -7,6 +7,14 @@
 #include "../Time/Timings.h"
 #endif
 
+#ifdef SPARK_HANDLE
+// handle is on 47
+#define BUTTON_PIN 47
+#else
+// orbit is on 7
+#define BUTTON_PIN 7
+#endif
+
 // Since there is only one button I am just going to expose a global pointer to
 // access it, instead of making the Button class static in case a second button
 // is added. This makes it easier to access the button from other places while
@@ -23,7 +31,7 @@ Button Buttons::m_buttons[NUM_BUTTONS];
 bool Buttons::init()
 {
   // initialize the button on pins 9/10/11
-  if (!m_buttons[0].init(7)) {
+  if (!m_buttons[0].init(BUTTON_PIN)) {
     return false;
   }
   g_pButton = &m_buttons[0];

diff --git a/VortexEngine/src/Leds/Leds.cpp b/VortexEngine/src/Leds/Leds.cpp
@@ -16,8 +16,12 @@
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
 #include <FastLED.h>
 #define LED_PIN       16
+#ifdef SPARK_HANDLE
+#define MOSFET_PIN    48
+#else
 #define MOSFET_PIN    18
 #endif
+#endif
 
 // array of led color values
 RGBColor Leds::m_ledColors[LED_COUNT] = { RGB_OFF };
@@ -28,6 +32,7 @@ bool Leds::init()
 {
 #ifdef VORTEX_EMBEDDED
   FastLED.addLeds<WS2812B, LED_PIN, GRB>((CRGB *)m_ledColors, LED_COUNT);
+  FastLED.setMaxRefreshRate(0);
   pinMode(MOSFET_PIN, OUTPUT);
   digitalWrite(MOSFET_PIN, HIGH);
 #endif

diff --git a/VortexEngine/src/VortexConfig.h b/VortexEngine/src/VortexConfig.h
@@ -146,7 +146,7 @@
 //
 // The starting default global brightness if there is no savefile
 // present The maximum value is 255
-#define DEFAULT_BRIGHTNESS    15
+#define DEFAULT_BRIGHTNESS    255
 
 // Max Modes
 //