Merge branch 'develop'

Author: Vincent-FK

FunKey/board/funkey/rootfs-overlay/etc/hwrevision

@@ -1 +1 @@
-FunKey_S	Rev.E
+FunKey_S	Rev.F

FunKey/board/funkey/rootfs-overlay/etc/issue

@@ -5,6 +5,6 @@
 |___|    |_____|__|__||__|\__||_____|___  |
          FUN ON A KEYCHAIN          |_____|
  -----------------------------------------------------
- Version 2.1.0
+ Version 2.2.0
  -----------------------------------------------------
 

FunKey/board/funkey/rootfs-overlay/etc/os-release

@@ -1,12 +1,12 @@
 NAME="FunKey-OS"
-VERSION="2.1.0 (Cruising Chicken)"
+VERSION="2.2.0 (Pyromaniac Penguin)"
 ID=funkey
 ID_LIKE=buildroot
-PRETTY_NAME="FunKey-OS 2.1.0"
-VERSION_ID="2.1.0"
+PRETTY_NAME="FunKey-OS 2.2.0"
+VERSION_ID="2.2.0"
 HOME_URL="https://www.funkey-project.com/"
 SUPPORT_URL="https://www.funkey-project.com/"
 BUG_REPORT_URL="https://www.funkey-project.com/"
 PRIVACY_POLICY_URL="https://www.funkey-project.com"
-VERSION_CODENAME=Cruising
-UBUNTU_CODENAME=Cruising
+VERSION_CODENAME=Pyromaniac
+UBUNTU_CODENAME=Pyromaniac

FunKey/board/funkey/rootfs-overlay/etc/sw-versions

@@ -1 +1 @@
-rootfs	2.1.0
+rootfs	2.2.0

FunKey/board/funkey/rootfs-overlay/usr/local/sbin/start_launcher

@@ -60,8 +60,11 @@ while true; do
 		wait $!
 		erase_pid
 
-		# In case retrofe quits with errors, clear graphic VT
+		# In case retrofe/opkrun quits with errors, clear graphic VT
 		termfix_all
+
+		# In case retrofe/opkrun quits with errors, reset default key mapping
+		keymap reset
     fi
 
     # WD to prevent 100% CPU

FunKey/board/funkey/sw-description

@@ -1,8 +1,8 @@
 software =
 {
-	version = "2.1.0";
+	version = "2.2.0";
 
-	hardware-compatibility = [ "#RE:^Rev\.[D-E]$" ];
+	hardware-compatibility = [ "#RE:^Rev\.[D-F]$" ];
 
 	images: (
 	{
@@ -13,12 +13,6 @@ software =
 		compressed = "zlib";
 	}
 	);
-	files: (
-	{
-		filename = "funkey_gpio_management";
-		path = "/tmp/funkey_gpio_management";
-	}
-	);
 	scripts: (
 	{
 		filename = "update_partition";

FunKey/board/funkey/update_partition

@@ -9,35 +9,27 @@ root_mount=/tmp/rootfs
 
 do_preinst()
 {
-    notif " 1/5 EXTRACT FIRMWARE UPDATE..^DO NOT TURN OFF THE CONSOLE"
+    notif " 1/4 EXTRACT FIRMWARE UPDATE..^DO NOT TURN OFF THE CONSOLE"
     exit 0
 }
 
 do_postinst()
 {
-    ################
-    # Fix recovery #
-    ################
-    notif " 2/5 FIX RECOVERY GPIO MANAGER"
-    rw
-    cp -a /tmp/funkey_gpio_management /usr/local/sbin/
-    chmod +x /usr/local/sbin/funkey_gpio_management
-    ro
-    
+
     #################
     # Resize Rootfs #
     #################
-    notif " 3/5 RESIZE ROOT FILESYSTEM^DO NOT TURN OFF THE CONSOLE"
+    notif " 2/4 RESIZE ROOT FILESYSTEM^DO NOT TURN OFF THE CONSOLE"
     resize2fs ${root_part}
     if [ $? -ne 0 ]; then
     	notif " CANNOT RESIZE ROOT^FILESYSTEM"
     	exit 1
     fi
 
-    #############
-    # Copy OPKs #
-    #############
-    notif " 4/5 COPY OPKS TO USB MOUNT^DO NOT TURN OFF THE CONSOLE"
+    ##############################
+    # SHARED PARTITION PROCESSES #
+    ##############################
+    notif " 3/4 COPY OPKS TO USB MOUNT^DO NOT TURN OFF THE CONSOLE"
 
     # Mount Rootfs
     mkdir -p ${root_mount}
@@ -48,12 +40,10 @@ do_postinst()
     fi
 
     # Copy OPKs
-    shared_partition=/mnt/
-    mkdir -p "$shared_partition"
-    cp -r ${root_mount}/usr/local/share/OPKs/* "$shared_partition"
+    cp -r ${root_mount}/usr/local/share/OPKs/* /mnt
 
     # Fix PCE opk name if necessary
-    mv "$shared_partition"/Emulators/pce_mednaefn_funkey-s.opk "$shared_partition"/Emulators/pce_mednafen_funkey-s.opk 1>/dev/null 2>&1
+    mv /mnt/Emulators/pce_mednaefn_funkey-s.opk /mnt/Emulators/pce_mednafen_funkey-s.opk 1>/dev/null 2>&1
 
     # Unmount Rootfs
     umount ${root_mount}
@@ -62,11 +52,21 @@ do_postinst()
     	exit 1
     fi
 
+    # Change FunKey config files extension from .cfg to .fkcfg
+    SAVEIFS=$IFS
+    IFS=$(echo -en "\n\b")
+    for FOLDER in "Atari lynx" "Game Boy" "Game Boy Advance" "Game Boy Color" "Game Gear" "Neo Geo Pocket" "NES" "PCE-TurboGrafx" "PS1" "Sega Genesis" "Sega Master System" "SNES" "WonderSwan"; do
+        for FILE in $(ls /mnt/"${FOLDER}"/*.cfg 2>/dev/null); do
+            mv "$FILE" "${FILE%.cfg}.fkcfg"
+        done
+    done
+    IFS=$SAVEIFS
+
     #####################
     # Erase update file #
     #####################
     for file in $(ls /mnt/FunKey-*.fwu); do
-        notif " 5/5 ERASE UPDATE FILE^DO NOT TURN OFF THE CONSOLE"
+        notif " 4/4 ERASE UPDATE FILE^DO NOT TURN OFF THE CONSOLE"
     	rm -f "${file}"
     done
     exit 0

FunKey/configs/funkey_defconfig

@@ -26,7 +26,7 @@ BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/FunKey-Project/linux/archive/linux-FunKey-1.0.1.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/FunKey-Project/linux/archive/refs/tags/linux-FunKey-1.0.2.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/linux.config"
 BR2_LINUX_KERNEL_LZO=y

FunKey/package/FCEUX/FCEUX.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FCEUX_VERSION = fceux-FunKey-1.2.0
+FCEUX_VERSION = fceux-FunKey-1.2.1
 FCEUX_SITE_METHOD = git
 FCEUX_SITE = https://github.com/FunKey-Project/fceux.git
 FCEUX_LICENSE = GPL-2.0

FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PCSX_REARMED_VERSION = pcsx_rearmed-FunKey-1.2.0
+PCSX_REARMED_VERSION = pcsx_rearmed-FunKey-1.2.1
 PCSX_REARMED_SITE_METHOD = git
 PCSX_REARMED_SITE = https://github.com/FunKey-Project/pcsx_rearmed.git
 PCSX_REARMED_LICENSE = GPL-2.0