diff --git a/kalipi-tft-config/kalipi-tft-config b/kalipi-tft-config/kalipi-tft-config index 13bc951..85eef8a 100755 --- a/kalipi-tft-config/kalipi-tft-config +++ b/kalipi-tft-config/kalipi-tft-config @@ -3,7 +3,7 @@ PROG_NAME="$0" BASE_NAME=$(basename $PROG_NAME) ARGS="$@" -VERSION="4.14-0.8.0" +VERSION="4.14-1.0.0" INTERACTIVE=True CONFIG=/boot/config.txt CMDLINE=/boot/cmdline.txt @@ -101,7 +101,9 @@ function remove_tft() { mv ${TARGET_HOMEDIR}/.60-libinput.conf.bak /usr/share/X11/xorg.conf.d/60-libinput.conf fi systemctl stop hyperpixel4-init.service && systemctl disable hyperpixel4-init.service - # Do not delete hyperpixel4-init.service files so we can use them again + systemctl stop hyperpixel-init.service && systemctl disable hyperpixel-init.service + systemctl stop hyperpixel-touch.service && systemctl disable hyperpixel-touch.service + # Do not delete hyperpixel service files so we can use them again # Do not delete 15-i2c-modprobe.rules and i2cprobe as they may come in handy later if [ "$INTERACTIVE" = True ]; then if [ "$SILENT" = False ]; then @@ -139,6 +141,7 @@ function print_help() { echo " '4dpi' (4D Systems 2.4\",3.2\" and 3.5\")" echo " 'elec22' (Elecfreak 2.2\")" echo " 'hy28b' (Hotmcu HY28B 2.8\")" + echo " 'hyper35' (HyperPixel touch 3.5\")" echo " 'hyper4t' (HyperPixel touch 4.0\")" echo " 'jb35' (JBTek 3.5\")" echo " 'kum35' (Kuman 3.5\")" @@ -1583,6 +1586,157 @@ EOF } +function do_install_hyper35() { + # set framebuffer + FRAMEBUFFER="/dev/fb1" + + # update /boot/config.txt + info PI-TFT "Updating /boot/config.txt..." + date=`date` + overlay="dtoverlay=hyperpixel" + overlay2="dtoverlay=hyperpixel-gpio-backlight" + + cat >> /boot/config.txt <> /etc/systemd/system/hyperpixel-init.service <> /etc/systemd/system/hyperpixel-touch.service < /etc/pointercal <> /etc/modules <&1 1>&2 2>&3) RET=$? @@ -4294,6 +4449,7 @@ function do_hyperpixel_menu() { return 0 elif [ $RET -eq 0 ]; then case "$SCREEN" in + hyper35*) do_rotation_menu "ROT000 000" && do_homedir_menu && do_confirm_menu $SCREEN ;; hyper4t*) do_rotation_menu "ROT180 180" && do_homedir_menu && do_confirm_menu $SCREEN ;; *) whiptail --msgbox "Program error: unrecognized option" 20 60 1 ;; esac || whiptail --msgbox "There was an error running option $SCREEN" 20 60 1 @@ -4509,8 +4665,16 @@ function do_show_config() { local USRPROFILE=$(sed -n '/added by re4son-pi-tft-setup/,/end re4son-pi-tft-setup/p' "${TARGET_HOMEDIR}/.profile") fi if [ -f "/etc/systemd/system/hyperpixel4-init.service" ]; then - local HPPXLINIT=$(cat "/etc/systemd/system/hyperpixel4-init.service") - local HPPXLINITSTAT=$(systemctl status hyperpixel4-init.service) + local HPPXL4INIT=$(cat "/etc/systemd/system/hyperpixel4-init.service") + local HPPXL4INITSTAT=$(systemctl status hyperpixel4-init.service) + fi + if [ -f "/etc/systemd/system/hyperpixel-init.service" ]; then + local HPPXLINIT=$(cat "/etc/systemd/system/hyperpixel-init.service") + local HPPXLINITSTAT=$(systemctl status hyperpixel-init.service) + fi + if [ -f "/etc/systemd/system/hyperpixel-touch.service" ]; then + local HPPXLTOUCH=$(cat "/etc/systemd/system/hyperpixel-touch.service") + local HPPXLTOUCHSTAT=$(systemctl status hyperpixel-touch.service) fi if [ -f "/usr/lib/kalipi-sys-mods/i2cprobe" ]; then local I2CPROBE=$(cat "/usr/lib/kalipi-sys-mods/i2cprobe") @@ -4550,6 +4714,18 @@ ${FBDEV} /etc/kbd/config: ${KBDCONF} +/etc/systemd/system/hyperpixel-init.service: +${HPPXLINIT} + +Status hyperpixel-init.service: +${HPPXLINITSTAT} + +/etc/systemd/system/hyperpixel-touch.service: +${HPPXTOUCH} + +Status hyperpixel-touch.service: +${HPPXLTOUCHSTAT} + /etc/systemd/system/hyperpixel4-init.service: ${HPPXLINIT} @@ -4736,7 +4912,11 @@ case "${pitfttype}" in ROTATION=90 do_install_hy28b ;; - hy28b) + hyper35) + ROTATION=0 + do_install_hyper35() + ;; + hyper4t) ROTATION=0 do_install_hyper4t() ;; diff --git a/kalipi-tft-config/kali-pi-config.status.txt b/kalipi-tft-config/kalipi-tft-config.status.txt similarity index 91% rename from kalipi-tft-config/kali-pi-config.status.txt rename to kalipi-tft-config/kalipi-tft-config.status.txt index 2e9744b..2862fc2 100644 --- a/kalipi-tft-config/kali-pi-config.status.txt +++ b/kalipi-tft-config/kalipi-tft-config.status.txt @@ -10,7 +10,9 @@ | Elecfreak | elec22 | X | X | X | X | X | X | X | X | X | X | X | X | X | X | | Elecrow | ecrow35 | X | X | X | X | X | X | X | X | X | X | X | X | X | X | | JBTek | jb35 | X | X | - | X | - | - | X | X | X | X | X | X | X | X | -| Hotmcu | hy28b | X | X | X | X | X | X | X | X | X | X | X | - | X | - | +| Hotmcu | hy28b | X | X | X | X | X | X | X | X | X | X | X | X | X | X | +| HyperPixel | hyper | X | X | X | - | X | - | X | - | X | - | - | - | - | - | +| HyperPixel 4 touch | hyper4t | X | X | X | - | X | - | X | - | X | - | X | - | X | - | | KeDei | kedei35 | X | X | X | X | X | X | X | X | X | X | X | X | X | X | | Kuman | kum35 | X | X | X | X | X | X | X | X | X | X | X | X | X | X | | Kuman | kum35h | X | X | X | X | X | X | X | X | X | X | X | X | X | X |