Merge branch 'adafruit:main' into main

Author: waiweng83

.github/workflows/create_website_pr.yml

@@ -42,5 +42,5 @@ jobs:
       working-directory: tools
       env:
         RELEASE_TAG: ${{ github.event.release.tag_name }}
-        ADABOT_GITHUB_ACCESS_TOKEN: ${{ secrets.BLINKA_GITHUB_ACCESS_TOKEN }}
+        ADABOT_GITHUB_ACCESS_TOKEN: ${{ secrets.ADABOT_GITHUB_ACCESS_TOKEN }}
       if: github.event_name == 'release' && (github.event.action == 'published'  || github.event.action == 'rerequested')

.gitmodules

@@ -196,6 +196,9 @@
 	url = https://github.com/raspberrypi/rpi-firmware.git
 	branch = master
 	shallow = true
+[submodule "lib/adafruit_floppy"]
+	path = lib/adafruit_floppy
+	url = https://github.com/adafruit/Adafruit_Floppy
 [submodule "ports/stm/st_driver/cmsis_device_f4"]
 	path = ports/stm/st_driver/cmsis_device_f4
 	url = https://github.com/STMicroelectronics/cmsis_device_f4.git

conf.py

@@ -83,7 +83,7 @@
 ]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['templates']
+templates_path = ['templates', "docs/templates"]
 
 # The suffix of source filenames.
 source_suffix = {

extmod/vfs_fat.c

@@ -440,7 +440,7 @@ STATIC const mp_obj_property_t fat_vfs_label_obj = {
     .base.type = &mp_type_property,
     .proxy = {(mp_obj_t)&fat_vfs_getlabel_obj,
               (mp_obj_t)&fat_vfs_setlabel_obj,
-              (mp_obj_t)MP_ROM_NONE},
+              MP_ROM_NONE},
 };
 #endif