Merge branch 'pimoroni:main' into main

Author: waffshappen

.github/workflows/cmake.yml

@@ -7,11 +7,12 @@ on:
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
+  PICO_SDK_VERSION: 2.0.0
 
 jobs:
   build:
     name: ${{matrix.name}} (C++)
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         include:
@@ -43,6 +44,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         repository: raspberrypi/pico-sdk
+        ref: ${{ env.PICO_SDK_VERSION }}
         path: pico-sdk
         submodules: true
 
@@ -54,11 +56,15 @@ jobs:
         path: pico-extras
         submodules: false  # lwip breaks audio submodule fetching
 
+    - name: Install Arm GNU Toolchain (arm-none-eabi-gcc)
+      uses: carlosperate/arm-none-eabi-gcc-action@v1
+      with:
+        release: '13.3.Rel1'
+
     # Linux deps
     - name: Install deps
-      if: runner.os == 'Linux'
       run: |
-        sudo apt update && sudo apt install ccache gcc-arm-none-eabi
+        sudo apt update && sudo apt install ccache
 
     - name: Create Build Environment
       run: cmake -E make_directory ${{runner.workspace}}/build

.github/workflows/micropython.yml

@@ -12,7 +12,7 @@ env:
 jobs:
   build:
     name: ${{ matrix.name }} (${{ matrix.board }})
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     continue-on-error: true
     strategy:
       matrix:
@@ -71,7 +71,7 @@ jobs:
     - name: Install Arm GNU Toolchain (arm-none-eabi-gcc)
       uses: carlosperate/arm-none-eabi-gcc-action@v1
       with:
-        release: '9-2020-q2'
+        release: '13.3.Rel1'
 
     - name: Install CCache
       run: |
@@ -95,12 +95,6 @@ jobs:
         source $BUILD_TOOLS
         micropython_build_mpy_cross
 
-    - name: "HACK: CMakeLists.txt Disable C++ Exceptions Patch"
-      shell: bash
-      run: |
-        source $BUILD_TOOLS
-        hack_patch_micropython_disable_exceptions
-
     - name: "HACK: Pico SDK Patch"
       shell: bash
       run: |

README.md

@@ -80,10 +80,11 @@ We also maintain a C++/CMake boilerplate with GitHub workflows configured for te
 * Pico Unicorn Pack - https://shop.pimoroni.com/products/pico-unicorn-pack
 * Pico Audio Pack (C++ only) - https://shop.pimoroni.com/products/pico-audio-pack
 * Pico Wireless Pack - https://shop.pimoroni.com/products/pico-wireless-pack
-* Pico Display 2.0 - https://shop.pimoroni.com/products/pico-display-pack-2-0
+* Pico Display 2.0" - https://shop.pimoroni.com/products/pico-display-pack-2-0
 * Pico Enviro+ Pack - https://shop.pimoroni.com/products/pico-enviro-pack
 * Pico Inky Pack - https://shop.pimoroni.com/products/pico-inky-pack
 * Pico GFX Pack - https://shop.pimoroni.com/products/pico-gfx-pack
+* Pico Display 2.8" - https://shop.pimoroni.com/products/pico-display-pack-2-8
 
 ## SHIMs
 
@@ -145,6 +146,7 @@ We also maintain a C++/CMake boilerplate with GitHub workflows configured for te
 * SCD41 CO2 Sensor (Carbon Dioxide / Temperature / Humidity) - https://shop.pimoroni.com/products/scd41-co2-sensor-breakout
 * VL53L5CX 8x8 Time of Flight Array Sensor - https://shop.pimoroni.com/products/vl53l5cx-time-of-flight-tof-sensor-breakout
 * RGB Encoder Wheel - https://shop.pimoroni.com/products/rgb-encoder-wheel-breakout
+* AS7343 14-Channel Multi-Spectral Sensor Breakout - https://shop.pimoroni.com/products/as7343-breakout
 
 ## Kits
 

ci/micropython.sh

@@ -45,12 +45,6 @@ function micropython_version {
     echo "MICROPY_GIT_HASH=$MICROPYTHON_VERSION-$TAG_OR_SHA" >> $GITHUB_ENV
 }
 
-function hack_patch_micropython_disable_exceptions {
-    cd micropython
-    git apply $PIMORONI_PICO_DIR/micropython/micropython_nano_specs.patch
-    cd ../
-}
-
 function hack_patch_pico_sdk {
     # pico-sdk-patch.sh will apply the patch if it exists
     cd micropython

drivers/as7343/as7343.cpp

@@ -30,7 +30,7 @@ namespace pimoroni {
     i2c->set_bits(address, reg::FIFO_MAP, 0, FIFO_MAP_CH5 | FIFO_MAP_CH4 | FIFO_MAP_CH3 | FIFO_MAP_CH2 | FIFO_MAP_CH1 | FIFO_MAP_CH0 | FIFO_MAP_ASTATUS);
 
     // Set the PON bit
-    i2c->reg_write_uint8(address, reg::ENABLE, ENABLE_WEN | ENABLE_SMUXEN | ENABLE_SP_EN | ENABLE_PON);
+    i2c->reg_write_uint8(address, reg::ENABLE, ENABLE_WEN | ENABLE_SP_EN | ENABLE_PON);
 
     return true;
   }
@@ -135,10 +135,23 @@ namespace pimoroni {
     }
   }
 
+  void AS7343::start_measurement() {
+    if(running) return;
+    i2c->set_bits(address, reg::ENABLE, 0, ENABLE_SMUXEN);
+    running = true;
+  }
+
+  void AS7343::stop_measurement() {
+    i2c->set_bits(address, reg::ENABLE, 0, ENABLE_SMUXEN);
+    running = false;
+  }
+
   void AS7343::read_fifo(uint16_t *buf) {
     uint16_t expected_results = read_cycles * 7;
     uint16_t result_slot = 0;
 
+    start_measurement();
+
     while (i2c->reg_read_uint8(address, reg::FIFO_LVL) < expected_results) {
         sleep_ms(1);
     }

drivers/as7343/as7343.hpp

@@ -49,36 +49,68 @@ namespace pimoroni {
   public:
     struct reading {
         // Cycle 1
+        uint16_t c1_astatus = 0; // (c1_astatus >> 8) & 0b10001111
+                                 // 0b10000000 = saturated
+                                 // 0b00001111 = gain lowest nibble
         uint16_t FZ = 0;   // 428-480 nm
         uint16_t FY = 0;   // 534-593 nm
         uint16_t FXL = 0;  // 593-628 nm
         uint16_t NIR = 0;  // 849-903 nm
 
         uint16_t c1_vis_tl = 0;  // Visible top-left
         uint16_t c1_vis_br = 0;  // Visible bottom-right
-        uint16_t c1_astatus = 0; // (c1_astatus >> 8) & 0b10001111
-                                 // 0b10000000 = saturated
-                                 // 0b00001111 = gain lowest nibble
+        //uint16_t c1_fd = 0;    // This is where flicker detect *would* be
 
         // Cycle 2
+        uint16_t c2_astatus = 0;
         uint16_t F2 = 0;   // 408-448 nm
         uint16_t F3 = 0;   // 448-500 mn
         uint16_t F4 = 0;   // 500-534 nm
         uint16_t F6 = 0;   // 618-665 nm
 
         uint16_t c2_vis_tl = 0;
         uint16_t c2_vis_br = 0;
-        uint16_t c2_astatus = 0;
+        //uint16_t c2_fd = 0;
 
         // Cycle 3
+        uint16_t c3_astatus = 0;
         uint16_t F1 = 0;   // 396-408 nm
-        uint16_t F5 = 0;   // 531-594 nm
         uint16_t F7 = 0;   // 685-715 nm
         uint16_t F8 = 0;   // 715-766 nm
+        uint16_t F5 = 0;   // 531-594 nm
 
         uint16_t c3_vis_tl = 0;
         uint16_t c3_vis_br = 0;
-        uint16_t c3_astatus = 0;
+        //uint16_t c3_fd = 0;
+
+        float gain(uint8_t cycle) {
+          uint8_t status = 0;
+          switch(cycle) {
+            case 1:
+              status = c1_astatus & 0xf;
+              break;
+            case 2:
+              status = c2_astatus & 0xf;
+              break;
+            case 3:
+              status = c3_astatus & 0xf;
+              break;
+          }
+          return status ? 1 << (status - 1) : 0.5f;
+        }
+
+        bool saturated(uint8_t cycle) {
+          switch(cycle) {
+            case 1:
+              return c1_astatus & 0x80;
+            case 2:
+              return c2_astatus & 0x80;
+            case 3:
+              return c3_astatus & 0x80;
+            default:
+              return false;
+          }
+        }
     };
 
 
@@ -95,6 +127,8 @@ namespace pimoroni {
     uint8_t read_cycles = 1;
     uint8_t ch_count = (uint8_t)channel_count::SIX_CHANNEL;
 
+    bool running = false;
+
 
     //--------------------------------------------------
     // Constructors/Destructor
@@ -120,6 +154,9 @@ namespace pimoroni {
 
     void get_version(uint8_t &auxid, uint8_t &revid, uint8_t &hwid);
 
+    void start_measurement();
+    void stop_measurement();
+
     reading read();
 
     void read_fifo(uint16_t *buf);

drivers/pcf85063a/pcf85063a.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "hardware/i2c.h"
-#include "hardware/rtc.h"
+#include "pico/types.h"
 
 #include "common/pimoroni_common.hpp"
 #include "common/pimoroni_i2c.hpp"

drivers/psram_display/psram_display.hpp

@@ -92,7 +92,6 @@ namespace pimoroni {
 
       int __not_in_flash_func(SpiSetBlocking)(const uint16_t uSrc, size_t uLen) 
       {
-        invalid_params_if(SPI, 0 > (int)uLen);
         // Deliberately overflow FIFO, then clean up afterward, to minimise amount
         // of APB polling required per halfword
         for (size_t i = 0; i < uLen; ++i) {

drivers/pwm/pwm_cluster.cpp

@@ -25,10 +25,10 @@ uint8_t PWMCluster::claimed_sms[] = { 0x0, 0x0 };
 uint PWMCluster::pio_program_offset = 0;
 
 
-PWMCluster::PWMCluster(PIO pio, uint sm, uint pin_mask, bool loading_zone)
+PWMCluster::PWMCluster(PIO pio, uint sm, uint64_t pin_mask, bool loading_zone)
 : pio(pio)
 , sm(sm)
-, pin_mask(pin_mask & ((1u << NUM_BANK0_GPIOS) - 1))
+, pin_mask(pin_mask & ((1llu << NUM_BANK0_GPIOS) - 1))
 , channel_count(0)
 , wrap_level(0)
 , loading_zone(loading_zone) {

drivers/pwm/pwm_cluster.hpp

@@ -103,7 +103,7 @@ namespace pimoroni {
     PIO pio;
     uint sm;
     int dma_channel;
-    uint pin_mask;
+    uint64_t pin_mask;
     uint8_t channel_count;
     ChannelState channels[NUM_BANK0_GPIOS];
     uint8_t channel_to_pin_map[NUM_BANK0_GPIOS];
@@ -135,7 +135,7 @@ namespace pimoroni {
     // Constructors/Destructor
     //--------------------------------------------------
   public:
-    PWMCluster(PIO pio, uint sm, uint pin_mask, bool loading_zone = DEFAULT_USE_LOADING_ZONE);
+    PWMCluster(PIO pio, uint sm, uint64_t pin_mask, bool loading_zone = DEFAULT_USE_LOADING_ZONE);
     PWMCluster(PIO pio, uint sm, uint pin_base, uint pin_count, bool loading_zone = DEFAULT_USE_LOADING_ZONE);
     PWMCluster(PIO pio, uint sm, const uint8_t *pins, uint32_t length, bool loading_zone = DEFAULT_USE_LOADING_ZONE);
     PWMCluster(PIO pio, uint sm, std::initializer_list<uint8_t> pins, bool loading_zone = DEFAULT_USE_LOADING_ZONE);