Add symbol menu overlay

ardangelo · Jan 19, 2024 · 881a3b5 · 881a3b5
1 parent a539beb
commit 881a3b5
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,6 @@
 	path = beepy_drivers/package/beepy-kbd/module
 	url = git@github.com:ardangelo/beepberry-keyboard-driver.git
 	branch = main
+[submodule "beepy_drivers/package/beepy-symbol-overlay/module"]
+	path = beepy_drivers/package/beepy-symbol-overlay/module
+	url = git@github.com:ardangelo/beepy-symbol-overlay.git
diff --git a/beepy_drivers/Config.in b/beepy_drivers/Config.in
@@ -1,5 +1,6 @@
 source "$BR2_EXTERNAL_BEEPY_DRIVERS_PATH/package/sharp-drm/Config.in"
 source "$BR2_EXTERNAL_BEEPY_DRIVERS_PATH/package/beepy-kbd/Config.in"
+source "$BR2_EXTERNAL_BEEPY_DRIVERS_PATH/package/beepy-symbol-overlay/Config.in"
 source "$BR2_EXTERNAL_BEEPY_DRIVERS_PATH/package/libgc/Config.in"
 source "$BR2_EXTERNAL_BEEPY_DRIVERS_PATH/package/w3m/Config.in"
 source "$BR2_EXTERNAL_BEEPY_DRIVERS_PATH/package/libxapian/Config.in"

diff --git a/beepy_drivers/package/beepy-kbd/beepy-kbd.mk b/beepy_drivers/package/beepy-kbd/beepy-kbd.mk
@@ -1,4 +1,4 @@
-BEEPY_KBD_VERSION = 2.3
+BEEPY_KBD_VERSION = 2.6
 BEEPY_KBD_BASE = $(BR2_EXTERNAL_BEEPY_DRIVERS_PATH)/package/beepy-kbd
 BEEPY_KBD_SITE = $(BEEPY_KBD_BASE)/module
 BEEPY_KBD_SITE_METHOD = local

diff --git a/beepy_drivers/package/beepy-kbd/module b/beepy_drivers/package/beepy-kbd/module
diff --git a/beepy_drivers/package/beepy-symbol-overlay/Config.in b/beepy_drivers/package/beepy-symbol-overlay/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_BEEPY_SYMBOL_OVERLAY
+	bool "beepy-symbol-overlay"
+	default y
+	depends on BR2_LINUX_KERNEL
+	select BR2_PACKAGE_SHARP_DRM
+	help
+	  Symbol menu overlay
diff --git a/beepy_drivers/package/beepy-symbol-overlay/beepy-symbol-overlay.mk b/beepy_drivers/package/beepy-symbol-overlay/beepy-symbol-overlay.mk
@@ -0,0 +1,18 @@
+BEEPY_SYMBOL_OVERLAY_VERSION = 1.0
+BEEPY_SYMBOL_OVERLAY_BASE = $(BR2_EXTERNAL_BEEPY_DRIVERS_PATH)/package/beepy-symbol-overlay
+BEEPY_SYMBOL_OVERLAY_SITE = $(BEEPY_SYMBOL_OVERLAY_BASE)/module
+BEEPY_SYMBOL_OVERLAY_SITE_METHOD = local
+
+BEEPY_SYMBOL_OVERLAY_INSTALL_IMAGES = YES
+BEEPY_SYMBOL_OVERLAY_MODULE_SUBDIRS = .
+
+define BEEPY_SYMBOL_OVERLAY_BUILD_CMDS
+	$(MAKE) CXX="$(TARGET_CXX)" OBJCOPY="$(TARGET_OBJCOPY)" LD="$(TARGET_LD)" -C $(@D) \
+		CXXFLAGS=-DDEFAULT_KEYMAP_PATH=\\\"/usr/share/keymaps/beepy-kbd.map\\\"
+endef
+
+define BEEPY_SYMBOL_OVERLAY_INSTALL_TARGET_CMDS
+    $(INSTALL) -D -m 0755 $(@D)/symbol-overlay $(TARGET_DIR)/sbin
+endef
+
+$(eval $(generic-package))
diff --git a/beepy_drivers/package/beepy-symbol-overlay/module b/beepy_drivers/package/beepy-symbol-overlay/module
diff --git a/beepy_drivers/package/sharp-drm/module b/beepy_drivers/package/sharp-drm/module
diff --git a/beepy_drivers/package/sharp-drm/sharp-drm.mk b/beepy_drivers/package/sharp-drm/sharp-drm.mk
@@ -1,4 +1,4 @@
-SHARP_DRM_VERSION = 1.1
+SHARP_DRM_VERSION = 1.4
 SHARP_DRM_BASE = $(BR2_EXTERNAL_BEEPY_DRIVERS_PATH)/package/sharp-drm
 SHARP_DRM_SITE = $(SHARP_DRM_BASE)/module
 SHARP_DRM_SITE_METHOD = local
+12 −12		Makefile
+38 −13		README.md
+106 −0		src/indicators.h
+125 −23		src/input_display.c
+131 −90		src/input_fw.c
+111 −449		src/input_iface.c
+85 −88		src/input_iface.h
+90 −49		src/input_meta.c
+377 −0		src/input_modifiers.c
+3 −0		src/input_rtc.c
+266 −0		src/input_touch.c
+1 −1		src/main.c
+200 −31		src/params_iface.c
+25 −0		src/registers.h
+123 −10		src/sysfs_iface.c
+2 −0		.gitignore
+7 −7		Makefile
+158 −83		src/drm_iface.c
+7 −2		src/drm_iface.h
+0 −122		src/indicators.h
+43 −67		src/ioctl_iface.c
+84 −0		src/ioctl_iface.h
+41 −1		src/main.c
+3 −9		src/params_iface.c
+1 −1		src/params_iface.h