diff --git a/NANO24-show b/NANO24-show index 40b0aa1..c1f579f 100755 --- a/NANO24-show +++ b/NANO24-show @@ -20,14 +20,14 @@ fi sudo echo "dtparam=i2c_arm=on" >> ./boot/config.txt.bak sudo echo "dtparam=spi=on" >> ./boot/config.txt.bak sudo echo "enable_uart=1" >> ./boot/config.txt.bak -sudo echo "dtoverlay=tft7789:rotate=270" >> ./boot/config.txt.bak +sudo echo "dtoverlay=tft7789:rotate=90" >> ./boot/config.txt.bak sudo echo "dtoverlay=ft6236" >> ./boot/config.txt.bak sudo echo "gpio=18=op,dh" >> ./boot/config.txt.bak sudo cp -rf ./boot/config.txt.bak /boot/config.txt sudo cp ./usr/ft6236.dtb /boot/overlays/ft6236.dtbo -sudo cp -rf ./usr/99-calibration.conf-nano24-270 /etc/X11/xorg.conf.d/99-calibration.conf +sudo cp -rf ./usr/99-calibration.conf-nano24-90 /etc/X11/xorg.conf.d/99-calibration.conf sudo cp -rf ./usr/99-fbturbo.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf #if test "$root_dev" = "/dev/mmcblk0p7";then #sudo cp ./usr/cmdline.txt-noobs /boot/cmdline.txt @@ -37,7 +37,7 @@ sudo cp -rf ./usr/99-fbturbo.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf sudo cp ./usr/inittab /etc/ #sudo cp ./boot/config-32.txt /boot/config.txt sudo touch ./.have_installed -echo "gpio:resistance:nano24:270:320:240" > ./.have_installed +echo "gpio:resistance:nano24:90:320:240" > ./.have_installed #evdev install #nodeplatform=`uname -n` #kernel=`uname -r` diff --git a/usr/99-calibration.conf-nano24-0 b/usr/99-calibration.conf-nano24-0 index c6b2e03..6e41bdb 100755 --- a/usr/99-calibration.conf-nano24-0 +++ b/usr/99-calibration.conf-nano24-0 @@ -1,7 +1,7 @@ Section "InputClass" Identifier "calibration" - MatchProduct "Goodix Capacitive TouchScreen" - Option "Calibration" "240 0 320 0" + MatchProduct "generic ft5x06 (11)" + Option "Calibration" "0 239 0 319" Option "SwapAxes" "0" Option "EmulateThirdButton" "1" Option "EmulateThirdButtonTimeout" "1000" diff --git a/usr/99-calibration.conf-nano24-180 b/usr/99-calibration.conf-nano24-180 index 67e26e4..c37dced 100755 --- a/usr/99-calibration.conf-nano24-180 +++ b/usr/99-calibration.conf-nano24-180 @@ -1,7 +1,7 @@ Section "InputClass" Identifier "calibration" - MatchProduct "Goodix Capacitive TouchScreen" - Option "Calibration" "0 240 0 320" + MatchProduct "generic ft5x06 (11)" + Option "Calibration" "239 0 319 0" Option "SwapAxes" "0" Option "EmulateThirdButton" "1" Option "EmulateThirdButtonTimeout" "1000" diff --git a/usr/99-calibration.conf-nano24-270 b/usr/99-calibration.conf-nano24-270 index 146152e..9b27bc0 100755 --- a/usr/99-calibration.conf-nano24-270 +++ b/usr/99-calibration.conf-nano24-270 @@ -1,7 +1,7 @@ Section "InputClass" Identifier "calibration" MatchProduct "generic ft5x06 (11)" - Option "Calibration" "319 0 0 239" + Option "Calibration" "0 239 319 0" Option "SwapAxes" "1" Option "EmulateThirdButton" "1" Option "EmulateThirdButtonTimeout" "1000" diff --git a/usr/99-calibration.conf-nano24-90 b/usr/99-calibration.conf-nano24-90 index 44ffe0e..04ad56a 100755 --- a/usr/99-calibration.conf-nano24-90 +++ b/usr/99-calibration.conf-nano24-90 @@ -1,7 +1,7 @@ Section "InputClass" Identifier "calibration" - MatchProduct "Goodix Capacitive TouchScreen" - Option "Calibration" "0 240 320 0" + MatchProduct "generic ft5x06 (11)" + Option "Calibration" "239 0 0 319" Option "SwapAxes" "1" Option "EmulateThirdButton" "1" Option "EmulateThirdButtonTimeout" "1000" diff --git a/usr/ft6236.dtb b/usr/ft6236.dtb index bd9be06..465c3ef 100755 Binary files a/usr/ft6236.dtb and b/usr/ft6236.dtb differ diff --git a/usr/tft7789-overlay.dtb b/usr/tft7789-overlay.dtb index 7ae6f10..e26385b 100755 Binary files a/usr/tft7789-overlay.dtb and b/usr/tft7789-overlay.dtb differ