Minor corrections

Author: awawa-dev

CMakeLists.txt

@@ -3,7 +3,7 @@
 # Default output data pin for the LED strip
 set(OUTPUT_DATA_PIN 2)
 
-# Default output data pin for the LED strip (SPI leds only, not for sk6812/ws2812b)
+# Default output clock pin for the LED strip (SPI leds only, not for sk6812/ws2812b)
 set(OUTPUT_CLOCK_PIN 3)
 
 # Use multi-segment, starting index of second led strip or OFF to disable
@@ -17,6 +17,9 @@ set(SECOND_SEGMENT_REVERSED OFF)
 
 cmake_minimum_required(VERSION 3.13)
 
+# Disable Pico 'Reset device'
+add_definitions ( -DPICO_STDIO_USB_ENABLE_RESET_VIA_VENDOR_INTERFACE=0 )
+
 # initialize the SDK based on PICO_SDK_PATH
 # note: this must happen before project()
 set(PICO_SDK_PATH ${CMAKE_SOURCE_DIR}/sdk/pico)

README.md

@@ -17,8 +17,8 @@ HyperHDR's highspeed adalight serial port LED driver implementation for Raspberr
 # How to flash it?
 It's very easy and you don't need any special flasher.  
 Download the firmware from the [Release folder](https://github.com/awawa-dev/HyperSerialPico/releases).
-* If you Pico board has only one button (`boot`) then press & hold it and connect the board to the USB port. Then you can release the button.
-* If you Pico board has two buttons, connect it to the USB port. Then press & hold `boot` and `reset` buttons, then release `reset` and next release `boot` button.  
+* If your Pico board has only one button (`boot`) then press & hold it and connect the board to the USB port. Then you can release the button.
+* If your Pico board has two buttons, connect it to the USB port. Then press & hold `boot` and `reset` buttons, then release `reset` and next release `boot` button.  
 
 In the system file explorer you should find new drive (e.g. called `RPI-RP2` drive) exposed by the Pico board. Drap & drop the selected fimrware. 
 The Pico will reset automaticly after the upload and after few seconds it will be ready to use by HyperHDR as a serial port device using Adalight driver.

include/leds.h

@@ -48,15 +48,15 @@
     ledStrip1->renderSingleLane();
 
     Usage for sk6812 rgbw multi lanes:
-    ledStrip1 = new sk6812(ledsNumber, DATA_PIN); // using DATA_PIN output
-    ledStrip2 = new sk6812(ledsNumber, DATA_PIN); // using DATA_PIN + 1 output
+    ledStrip1 = new sk6812p(ledsNumber, DATA_PIN); // using DATA_PIN output
+    ledStrip2 = new sk6812p(ledsNumber, DATA_PIN); // using DATA_PIN + 1 output
     ledStrip1->SetPixel(index, ColorGrbw(255));
     ledStrip2->SetPixel(index, ColorGrbw(255));
     ledStrip1->renderAllLanes(); // renders ledStrip1 and ledStrip2 simoultaneusly
 
     Usage for ws2812 rgb multi lanes:
-    ledStrip1 = new ws2812(ledsNumber, DATA_PIN); // using DATA_PIN output
-    ledStrip2 = new ws2812(ledsNumber, DATA_PIN); // using DATA_PIN + 1 output
+    ledStrip1 = new ws2812p(ledsNumber, DATA_PIN); // using DATA_PIN output
+    ledStrip2 = new ws2812p(ledsNumber, DATA_PIN); // using DATA_PIN + 1 output
     ledStrip1->SetPixel(index, ColorGrb(255));
     ledStrip2->SetPixel(index, ColorGrb(255));
     ledStrip1->renderAllLanes(); // renders ledStrip1 and ledStrip2 simoultaneusly

source/main.cpp

@@ -117,9 +117,7 @@ static void core1()
     {
         if (sem_acquire_timeout_us(&base.serialSemaphore, portMAX_DELAY))
         {
-            //printf("Core %d: Start index: %i, End index: %i, (%u)\n", get_core_num(), base.queueCurrent, base.queueEnd, millis()); 
             processData();        
-            //printf("Core %d: Start index: %i, End index: %i, (%u)\n", get_core_num(), base.queueCurrent, base.queueEnd, millis()); 
         }
     }
 }
@@ -130,14 +128,16 @@ static void core0( void *pvParameters )
     {
         if (sem_acquire_timeout_us(&base.receiverSemaphore, portMAX_DELAY))
         {
-            int total, toRead;            
+            int wanted, received;
             do
             {
-                toRead = MAX_BUFFER - base.queueEnd;
-                total = stdio_usb.in_chars((char*)(&(base.buffer[base.queueEnd])), MAX_BUFFER - base.queueEnd);
-                if (total > 0)
-                    base.queueEnd = (base.queueEnd + total) % (MAX_BUFFER);
-            }while(toRead==total);
+                wanted = std::min(MAX_BUFFER - base.queueEnd, MAX_BUFFER - 1);
+                received = stdio_usb.in_chars((char*)(&(base.buffer[base.queueEnd])), wanted);
+                if (received > 0)
+                {
+                    base.queueEnd = (base.queueEnd + received) % (MAX_BUFFER);
+                }
+            }while(wanted == received);
 
             sem_release(&base.serialSemaphore);
         }