From 7dc82e363554d3f40de714a4c9242ba8421195b9 Mon Sep 17 00:00:00 2001
From: Vincent-FK <vincent.buso@funkey-project.com>
Date: Mon, 4 Jan 2021 18:33:30 +0100
Subject: [PATCH] snapshot msg 2s duration, funkey_gpio_mapping.conf with 0.1
 timeout for sched_shutdown

---
 .../etc/funkey_gpio_mapping.conf              | 27 ++++++++-----------
 .../usr/local/sbin/assembly_tests             |  2 +-
 .../funkey/rootfs-overlay/usr/local/sbin/snap |  2 +-
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/FunKey/board/funkey/rootfs-overlay/etc/funkey_gpio_mapping.conf b/FunKey/board/funkey/rootfs-overlay/etc/funkey_gpio_mapping.conf
index 0af805c..ecbfcbb 100644
--- a/FunKey/board/funkey/rootfs-overlay/etc/funkey_gpio_mapping.conf
+++ b/FunKey/board/funkey/rootfs-overlay/etc/funkey_gpio_mapping.conf
@@ -1,6 +1,6 @@
-##################################
-# Funkey GPIO keymap config file #
-##################################
+####################################
+#  Funkey GPIO keymap config file  #
+####################################
 # Format:
 #
 # 	- First all GPIO Pin numbers must be declared (integers separated by commas)
@@ -21,19 +21,20 @@
 
 
 
-###################################
-#	Pins declaration:
+########################
+#	Pins declaration   #
+########################
 0,1,2,3,4,6,7,10*,11,12,13,14,15
 
 
-###################################
-#	Mapping:
+###############
+#	Mapping   #
+###############
 #7, KEYBOARD, KEY_F, KEY_F, Fn
 #7+6, KEYBOARD, KEY_K, KEY_K, Select
 7, KEYBOARD, KEY_K, KEY_K, Select
 6, KEYBOARD, KEY_S, KEY_S, Start
 3, KEYBOARD, KEY_U, KEY_U, Up
-7+3, KEYBOARD, KEY_P, KEY_P, Quick Save
 4, KEYBOARD, KEY_L, KEY_L, Left
 7+4, KEYBOARD, KEY_J, KEY_J, Aspect ratio factor --
 1, KEYBOARD, KEY_D, KEY_D, Down
@@ -49,19 +50,13 @@
 13, KEYBOARD, KEY_Y, KEY_Y, Y
 11, KEYBOARD, KEY_X, KEY_X, X
 
-7+6, SHELL_COMMAND, snap, Fn+Start, Snapshot
+7+3, SHELL_COMMAND, snapshot, Fn+Start, Snapshot
 7+12, SHELL_COMMAND, quick_action_volume_up, Fn+Y, Volume++
 7+13, SHELL_COMMAND, quick_action_volume_down, Fn+A, Volume--
 7+11, SHELL_COMMAND, quick_action_bright_up, Fn+B, Brightness++
 7+14, SHELL_COMMAND, quick_action_bright_down, Fn+X, Brightness--
-10, SHELL_COMMAND, sched_shutdown 1, N_OE, Instant Play save and Poweroff because of N_OE
+10, SHELL_COMMAND, sched_shutdown 0.1, N_OE, Instant Play save and Poweroff because of N_OE
 7+15+2, SHELL_COMMAND, display_notif_system_stats, Fn+L1+L2, display system cpu and ram usage
 
-#7+12, KEYBOARD, KEY_G, KEY_G, Brightness++
-#7+14, KEYBOARD, KEY_E, KEY_E, Volume--
-#7+13, KEYBOARD, KEY_W, KEY_W, Brightness--
-#7+11, KEYBOARD, KEY_C, KEY_C, Volume++
-#10, KEYBOARD, KEY_T, KEY_T, Should Poweroff because N_OE_received
-#7+15, KEYBOARD, KEY_Q, 7+11, Launch menu
 
 
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/assembly_tests b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/assembly_tests
index 96082e1..12a92e5 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/assembly_tests
+++ b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/assembly_tests
@@ -32,7 +32,7 @@ stop_loop=false
 proc_uid=$($GET_PROC_UID)
 
 ## Defines
-VERSION="1.00"
+VERSION="1.01"
 LOG_FILE="/root/logs/assembly_tests/assy_tests_${proc_uid}.log"
 [ -d $(dirname $LOG_FILE) ] || mkdir -p $(dirname $LOG_FILE)
 MAGNET_DETECTED_FILE="/root/.assembly_tests_magnet_detected"
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/snap b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/snap
index b3e70c0..9489adf 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/snap
+++ b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/snap
@@ -14,5 +14,5 @@ else
 fi
 snapshot_file=$(printf "IMG_%04d.PNG" $last)
 fbgrab "${SNAPSHOT_DIR}/${snapshot_file}"
-notif_disp 1 "   CAPTURE TO ${snapshot_file}"
+notif_disp 2 "   CAPTURE TO ${snapshot_file}"
 exit 0