Skip to content

Commit 7a15dcc

Browse files
Vincent-FKVincent-FK
committed
Merge branch 'develop'
2 parents 484d4e6 + 208303e commit 7a15dcc

114 files changed

Lines changed: 1610 additions & 1202 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎FunKey/Config.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ source "$BR2_EXTERNAL_FUNKEY_PATH/package/agg/Config.in"
1818
source "$BR2_EXTERNAL_FUNKEY_PATH/package/fluidlite/Config.in"
1919
source "$BR2_EXTERNAL_FUNKEY_PATH/package/libmikmod/Config.in"
2020
source "$BR2_EXTERNAL_FUNKEY_PATH/package/commander/Config.in"
21+
source "$BR2_EXTERNAL_FUNKEY_PATH/package/bibi/Config.in"

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ MAP B TO KEY KEY_B
1515
MAP X TO KEY KEY_X
1616
MAP Y TO KEY KEY_Y
1717
MAP MENU TO KEY KEY_Q
18-
MAP FN+UP TO COMMAND snap
19-
MAP FN+A TO COMMAND quick_action_volume_up
20-
MAP FN+Y TO COMMAND quick_action_volume_down
21-
MAP FN+X TO COMMAND quick_action_bright_up
22-
MAP FN+B TO COMMAND quick_action_bright_down
18+
MAP FN+UP TO COMMAND snapshot
19+
MAP FN+A TO COMMAND volume up
20+
MAP FN+Y TO COMMAND volume down
21+
MAP FN+X TO COMMAND brightness up
22+
MAP FN+B TO COMMAND brightness down
2323
MAP FN+L TO KEY KEY_V
2424
MAP FN+R TO KEY KEY_O
25-
MAP FN+L+R TO COMMAND display_notif_system_stats
25+
MAP FN+L+R TO COMMAND system_stats toggle

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
|___| |_____|__|__||__|\__||_____|___ |
66
FUN ON A KEYCHAIN |_____|
77
-----------------------------------------------------
8-
Version 2.2.0
8+
Version 2.3.0
99
-----------------------------------------------------
1010

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
NAME="FunKey-OS"
2-
VERSION="2.2.0 (Pyromaniac Penguin)"
2+
VERSION="2.3.0 (Zen Zebu)"
33
ID=funkey
44
ID_LIKE=buildroot
5-
PRETTY_NAME="FunKey-OS 2.2.0"
6-
VERSION_ID="2.2.0"
5+
PRETTY_NAME="FunKey-OS 2.3.0"
6+
VERSION_ID="2.3.0"
77
HOME_URL="https://www.funkey-project.com/"
88
SUPPORT_URL="https://www.funkey-project.com/"
99
BUG_REPORT_URL="https://www.funkey-project.com/"
1010
PRIVACY_POLICY_URL="https://www.funkey-project.com"
11-
VERSION_CODENAME=Pyromaniac
12-
UBUNTU_CODENAME=Pyromaniac
11+
VERSION_CODENAME=Zen
12+
UBUNTU_CODENAME=Zen

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
rootfs 2.2.0
1+
rootfs 2.3.0

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

Lines changed: 45 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,46 @@ alias l='ls $LS_OPTIONS -lA'
1818
# alias cp='cp -i'
1919
# alias mv='mv -i'
2020

21+
# Alias functions for compatibility
22+
volume_get() {
23+
volume get "$@"
24+
}
25+
26+
volume_set() {
27+
volume set "$@"
28+
}
29+
30+
brightness_get() {
31+
brightness get "$@"
32+
}
33+
34+
brightness_set() {
35+
brightness set "$@"
36+
}
37+
38+
notif_set() {
39+
notif set "$@"
40+
}
41+
42+
start_audio_amp() {
43+
audio_amp "$@"
44+
}
45+
46+
cancel_sched_powerdown() {
47+
powerdown handle
48+
}
49+
2150
# Relocate HOME into the r/w partition
2251
export HOME=/mnt/FunKey
2352
mkdir -p "${HOME}"
2453
export MEDNAFEN_HOME=$HOME/.mednafen
2554
mkdir -p "${MEDNAFEN_HOME}"
55+
cp "/usr/games/lynxboot.img" "/usr/games/mednafen-09x.cfg" "${MEDNAFEN_HOME}/"
2656
export GMENU2X_HOME="$HOME/.gmenu2x"
2757
mkdir -p "${GMENU2X_HOME}"
58+
export RETROFE_HOME="$HOME/.retrofe"
59+
mkdir -p "${RETROFE_HOME}"
60+
mkdir -p "${RETROFE_HOME}/layouts"
2861

2962
# Resize the console to the terminal dimensions
3063
resize() {
@@ -44,22 +77,20 @@ resize() {
4477
fi
4578
}
4679

80+
# Restore saved volume
81+
echo "Restore saved volume"
82+
volume set $(volume get) >/dev/null 2>&1
4783

48-
# Start ampli
49-
echo "Start audio amplifier"
50-
start_audio_amp 1 >/dev/null 2>&1
51-
52-
# Force unmute sound card and reset volume
53-
echo "Force unmute sound card and reset volume"
54-
volume_set $(volume_get) >/dev/null 2>&1
55-
56-
# Reset saved brightness
57-
echo "Reset saved brightness"
58-
brightness_set $(brightness_get) >/dev/null 2>&1
84+
# Restore saved brightness
85+
echo "Restore saved brightness"
86+
brightness set $(brightness get) >/dev/null 2>&1
5987

6088
# Start Assembly tests (blocking process)
6189
assembly_tests >/dev/null 2>&1
6290

63-
# Start launcher
64-
echo "Start launcher"
65-
start_launcher >/dev/null 2>&1 &
91+
# Restart saved application/game if any
92+
instant_play load
93+
94+
# Start frontend
95+
echo "Start frontend"
96+
frontend init >/dev/null 2>&1 &

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ cp /usr/games/mednafen-09x.cfg ${MEDNAFEN_HOME}/
55
# Launch the process in background, record the PID into a file, wait
66
# for the process to terminate and erase the recorded PID
77
mednafen -fs 1 -gg.stretch full "$1"&
8-
record_pid $!
8+
pid record $!
99
wait $!
10-
erase_pid
10+
pid erase

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
# Launch the process in background, record the PID into a file, wait
44
# for the process to terminate and erase the recorded PID
55
sdlgnuboy --syncrtc --stereo=0 "$1"&
6-
record_pid $!
6+
pid record $!
77
wait $!
8-
erase_pid
8+
pid erase

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# for the process to terminate and erase the recorded PID
55
cd ${HOME}
66
gpsp "$1"&
7-
record_pid $!
7+
pid record $!
88
wait $!
9-
erase_pid
9+
pid erase
1010

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
# Launch the process in background, record the PID into a file, wait
44
# for the process to terminate and erase the recorded PID
55
gpsp "$1"&
6-
record_pid $!
6+
pid record $!
77
wait $!
8-
erase_pid
8+
pid erase

0 commit comments

Comments
 (0)