Updated to .NET 9.2 release

jake1164 · Nov 30, 2024 · 8734f5d · 8734f5d
1 parent eded794
commit 8734f5d
Show file tree

Hide file tree

Showing 68 changed files with 121 additions and 501 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,12 +18,12 @@ jobs:
         echo '{ "version":"${{ github.event.release.tag_name }}" }' > src/.version
 
     - name: Run MPY Action
-      uses: jake1164/build-mpy@fetch-submodules-fix
+      uses: adafruit/build-mpy@v1
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
-        circuitpy-tag: "8.2.0"
+        circuitpy-tag: "8.0.0"
         mpy-directory: "src"
         mpy-manifest-file: "mpy-manifest.txt"
         mpy-manifest-type: "exclude"
-        zip-directory: "."
-        zip-filename: "weather-matrix-${{ github.event.release.tag_name }}.zip"
+        zip-directory: "src"
+        zip-filename: "weather-matrix-${{ github.event.release.tag_name }}.zip"
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Pico-RGB-Matrix-Clock
 LED Matrix Clock with Open Weather Map enabled weather running on a Raspberry Pico W and a WaveShare [Pico-RGB-Matrix-P3-64x32](https://www.waveshare.com/wiki/Pico-RGB-Matrix-P3-64x32)
 
-## NOTE: THIS PROJECT HAS BEEN UPDATED AND REQUIRES CircuitPython 9.0.0
+## NOTE: THIS PROJECT HAS BEEN UPDATED AND REQUIRES CircuitPython 9.0.0 or later
 This project requires that you use [circuitpython 9.x.x](https://circuitpython.org/board/raspberry_pi_pico_w/). 
 If you still wish to use 8.x you will need to use an older [release](https://github.com/jake1164/Pico-RGB-Matrix-Weather-Clock/releases/tag/v0.54.0)
 

diff --git a/src/lib/adafruit_bitmap_font/bdf.mpy b/src/lib/adafruit_bitmap_font/bdf.mpy
diff --git a/src/lib/adafruit_bitmap_font/bdf.py b/src/lib/adafruit_bitmap_font/bdf.py
@@ -33,7 +33,11 @@
 from fontio import Glyph
 from .glyph_cache import GlyphCache
 
+<<<<<<< HEAD
 __version__ = "2.1.3"
+=======
+__version__ = "2.1.1"
+>>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Bitmap_Font.git"
 
 

diff --git a/src/lib/adafruit_bitmap_font/bitmap_font.mpy b/src/lib/adafruit_bitmap_font/bitmap_font.mpy
diff --git a/src/lib/adafruit_bitmap_font/bitmap_font.py b/src/lib/adafruit_bitmap_font/bitmap_font.py
@@ -31,7 +31,11 @@
 except ImportError:
     pass
 
+<<<<<<< HEAD
 __version__ = "2.1.3"
+=======
+__version__ = "2.1.1"
+>>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Bitmap_Font.git"
 
 

diff --git a/src/lib/adafruit_bitmap_font/glyph_cache.mpy b/src/lib/adafruit_bitmap_font/glyph_cache.mpy
diff --git a/src/lib/adafruit_bitmap_font/glyph_cache.py b/src/lib/adafruit_bitmap_font/glyph_cache.py
@@ -30,7 +30,11 @@
 
 import gc
 
+<<<<<<< HEAD
 __version__ = "2.1.3"
+=======
+__version__ = "2.1.1"
+>>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Bitmap_Font.git"
 
 

diff --git a/src/lib/adafruit_bitmap_font/pcf.mpy b/src/lib/adafruit_bitmap_font/pcf.mpy