Merge pull request #298 from hypnotoad/diverse-fixes

Diverse fixes
ftCommunity · Oct 4, 2024 · 8ac883c · 8ac883c
2 parents a6c1969 + 93dcebd
commit 8ac883c
Show file tree

Hide file tree

Showing 13 changed files with 81 additions and 9 deletions.
diff --git a/Config.in b/Config.in
@@ -3,6 +3,7 @@ source "$BR2_EXTERNAL_FTCOMMUNITY_TXT_PATH/package/libroboint/Config.in"
 source "$BR2_EXTERNAL_FTCOMMUNITY_TXT_PATH/package/python-ftrobopy/Config.in"
 source "$BR2_EXTERNAL_FTCOMMUNITY_TXT_PATH/package/python-fttxpy/Config.in"
 source "$BR2_EXTERNAL_FTCOMMUNITY_TXT_PATH/package/python-libroboint/Config.in"
+source "$BR2_EXTERNAL_FTCOMMUNITY_TXT_PATH/package/python-lidar/Config.in"
 source "$BR2_EXTERNAL_FTCOMMUNITY_TXT_PATH/package/python-lumacore/Config.in"
 source "$BR2_EXTERNAL_FTCOMMUNITY_TXT_PATH/package/python-lumaled_matrix/Config.in"
 source "$BR2_EXTERNAL_FTCOMMUNITY_TXT_PATH/package/python-lumaoled/Config.in"

diff --git a/Makefile b/Makefile
@@ -10,6 +10,10 @@ all: rootfs
 
 .PHONY: clean
 clean:
+	rm -rf $(BUILD_DIR)
+
+.PHONY: cleanall
+cleanall:
 	rm -rf $(OUTPUT_DIR)
 
 .PHONY: config

diff --git a/board/fischertechnik/TXT/rootfs/etc/init.d/S02fixes b/board/fischertechnik/TXT/rootfs/etc/init.d/S02fixes
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+check_104() {
+    # uid mapping changed for user ROBOPro
+    if [ `id -g ROBOPro` != 1008  || `id -u ROBOPro` != 1004 ]; then
+	deluser ROBOPro
+	delgroup ROBOPro
+	addgroup -g 1008 ROBOPro
+	adduser -h /opt/fischertechnik -s /bin/sh -G ROBOPro -D -H -u 1004 ROBOPro
+	adduser ROBOPro users
+	adduser ROBOPro tty
+	adduser ROBOPro video
+	adduser ROBOPro audio
+	adduser ROBOPro i2c
+    fi
+}
+
+check_105() {
+    # ntp user was newly introduced in buildroot 2023.02.3
+    if !id -u ntp; then
+	adduser -s /bin/false -S -D -H -u 101 -G ntp ntp
+    fi
+}
+
+case "$1" in
+    start)
+	check_104
+	check_105
+	;;
+esac
+
+
+
diff --git a/board/fischertechnik/TXT/rootfs/opt/ftc/apps/system/about/about.py b/board/fischertechnik/TXT/rootfs/opt/ftc/apps/system/about/about.py
@@ -79,9 +79,9 @@ def __init__(self,title,parent):
             if(i < 2): py_ver_str += "."
         vbox.addWidget(VersionWidget("Python", py_ver_str))
 
+        # --------- ftrobopy version ----------
         try:
             import ftrobopy
-            # --------- ftrobopy version ----------
             vbox.addWidget(VersionWidget("ftrobopy", ftrobopy.version()))
         except:
             pass
@@ -91,6 +91,15 @@ def __init__(self,title,parent):
 
         vbox.addWidget(VersionWidget("PyQt", PYQT_VERSION_STR))
 
+        # -------- opencv -------
+        try:
+            import cv2
+            # --------- ftrobopy version ----------
+            vbox.addWidget(VersionWidget("opencv", cv2.__version__))
+        except:
+            pass
+
+
         vbox_w.setLayout(vbox)
 
         # put everything inside a scroll area
@@ -141,7 +150,7 @@ def __init__(self, application):
 
         self.vbox.addStretch()
 
-        self.c = QLabel(QCoreApplication.translate("FtcGuiApplication","(c) 2016-2022 the ft:community"))
+        self.c = QLabel(QCoreApplication.translate("FtcGuiApplication","(c) 2016-2024 the ft:community"))
         self.c.setObjectName("tinylabel")
         self.c.setWordWrap(True)
         self.c.setAlignment(Qt.AlignCenter)

diff --git a/board/fischertechnik/TXT/rootfs/opt/ftc/apps/system/about/about_de.ts b/board/fischertechnik/TXT/rootfs/opt/ftc/apps/system/about/about_de.ts
@@ -64,8 +64,8 @@
     </message>
     <message>
         <location filename="about.py" line="141"/>
-        <source>(c) 2016-2022 the ft:community</source>
-        <translation>(c) 2016-2022 die ft:community</translation>
+        <source>(c) 2016-2024 the ft:community</source>
+        <translation>(c) 2016-2024 die ft:community</translation>
     </message>
 </context>
 <context>

diff --git a/configs/fischertechnik_TXT_initramfs_defconfig b/configs/fischertechnik_TXT_initramfs_defconfig
@@ -7,7 +7,6 @@ BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY=y
 BR2_TARGET_OPTIMIZATION="-pipe"
 BR2_CCACHE=y
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_FTCOMMUNITY_TXT_PATH)/patches"
-BR2_PER_PACKAGE_DIRECTORIES=y
 BR2_TARGET_GENERIC_HOSTNAME="FT-txt"
 BR2_TARGET_GENERIC_ISSUE="Welcome to FT-txt"
 BR2_INIT_NONE=y

diff --git a/configs/fischertechnik_TXT_rootfs_defconfig b/configs/fischertechnik_TXT_rootfs_defconfig
@@ -5,7 +5,6 @@ BR2_ARM_INSTRUCTIONS_THUMB2=y
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY=y
 BR2_TARGET_OPTIMIZATION="-pipe"
-BR2_CCACHE=y
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_FTCOMMUNITY_TXT_PATH)/patches"
 BR2_PER_PACKAGE_DIRECTORIES=y
 BR2_TARGET_GENERIC_HOSTNAME="FT-txt"

diff --git a/package/python-ftrobopy/python-ftrobopy.mk b/package/python-ftrobopy/python-ftrobopy.mk
@@ -9,7 +9,7 @@ PYTHON_FTROBOPY_SITE = $(call github,ftrobopy,ftrobopy,$(PYTHON_FTROBOPY_VERSION
 PYTHON_FTROBOPY_LICENSE = MIT
 PYTHON_FTROBOPY_LICENSE_FILES = LICENSE
 PYTHON_FTROBOPY_INSTALL_STAGING = NO
-PYTHON_FTROBOPY_SETUP_TYPE = distutils
+PYTHON_FTROBOPY_SETUP_TYPE = setuptools
 PYTHON_FTROBOPY_DEPENDENCIES = python-serial
 
 ifeq ($(BR2_PACKAGE_PYTHON),y)

diff --git a/package/python-fttxpy/python-fttxpy.mk b/package/python-fttxpy/python-fttxpy.mk
@@ -11,6 +11,6 @@ PYTHON_FTTXPY_DEPENDENCIES = python-pyudev python-serial
 PYTHON_FTTXPY_LICENSE = MIT
 PYTHON_FTTXPY_LICENSE_FILES = LICENSE
 PYTHON_FTTXPY_INSTALL_STAGING = NO
-PYTHON_FTTXPY_SETUP_TYPE = distutils
+PYTHON_FTTXPY_SETUP_TYPE = setuptools
 
 $(eval $(python-package))
diff --git a/package/python-libroboint/python-libroboint.mk b/package/python-libroboint/python-libroboint.mk
@@ -8,6 +8,6 @@ PYTHON_LIBROBOINT_VERSION = cf25fdba52ad1343317afca683d8b272682f0077
 PYTHON_LIBROBOINT_SITE = $(call gitlab,Humpelstilzchen,libroboint,$(LIBROBOINT_VERSION))
 PYTHON_LIBROBOINT_LICENSE = LGPLv2.1
 PYTHON_LIBROBOINT_SUBDIR = python
-PYTHON_LIBROBOINT_SETUP_TYPE = distutils
+PYTHON_LIBROBOINT_SETUP_TYPE = setuptools
 
 $(eval $(python-package))
diff --git a/package/python-lidar/Config.in b/package/python-lidar/Config.in
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_PYTHON_LIDAR
+	bool "python-lidar"
+	help
+	  VL53L0X Python interface
diff --git a/package/python-lidar/python-lidar.hash b/package/python-lidar/python-lidar.hash
@@ -0,0 +1,3 @@
+# md5 locally extracted
+md5	5ba84b8189827015e405df9566176fe0  1.0.2.tar.gz
+md5     f3539974e62d9ae6a4bcb4425421d19e  v1.0.4.tar.gz
diff --git a/package/python-lidar/python-lidar.mk b/package/python-lidar/python-lidar.mk
@@ -0,0 +1,20 @@
+################################################################################
+#
+# python-lidar
+#
+################################################################################
+
+PYTHON_LIDAR_VERSION = 1.0.4
+PYTHON_LIDAR_SOURCE = v$(PYTHON_LIDAR_VERSION).tar.gz
+PYTHON_LIDAR_SITE = https://github.com/Gadgetoid/VL53L0X-python/archive/refs/tags
+#https://github.com/johnbryanmoore/VL53L0X_rasp_python/archive/refs/tags
+PYTHON_LIDAR_SETUP_TYPE = setuptools
+PYTHON_LIDAR_LICENSE = MIT
+PYTHON_LIDAR_LICENSE_FILES = LICENSE.rst
+
+$(eval $(python-package))
+
+#define PYTHON_LIDAR_BUILD_CMDS
+#    $(MAKE) $(TARGET_CONFIGURE_OPTS) PYTHON_INCLUDES= -C $(@D) all
+#endef
+#$(eval $(generic-package))