Add support for PicoW and Pico2

LouDnl · Nov 20, 2024 · a9684dd · a9684dd
1 parent b268e88
commit a9684dd
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 28 deletions.
diff --git a/src/asid.h b/src/asid.h
@@ -45,9 +45,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-/* Pico libs */
-#include "pico/mem_ops.h"
-
 
 /* SID Register order for ASID */
 static const uint8_t asid_sid_registers[] =

diff --git a/src/config.c b/src/config.c
@@ -65,7 +65,6 @@ uint8_t one, two, three, four;
 const char* project_version = PROJECT_VERSION;
 static uint8_t p_version_array[MAX_BUFFER_SIZE];
 
-// static const Config usbsid_default_config = {
 #define USBSID_DEFAULT_CONFIG_INIT { \
   .magic = MAGIC_SMOKE, \
   .default_config = 1, \
@@ -84,12 +83,12 @@ static uint8_t p_version_array[MAX_BUFFER_SIZE];
   }, \
   .LED = { \
     .enabled = true, \
-    .idle_breathe = true \
+    .idle_breathe = LED_PWM \
   }, \
   .RGBLED = { \
     .enabled = RGB_ENABLED, \
-    .idle_breathe = true, \
-    .brightness = 0x7F,  /* Half of max brightness */ \
+    .idle_breathe = RGB_ENABLED, \
+    .brightness = (RGB_ENABLED ? 0x7F : 0),  /* Half of max brightness or disabled if no RGB LED */ \
     .sid_to_use = 1, \
   }, \
   .Cdc = { \
@@ -291,8 +290,13 @@ void handle_config_request(uint8_t * buffer)
                 usbsid_config.LED.enabled = (buffer[3] == 1) ? true : false;
               break;
             case 1: /* idle_breathe */
-              if (buffer[3] <= 1)  /* 1 or 0 */
-                usbsid_config.LED.idle_breathe = (buffer[3] == 1) ? true : false;
+              if (buffer[3] <= 1) { /* 1 or 0 */
+                if (LED_PWM) {
+                  usbsid_config.LED.idle_breathe = (buffer[3] == 1) ? true : false;
+                } else {
+                  usbsid_config.LED.idle_breathe = false;  /* Always false, no PWM LED on PicoW :( */
+                };
+              };
               break;
             default:
               break;
@@ -301,19 +305,34 @@ void handle_config_request(uint8_t * buffer)
         case 4: /* RGBLED */
           switch (buffer[2]) {
             case 0: /* enabled */
-              if (buffer[3] <= 1)  /* 1 or 0 */
-                usbsid_config.RGBLED.enabled = (buffer[3] == 1) ? true : false;
+              if (buffer[3] <= 1) { /* 1 or 0 */
+                if (RGB_ENABLED) {
+                  usbsid_config.RGBLED.enabled = (buffer[3] == 1) ? true : false;
+                } else {
+                  usbsid_config.RGBLED.enabled = false;  /* Always false if no RGB LED */
+                };
+              };
               break;
             case 1: /* idle_breathe */
-              if (buffer[3] <= 1)  /* 1 or 0 */
-                usbsid_config.RGBLED.idle_breathe = (buffer[3] == 1) ? true : false;
+              if (buffer[3] <= 1) { /* 1 or 0 */
+                if (RGB_ENABLED) {
+                  usbsid_config.RGBLED.idle_breathe = (buffer[3] == 1) ? true : false;
+                } else {
+                  usbsid_config.RGBLED.idle_breathe = false;  /* Always false if no RGB LED */
+                };
+              };
               break;
             case 2: /* brightness */
-              usbsid_config.RGBLED.brightness = buffer[3];
+              if (RGB_ENABLED) {
+                usbsid_config.RGBLED.brightness = buffer[3];
+              } else {
+                usbsid_config.RGBLED.brightness = 0;  /* No brightness needed if no RGB LED */
+              };
               break;
             case 3: /* sid_to_use */
-              if (buffer[3] <= 3)
+              if (buffer[3] <= 3) {
                 usbsid_config.RGBLED.sid_to_use = buffer[3];
+              };
               break;
             default:
               break;

diff --git a/src/config.h b/src/config.h
@@ -38,7 +38,6 @@
 #include <string.h>
 
 /* Pico libs */
-#include "pico/mem_ops.h"
 #include "pico/flash.h"
 #include "pico/stdlib.h"
 
@@ -56,7 +55,13 @@
 #define MAGIC_SMOKE 19700101  /* DATEOFRELEASE */
 #endif
 #ifndef PROJECT_VERSION
-#define PROJECT_VERSION "0.2.2-BETA.20241117"  /* Must be the same as in CMakeLists.txt */
+#define PROJECT_VERSION "0.2.2-BETA.20241119"  /* Must be the same as in CMakeLists.txt */
+#endif
+
+#ifdef PICO_DEFAULT_LED_PIN
+#define LED_PWM true
+#else
+#define LED_PWM false
 #endif
 #ifdef USE_RGB
 #define RGB_ENABLED true

diff --git a/src/gpio.c b/src/gpio.c
@@ -64,24 +64,31 @@ void init_gpio()
 
 void init_vu(void)
 {
+  #if defined(PICO_DEFAULT_LED_PIN)  /* Cannot use VU on PicoW :( */
   /* PWM led */
-  gpio_init( BUILTIN_LED );
+  gpio_init(BUILTIN_LED);
   gpio_set_dir(BUILTIN_LED, GPIO_OUT);
   gpio_set_function(BUILTIN_LED, GPIO_FUNC_PWM);
   /* Init Vu */
-  int led_pin_slice = pwm_gpio_to_slice_num( BUILTIN_LED );
+  int led_pin_slice = pwm_gpio_to_slice_num(BUILTIN_LED);
 	pwm_config configLED = pwm_get_default_config();
-	pwm_config_set_clkdiv( &configLED, 1 );
-	pwm_config_set_wrap( &configLED, 65535 );  /* LED max */
-	pwm_init( led_pin_slice, &configLED, true );
-	gpio_set_drive_strength( BUILTIN_LED, GPIO_DRIVE_STRENGTH_2MA );
-	pwm_set_gpio_level( BUILTIN_LED, 0 );  /* turn off led */
+	pwm_config_set_clkdiv(&configLED, 1);
+	pwm_config_set_wrap(&configLED, 65535);  /* LED max */
+	pwm_init(led_pin_slice, &configLED, true);
+	gpio_set_drive_strength(BUILTIN_LED, GPIO_DRIVE_STRENGTH_2MA);
+	pwm_set_gpio_level(BUILTIN_LED, 0);  /* turn off led */
 
   #if defined(USE_RGB)
   { /* Init RGB */
-    gpio_set_drive_strength( WS2812_PIN, GPIO_DRIVE_STRENGTH_2MA );
+    gpio_set_drive_strength(WS2812_PIN, GPIO_DRIVE_STRENGTH_2MA);
   }
   #endif
+  #elif defined(CYW43_WL_GPIO_LED_PIN)
+  /* For Pico W devices we need to initialise the driver etc */
+  cyw43_arch_init();
+  /* Ask the wifi "driver" to set the GPIO on or off */
+  cyw43_arch_gpio_put(BUILTIN_LED, usbsid_config.LED.enabled);
+  #endif
 }
 
 void setup_piobus(void)

diff --git a/src/gpio.h b/src/gpio.h
@@ -38,7 +38,12 @@
 /* Pico libs */
 #include "pico/stdlib.h"
 #include "pico/types.h"
-#include "pico/mem_ops.h"
+
+/* Pico W devices use a GPIO on the WIFI chip for the LED,
+ * so when building for Pico W, CYW43_WL_GPIO_LED_PIN will be defined */
+#ifdef CYW43_WL_GPIO_LED_PIN
+#include "pico/cyw43_arch.h"
+#endif
 
 /* Hardware api's */
 #include "hardware/gpio.h"
@@ -82,7 +87,12 @@
 #define PHI 22  /* Pico 1Mhz PWM out ~ External Clock In */
 
 /* LED */
+#if defined(PICO_DEFAULT_LED_PIN)
 #define BUILTIN_LED PICO_DEFAULT_LED_PIN  /* 25 */
+#elif defined(CYW43_WL_GPIO_LED_PIN)
+#define BUILTIN_LED CYW43_WL_GPIO_LED_PIN  /* Warning, No PWM available on LED! */
+#endif
+
 #if defined(USE_RGB)
 #define WS2812_PIN 23
 #endif

diff --git a/src/midi.h b/src/midi.h
@@ -47,7 +47,7 @@
 #include <math.h>
 
 /* Pico libs */
-#include "pico/mem_ops.h"
+#include "pico/stdlib.h"
 
 
 typedef enum {

diff --git a/src/usbsid.c b/src/usbsid.c
@@ -356,6 +356,7 @@ void __not_in_flash_func(handle_buffer_task)(uint8_t * itf, uint32_t * n)
 /* It goes up and it goes down */
 void led_vumeter_task(void)
 {
+  #if LED_PWM
   if (to_ms_since_boot(get_absolute_time()) - start_ms < breathe_interval_ms) {
     return;  /* not enough time */
   }
@@ -452,11 +453,13 @@ void led_vumeter_task(void)
       sid_memory[0x0E], sid_memory[0x0F], sid_memory[0x10], sid_memory[0x11], sid_memory[0x12], sid_memory[0x13], sid_memory[0x14]);
 
   }
+  #endif
 }
 
 /* Mouth breather! */
 void led_breathe_task(void)
 {
+  #if LED_PWM
   if (usbdata == 0 && dtype == ntype) {
     if (to_ms_since_boot(get_absolute_time()) - start_ms < breathe_interval_ms) {
       return;  /* not enough time */
@@ -495,6 +498,7 @@ void led_breathe_task(void)
     }
     #endif
   }
+  #endif
 }
 
 

diff --git a/src/usbsid.h b/src/usbsid.h
@@ -47,7 +47,6 @@
 #include "pico/types.h"     /* absolute_time_t */
 #include "pico/multicore.h" /* Multicore */
 #include "pico/sem.h"       /* Semaphores */
-#include "pico/mem_ops.h"   /* Optimized memory handling functions string.h replacement */
 
 /* Hardware api's */
 #include "hardware/clocks.h"