Merge branch 'develop'

Author: Vincent-FK

FunKey/Config.in

@@ -18,3 +18,4 @@ source "$BR2_EXTERNAL_FUNKEY_PATH/package/agg/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/fluidlite/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/libmikmod/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/commander/Config.in"
+source "$BR2_EXTERNAL_FUNKEY_PATH/package/bibi/Config.in"

FunKey/board/funkey/rootfs-overlay/etc/fkgpiod.conf

@@ -15,11 +15,11 @@ MAP B        TO KEY     KEY_B
 MAP X        TO KEY     KEY_X
 MAP Y        TO KEY     KEY_Y
 MAP MENU     TO KEY     KEY_Q
-MAP FN+UP    TO COMMAND snap
-MAP FN+A     TO COMMAND quick_action_volume_up
-MAP FN+Y     TO COMMAND quick_action_volume_down
-MAP FN+X     TO COMMAND quick_action_bright_up
-MAP FN+B     TO COMMAND quick_action_bright_down
+MAP FN+UP    TO COMMAND snapshot
+MAP FN+A     TO COMMAND volume up
+MAP FN+Y     TO COMMAND volume down
+MAP FN+X     TO COMMAND brightness up
+MAP FN+B     TO COMMAND brightness down
 MAP FN+L     TO KEY     KEY_V
 MAP FN+R     TO KEY     KEY_O
-MAP FN+L+R   TO COMMAND display_notif_system_stats
+MAP FN+L+R   TO COMMAND system_stats toggle

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

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

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

@@ -1,12 +1,12 @@
 NAME="FunKey-OS"
-VERSION="2.2.0 (Pyromaniac Penguin)"
+VERSION="2.3.0 (Zen Zebu)"
 ID=funkey
 ID_LIKE=buildroot
-PRETTY_NAME="FunKey-OS 2.2.0"
-VERSION_ID="2.2.0"
+PRETTY_NAME="FunKey-OS 2.3.0"
+VERSION_ID="2.3.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=Pyromaniac
-UBUNTU_CODENAME=Pyromaniac
+VERSION_CODENAME=Zen
+UBUNTU_CODENAME=Zen

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

@@ -1 +1 @@
-rootfs	2.2.0
+rootfs	2.3.0

FunKey/board/funkey/rootfs-overlay/root/.profile

@@ -18,13 +18,46 @@ alias l='ls $LS_OPTIONS -lA'
 # alias cp='cp -i'
 # alias mv='mv -i'
 
+# Alias functions for compatibility
+volume_get() {
+    volume get "$@"
+}
+
+volume_set() {
+    volume set "$@"
+}
+
+brightness_get() {
+    brightness get "$@"
+}
+
+brightness_set() {
+    brightness set "$@"
+}
+
+notif_set() {
+    notif set "$@"
+}
+
+start_audio_amp() {
+    audio_amp "$@"
+}
+
+cancel_sched_powerdown() {
+    powerdown handle
+}
+
 # Relocate HOME into the r/w partition
 export HOME=/mnt/FunKey
 mkdir -p "${HOME}"
 export MEDNAFEN_HOME=$HOME/.mednafen
 mkdir -p "${MEDNAFEN_HOME}"
+cp "/usr/games/lynxboot.img" "/usr/games/mednafen-09x.cfg" "${MEDNAFEN_HOME}/"
 export GMENU2X_HOME="$HOME/.gmenu2x"
 mkdir -p "${GMENU2X_HOME}"
+export RETROFE_HOME="$HOME/.retrofe"
+mkdir -p "${RETROFE_HOME}"
+mkdir -p "${RETROFE_HOME}/layouts"
 
 # Resize the console to the terminal dimensions
 resize() {
@@ -44,22 +77,20 @@ resize() {
     fi
 }
 
+# Restore saved volume
+echo "Restore saved volume"
+volume set $(volume get) >/dev/null 2>&1
 
-# Start ampli
-echo "Start audio amplifier"
-start_audio_amp 1 >/dev/null 2>&1
-
-# Force unmute sound card and reset volume
-echo "Force unmute sound card and reset volume"
-volume_set $(volume_get) >/dev/null 2>&1
-
-# Reset saved brightness
-echo "Reset saved brightness"
-brightness_set $(brightness_get) >/dev/null 2>&1
+# Restore saved brightness
+echo "Restore saved brightness"
+brightness set $(brightness get) >/dev/null 2>&1
 
 # Start Assembly tests (blocking process)
 assembly_tests >/dev/null 2>&1
 
-# Start launcher
-echo "Start launcher"
-start_launcher >/dev/null 2>&1 &
+# Restart saved application/game if any
+instant_play load
+
+# Start frontend
+echo "Start frontend"
+frontend init >/dev/null 2>&1 &

FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gamegear_launch.sh

@@ -5,6 +5,6 @@ cp /usr/games/mednafen-09x.cfg ${MEDNAFEN_HOME}/
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
 mednafen -fs 1 -gg.stretch full "$1"&
-record_pid $!
+pid record $!
 wait $!
-erase_pid
+pid erase

FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gb_launch.sh

@@ -3,6 +3,6 @@
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
 sdlgnuboy --syncrtc --stereo=0 "$1"&
-record_pid $!
+pid record $!
 wait $!
-erase_pid
+pid erase

FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gba_launch_gpsp.sh

@@ -4,7 +4,7 @@
 # for the process to terminate and erase the recorded PID
 cd ${HOME}
 gpsp "$1"&
-record_pid $!
+pid record $!
 wait $!
-erase_pid
+pid erase
 

FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gba_launch_mednafen.sh

@@ -3,6 +3,6 @@
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
 gpsp "$1"&
-record_pid $!
+pid record $!
 wait $!
-erase_pid
+pid erase