Merge remote-tracking branch 'qmk/master' into merge-2023-03-12

util/chibios_conf_updater.sh

@@ -12,11 +12,12 @@ umask 022
 #   wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add -
 #   sudo add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
 #   sudo apt-get update && sudo apt-get install adoptopenjdk-8-hotspot
-
+#
+# For Fedora 37-ish distros:
+#  sudo dnf install -y ant java-1.8.0-openjdk.x86_64
 
 sinfo() { echo "$@" >&2 ; }
 shead() { sinfo "" ; sinfo "---------------------------------" ; sinfo "-- $@" ; sinfo "---------------------------------" ; }
-havecmd()  { command command type "${1}" >/dev/null 2>&1 || return 1 ; }
 
 this_script="$(realpath "${BASH_SOURCE[0]}")"
 script_dir="$(realpath "$(dirname "$this_script")")"
@@ -31,7 +32,7 @@ build_fmpp() {
         || { mkdir "$script_dir/fmpp" && tar xf "$script_dir/fmpp.tar.gz" -C "$script_dir/fmpp" --strip-components=1 ; }
     pushd "$script_dir/fmpp" >/dev/null 2>&1
     sed -e "s#bootclasspath.path=.*#bootclasspath.path=$(find /usr/lib/jvm -name 'rt.jar' | sort | tail -n1)#g" \
-        -e "s#ant.jar.path=.*#ant.jar.path=$(find /usr/share/java -name 'ant-1*.jar' | sort | tail -n1)#g" \
+        -e "s#ant.jar.path=.*#ant.jar.path=$(find /usr/share/java -name 'ant-1*.jar' -or -name 'ant.jar' | sort | tail -n1)#g" \
         build.properties.sample > build.properties
     sed -e 's#source="1.5"#source="1.8"#g' \
         -e 's#target="1.5"#target="1.8"#g' \
@@ -98,7 +99,8 @@ upgrade_mcuconf_files() {
     popd >/dev/null 2>&1
 }
 
-havecmd fmpp || build_fmpp
+hash -r
+[[ -n "$(which fmpp 2>/dev/null)" ]] || build_fmpp
 
 upgrade_mcuconf_files
 upgrade_chconf_files

util/docker_build.sh

@@ -19,14 +19,14 @@ if [ $# -gt 1 ]; then
 	exit 1
 fi
 
-# Allow $RUNTIME to be overriden by the user as an environment variable
-# Else check if either docker or podman exit and set them as runtime
+# Allow $RUNTIME to be overridden by the user as an environment variable
+# Else check if either podman or docker exit and set them as runtime
 # if none are found error out
 if [ -z "$RUNTIME" ]; then
-	if command -v docker >/dev/null 2>&1; then
-		RUNTIME="docker"
-	elif command -v podman >/dev/null 2>&1; then
+	if command -v podman >/dev/null 2>&1; then
 		RUNTIME="podman"
+	elif command -v docker >/dev/null 2>&1; then
+		RUNTIME="docker"
 	else
 		errcho "Error: no compatible container runtime found."
 		errcho "Either podman or docker are required."
@@ -36,7 +36,7 @@ if [ -z "$RUNTIME" ]; then
 		exit 2
 	fi
 fi
-	
+
 
 # Determine arguments
 if [ $# -eq 0 ]; then

util/docker_cmd.sh

@@ -15,14 +15,14 @@ for arg; do
 	fi
 done
 
-# Allow $RUNTIME to be overriden by the user as an environment variable
-# Else check if either docker or podman exit and set them as runtime
+# Allow $RUNTIME to be overridden by the user as an environment variable
+# Else check if either podman or docker exit and set them as runtime
 # if none are found error out
 if [ -z "$RUNTIME" ]; then
-	if command -v docker >/dev/null 2>&1; then
-		RUNTIME="docker"
-	elif command -v podman >/dev/null 2>&1; then
+	if command -v podman >/dev/null 2>&1; then
 		RUNTIME="podman"
+	elif command -v docker >/dev/null 2>&1; then
+		RUNTIME="docker"
 	else
 		errcho "Error: no compatible container runtime found."
 		errcho "Either podman or docker are required."

util/install/fedora.sh

@@ -6,9 +6,14 @@ _qmk_install() {
     # TODO: Check whether devel/headers packages are really needed
     sudo dnf $SKIP_PROMPT install \
         clang diffutils git gcc glibc-headers kernel-devel kernel-headers \
-        make unzip wget zip python3 avr-binutils avr-gcc avr-libc \
-        arm-none-eabi-binutils-cs arm-none-eabi-gcc-cs arm-none-eabi-newlib \
-        avrdude dfu-programmer dfu-util hidapi libusb-devel
+        make unzip wget zip python3 avr-binutils avr-gcc avr-gcc-c++ avr-libc \
+        arm-none-eabi-binutils-cs arm-none-eabi-gcc-cs arm-none-eabi-gcc-cs-c++ \
+        arm-none-eabi-newlib avrdude dfu-programmer dfu-util hidapi
+
+    # Handle discrepancies between different Fedora versions
+    sudo dnf $SKIP_PROMPT install libusb-devel \
+        || sudo dnf $SKIP_PROMPT install libusb1-devel libusb-compat-0.1-devel \
+        || sudo dnf $SKIP_PROMPT install libusb0-devel
 
     python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt
 }

util/install/gentoo.sh

@@ -19,7 +19,7 @@ _qmk_install() {
 
     sudo touch /etc/portage/package.use/qmkfirmware
     # tee is used here since sudo doesn't apply to >>
-    echo "sys-devel/gcc multilib" | sudo tee --append /etc/portage/package.use/qmkfirmware >/dev/null
+    echo "sys-devel/gcc multilib\ncross-arm-none-eabi/newlib nano" | sudo tee --append /etc/portage/package.use/qmkfirmware >/dev/null
     sudo emerge -auN sys-devel/gcc
     sudo emerge -au --noreplace \
         app-arch/unzip app-arch/zip net-misc/wget sys-devel/clang \

util/list_keyboards.sh

@@ -1,18 +0,0 @@
-#!/bin/sh
-# Temporary shell script to find keyboards
-#
-# This allows us to exclude keyboards by including a .noci file.
-
-find -L keyboards -type f -name rules.mk | grep -v keymaps | sed 's!keyboards/\(.*\)/rules.mk!\1!' | while read keyboard; do
-	if [ "$1" = "noci" ]; then
-		case "$keyboard" in
-			handwired/*)
-				;;
-			*)
-				test -e "keyboards/${keyboard}/.noci" || echo "$keyboard"
-				;;
-		esac
-	else
-		echo "$keyboard"
-	fi
-done

util/regen.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+
+qmk generate-rgb-breathe-table -o quantum/rgblight/rgblight_breathe_table.h
+qmk generate-keycodes --version latest -o quantum/keycodes.h
+qmk generate-keycodes-tests --version latest -o tests/test_common/keycode_table.cpp
+
+for lang in $(find data/constants/keycodes/extras/ -type f -exec basename '{}' \; | sed "s/keycodes_\(.*\)_[0-9].*/\1/"); do
+  qmk generate-keycode-extras --version latest --lang $lang -o quantum/keymap_extras/keymap_$lang.h
+done

util/size_regression.sh

@@ -64,6 +64,7 @@ fixup_submodules() {
     [ -e lib/ugfx ] && rm -rf lib/ugfx
     [ -e lib/pico-sdk ] && rm -rf lib/pico-sdk
     [ -e lib/chibios-contrib/ext/mcux-sdk ] && rm -rf lib/chibios-contrib/ext/mcux-sdk
+    [ -e lib/lvgl ] && rm -rf lib/lvgl
     make git-submodule
 }
 

util/udev/50-qmk.rules

@@ -81,3 +81,6 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="314b", ATTRS{idProduct}=="0106", TAG+="uacc
 
 # GD32V DFU
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="28e9", ATTRS{idProduct}=="0189", TAG+="uaccess"
+
+# WB32 DFU
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="342d", ATTRS{idProduct}=="dfa0", TAG+="uaccess"

util/update_chibios_mirror.sh

@@ -7,7 +7,7 @@
 chibios_branches="trunk stable_20.3.x stable_21.11.x"
 
 # The ChibiOS tags to mirror
-chibios_tags="ver20.3.1 ver20.3.2 ver20.3.3 ver20.3.4 ver21.11.1 ver21.11.2"
+chibios_tags="ver20.3.1 ver20.3.2 ver20.3.3 ver20.3.4 ver21.11.1 ver21.11.2 ver21.11.3"
 
 # The ChibiOS-Contrib branches to mirror
 contrib_branches="chibios-20.3.x chibios-21.11.x"
@@ -32,7 +32,7 @@ contrib_git_config=$(realpath "$contrib_git_location/config")
 cd "$chibios_dir"
 
 if [[ -z "$(cat "$chibios_git_config" | grep '\[svn-remote "svn"\]')" ]] ; then
-    git svn init --stdlayout --prefix='svn/' http://svn.osdn.net/svnroot/chibios/
+    git svn init --stdlayout --prefix='svn/' https://svn.code.sf.net/p/chibios/code/
 fi
 
 if [[ -z "$(cat "$chibios_git_config" | grep '\[remote "qmk"\]')" ]] ; then