Add multiple strips

Author: ethanransdell

.github/workflows/push-master.yml .github/workflows/push.yml.github/workflows/push-master.yml renamed to .github/workflows/push.yml

@@ -1,6 +1,9 @@
 name: HyperSerialPico CI Build
 
-on: [push]
+on:
+  push:
+    branches:
+      - "**" # Runs on push to any branch
 
 jobs:
 

.gitignore

@@ -38,6 +38,7 @@ bld/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/
+.vscode/
 # Uncomment if you have tasks that create the project's static files in wwwroot
 #wwwroot/
 

include/base.h

@@ -28,14 +28,17 @@
 #ifndef BASE_H
 #define BASE_H
 
+#include <vector>
+
 class Base
 {
 	// LED strip number
 	int ledsNumber = 0;
-	// NeoPixelBusLibrary primary object
-	LED_DRIVER* ledStrip1 = nullptr;
-	// NeoPixelBusLibrary second object
-	LED_DRIVER2* ledStrip2 = nullptr;
+
+	// Should I use sk6812p instead?
+	std::vector<LED_DRIVER*> ledStrips;
+	std::vector<int> ledCounts = {240, 129, 150};
+
 	// frame is set and ready to render
 	bool readyToRender = false;
 
@@ -53,36 +56,31 @@ class Base
 		// queue end position
 		volatile int queueEnd = 0;
 
-		inline int getLedsNumber()
-		{
-			return ledsNumber;
-		}
-
-		inline LED_DRIVER* getLedStrip1()
+		inline int getLedCount()
 		{
-			return ledStrip1;
-		}
-
-		inline LED_DRIVER2* getLedStrip2()
-		{
-			return ledStrip2;
+			int sum = 0;
+			for (int ledCount : ledCounts) {
+				sum += ledCount;
+			}
+			return sum;
 		}
 
-		void initLedStrip(int count)
+		void initializeLedStrips()
 		{
-			if (ledStrip1 != nullptr)
-			{
-				delete ledStrip1;
-				ledStrip1 = nullptr;
+			for (LED_DRIVER* ledStrip : ledStrips) {
+				delete ledStrip;
 			}
+			ledStrips.clear();
 
-			if (ledStrip2 != nullptr)
-			{
-				delete ledStrip2;
-				ledStrip2 = nullptr;
-			}
+			#if defined(NEOPIXEL_RGBW) || defined(NEOPIXEL_RGB)
+				for (int ledCount : ledCounts) {
+					LED_DRIVER* ledStrip = new LED_DRIVER(ledCount, DATA_PIN);
+					ledStrips.push_back(ledStrip);
+				}
+			#else
+				
+			#endif
 
-			ledsNumber = count;
 
 			#if defined(SECOND_SEGMENT_START_INDEX)
 				if (ledsNumber > SECOND_SEGMENT_START_INDEX)
@@ -109,6 +107,30 @@ class Base
 			}
 		}
 
+		inline int getLedStripCount()
+		{
+			return ledStrips.size();
+		}
+
+		inline LED_DRIVER* getLedStrip(int index)
+		{
+			if (index < 0 || index >= ledStrips.size()) {
+				return nullptr;
+			}
+			return ledStrips[index];
+		}
+
+		inline int getLedStripIndexByPixel(int pixelIndex) {
+			int sum = 0;
+			for (int i = 0; i < ledCounts.size(); i++) {
+				sum += ledCounts[i];
+				if (pixelIndex < sum) {
+					return i;
+				}
+			}
+			return -1;
+		}
+
 		/**
 		 * @brief Check if there is already prepared frame to display
 		 *
@@ -130,42 +152,50 @@ class Base
 			if (newFrame)
 				readyToRender = true;
 
+			LED_DRIVER* firstLedStrip = getLedStrip(0);
+			
 			if (readyToRender &&
-				(ledStrip1 != nullptr && ledStrip1->isReadyBlocking()))
+				(firstLedStrip != nullptr && firstLedStrip->isReadyBlocking()))
 			{
 				statistics.increaseShow();
 				readyToRender = false;
 
-				// display segments
-				#if defined(SECOND_SEGMENT_START_INDEX)
-					ledStrip1->renderAllLanes();
-				#else
-					ledStrip1->renderSingleLane();
-				#endif
+				if (getLedStripCount() > 1) {
+					firstLedStrip->renderAllLanes();
+				} else {
+					// render only the first strip
+					firstLedStrip->renderSingleLane();
+				}
 			}
 		}
 
-		inline bool setStripPixel(uint16_t pix, ColorDefinition &inputColor)
+		inline bool setStripPixel(uint16_t pixelIndex, ColorDefinition &inputColor)
 		{
-			if (pix < ledsNumber)
+			// return true if there is another pixel after this one
+
+			if (pixelIndex < getLedCount())
 			{
-				#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
+				// figure out which strip it's in
+				int stripIndex = getLedStripIndexByPixel(pixelIndex);
+				if (stripIndex < 0) {
+					return false;
+				}
+
+				LED_DRIVER* ledStrip = getLedStrip(stripIndex);
+				if (ledStrip == nullptr) {
+					return false;
+				}
+
+				// set the pixel
+				ledStrip->SetPixel(pixelIndex - ledCounts[stripIndex], inputColor);
+
+				// FIXME: Reverse
+				// #if defined(SECOND_SEGMENT_REVERSED)
+				// ledStrip2->SetPixel(ledsNumber - pixelIndex - 1, inputColor);
 			}
 
-			return (pix + 1 < ledsNumber);
+			// return true if the pixel is not the last one
+			return (pixelIndex + 1 < getLedCount());
 		}
 } base;
 

include/main.h

@@ -128,8 +128,8 @@ void processData()
 					frameState.setState(AwaProtocol::HEADER_A);
 				else
 				{
-					if (ledSize != base.getLedsNumber())
-						base.initLedStrip(ledSize);
+					if (ledSize != base.getLedCount())
+						base.initializeLedStrips();
 
 					frameState.setState(AwaProtocol::RED);
 				}