Merge pull request #1643 from araczkowski/main

Screen Display Control for x88pro-x3
ophub · Aug 23, 2023 · b11bd4f · b11bd4f
2 parents 43f5f04 + 0c66fff
commit b11bd4f
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 2 deletions.
diff --git a/build-armbian/armbian-files/platform-files/amlogic/rootfs/usr/sbin/armbian-openvfd b/build-armbian/armbian-files/platform-files/amlogic/rootfs/usr/sbin/armbian-openvfd
@@ -138,6 +138,7 @@ do_select_box() {
         21 | tx9-pro)     do_start tx9-pro.conf ;;
         22 | x92)         do_start x92.conf ;;
         23 | whale)       do_start whale.conf ;;
+        24 | x88pro-x3)   do_start x88pro-x3.conf ;;
         99 | diy)         do_start diy.conf ;;
          0 | stop)        do_stop ;;
          1 | quit)        echo "quit!" && exit 0 ;;
@@ -172,6 +173,7 @@ case "${1}" in
         │    21. tx9-pro (s912)         │
         │    22. x92 (s912)             │
         │    23. whale (s905x3)         │
+        |    24. x88pro-x3 (s905x3)     |
         │    99. diy                    │
         │                               │
         ├──────[ Other Operations ]─────┤

diff --git a/...armbian/armbian-files/platform-files/amlogic/rootfs/usr/share/openvfd/conf/x88pro-x3.conf b/...armbian/armbian-files/platform-files/amlogic/rootfs/usr/share/openvfd/conf/x88pro-x3.conf
@@ -0,0 +1,38 @@
+#--------------------
+# X88 PRO X3 (S905X3) configuration
+# shared by https://github.com/araczkowski
+#--------------------
+#gpio_xxx:
+# [0] 0 = &gpio, 1 = &gpio_ao.
+# [1] pin number - https://github.com/openSUSE/kernel/blob/master/include/dt-bindings/gpio/meson-g12a-gpio.h
+# [0] Reserved - must be 0.
+
+vfd_gpio_clk='0,64,0'
+vfd_gpio_dat='0,63,0'
+vfd_gpio_stb='1,10,0'
+
+#chars:
+# < DHHMM > Order of display chars (D=dots, represented by a single char)
+
+vfd_chars='4,0,1,2,3'
+
+#dot_bits:
+# Order of dot bits. Typical configurations:
+# Display Type 0, 1 usually has Alarm, USB, Play, Pause, Col, Ethernet, Wifi dots
+# Alarm = 0, USB = 1, Play = 2, Pause = 3, Col = 4, Eth = 5, Wifi = 6
+# Display Type 2 usually has APPS, USB, SETUP, CARD, Col, HDMI, CVBS dots
+# APPS = 0, USB = 1, SETUP = 2, CARD = 3, Col = 4, HDMI = 5, CVBS = 6
+# Display Type 3 Power, LAN, Col, Low Wifi, High Wifi
+# N/A = 0, N/A = 1, Power = 2, LAN = 3, Col = 4, Low Wifi = 5, High Wifi = 6
+
+vfd_dot_bits='0,1,2,3,4,5,6'
+
+#display_type:
+# [0] - Display type.
+# [1] - Reserved - must be 0..
+# [2] - Flags. (bit 0 = '1' - Common Anode display)
+# [3] - Controller.
+
+vfd_display_type='0x02,0x00,0x00,0x06'  # ok
+
+functions='usb apps setup sd hdmi cvbs'
diff --git a/documents/led_screen_display_control.md b/documents/led_screen_display_control.md
@@ -4,7 +4,7 @@
 
 - Upgrade the system kernel to the latest version. The `Armbian` system uses the `armbian-update` command for upgrades. The `OpenWrt` system upgrades using `System Menu` → `Amlogic Service` → `Online Download Update`.
 
-- Currently, `x96max.conf`, `x96maxplus.conf`, `h96max-x3.conf`, `hk1-x3.conf`, `hk1box.conf`, `tx3.conf`, `x96air.conf` and other devices have been tested. Configurations for other devices can be modified by checking: [arthur-liberman/vfd-configurations](https://github.com/arthur-liberman/vfd-configurations) and [LibreELEC/linux_openvfd](https://github.com/LibreELEC/linux_openvfd/tree/master/conf). The second field value in the corresponding content in the configuration files from these two websites needs to be reduced by `1`. For example:
+- Currently, `x96max.conf`, `x96maxplus.conf`, `h96max-x3.conf`, `hk1-x3.conf`, `hk1box.conf`, `tx3.conf`, `x96air.conf`, `x88pro-x3.conf` and other devices have been tested. Configurations for other devices can be modified by checking: [arthur-liberman/vfd-configurations](https://github.com/arthur-liberman/vfd-configurations) and [LibreELEC/linux_openvfd](https://github.com/LibreELEC/linux_openvfd/tree/master/conf). The second field value in the corresponding content in the configuration files from these two websites needs to be reduced by `1`. For example:
 
 ```yaml
 vfd_gpio_clk='0,69,0'
@@ -48,6 +48,7 @@ sed -i 's|^#*openvfd_boxid=.*|openvfd_boxid="15"|g' /etc/custom_service/start_se
 | tx9-pro    |  21     |  armbian-openvfd 21   |   openwrt-openvfd 21    | Enable LED  |
 | x92        |  22     |  armbian-openvfd 22   |   openwrt-openvfd 22    | Enable LED  |
 | whale      |  23     |  armbian-openvfd 23   |   openwrt-openvfd 23    | Enable LED  |
+| x88pro-x3  |  24     |  armbian-openvfd 24   |   openwrt-openvfd 24    | Enable LED  |
 | diy        |  99     |  armbian-openvfd 99   |   openwrt-openvfd 99    | Enable LED  |
 | -          |  0      |  armbian-openvfd 0    |   openwrt-openvfd 0     | Disable LED |
 | -          |  -u     |  armbian-openvfd -u   |   openwrt-openvfd -u    | Update Conf |
@@ -105,4 +106,3 @@ sed -i 's|^#*openvfd_boxid=.*|openvfd_boxid="15"|g' /etc/custom_service/start_se
 | diy        |  99      |  armbian-openvfd 99   |   openwrt-openvfd 99    | 启用 LED |
 | -          |  0       |  armbian-openvfd 0    |   openwrt-openvfd 0     | 禁用 LED |
 | -          |  -u      |  armbian-openvfd -u   |   openwrt-openvfd -u    | 更新配置  |
-