Updates

Author: ethanransdell

include/base.h

@@ -31,11 +31,7 @@
 class Base
 {
 	// LED strip number
-	int ledsNumber = 0;
-	// NeoPixelBusLibrary primary object
-	LED_DRIVER* ledStrip1 = nullptr;
-	// NeoPixelBusLibrary second object
-	LED_DRIVER2* ledStrip2 = nullptr;
+	int ledsNumber = 3;
 	// frame is set and ready to render
 	bool readyToRender = false;
 
@@ -64,16 +60,6 @@ class Base
 			return ledsNumber;
 		}
 
-		inline LED_DRIVER* getLedStrip1()
-		{
-			return ledStrip1;
-		}
-
-		inline LED_DRIVER2* getLedStrip2()
-		{
-			return ledStrip2;
-		}
-
 		void initLedStrip(int count)
 		{
 			for (int i = 0; i < ledSegments; i++) {
@@ -109,14 +95,17 @@ class Base
 			if (newFrame)
 				readyToRender = true;
 
-			if (readyToRender &&
-				(ledStrip1 != nullptr && ledStrip1->isReadyBlocking()))
+			if (readyToRender)
 			{
 				statistics.increaseShow();
 				readyToRender = false;
 
 				for (int i = 0; i < ledSegments; i++) {
 					if (ledStrips[i] != nullptr) {
+						if (!ledStrips[i]->isReadyBlocking()) {
+							return;
+						}
+
 						ledStrips[i]->renderAllLanes();
 					}
 				}
@@ -127,20 +116,24 @@ class Base
 		{
 			if (pix < ledsNumber)
 			{
-				#if defined(SECOND_SEGMENT_START_INDEX)
-					if (pix < SECOND_SEGMENT_START_INDEX)
-						ledStrip1->SetPixel(pix, inputColor);
-					else
-					{
-						#if defined(SECOND_SEGMENT_REVERSED)
-							ledStrip2->SetPixel(ledsNumber - pix - 1, inputColor);
-						#else
-							ledStrip2->SetPixel(pix - SECOND_SEGMENT_START_INDEX, inputColor);
-						#endif
-					}
-				#else
-					ledStrip1->SetPixel(pix, inputColor);
-				#endif
+				ledStrips[pix]->SetPixel(0, inputColor);
+
+				// TODO: Figure out which strip to set
+
+				// #if defined(SECOND_SEGMENT_START_INDEX)
+				// 	if (pix < SECOND_SEGMENT_START_INDEX)
+				// 		ledStrip1->SetPixel(pix, inputColor);
+				// 	else
+				// 	{
+				// 		#if defined(SECOND_SEGMENT_REVERSED)
+				// 			ledStrip2->SetPixel(ledsNumber - pix - 1, inputColor);
+				// 		#else
+				// 			ledStrip2->SetPixel(pix - SECOND_SEGMENT_START_INDEX, inputColor);
+				// 		#endif
+				// 	}
+				// #else
+				// 	ledStrip1->SetPixel(pix, inputColor);
+				// #endif
 			}
 
 			return (pix + 1 < ledsNumber);

include/leds.h

@@ -556,6 +556,6 @@ volatile bool DmaClient::isDmaBusy = false;
 // API classes
 // typedef NeopixelType<NeopixelSubtype::ws2812b, 650, ColorGrb32> ws2812;
 // typedef NeopixelType<NeopixelSubtype::sk6812, 450, ColorGrbw> sk6812;
-typedef NeopixelParallelType<NeopixelSubtype::ws2812b, 300, ColorGrb> ws2812p;
+// typedef NeopixelParallelType<NeopixelSubtype::ws2812b, 300, ColorGrb> ws2812p;
 typedef NeopixelParallelType<NeopixelSubtype::sk6812, 80, ColorGrbw> sk6812p;
 typedef DotstarType<100, ColorDotstartBgr> apa102;