Skip to content

Clean database and converters #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
romasku merged 8 commits into from
Aug 19, 2025
Merged

Clean database and converters #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a2f5c9b
Overwrite Z2M model
andrei-lazarov Aug 14, 2025
be58e41
Remove duplicate name fom db
andrei-lazarov Aug 14, 2025
52048e5
Use original manufacturer names
andrei-lazarov Aug 15, 2025
817c59e
Merge router & end_device database entries
andrei-lazarov Aug 17, 2025
aafccbf
Added zb_module info in the db
andrei-lazarov Aug 17, 2025
af2991e
Split tuya_manufacturer_names
andrei-lazarov Aug 17, 2025
768e805
Added AliExpress links in db
andrei-lazarov Aug 17, 2025
42a33ad
Merge branch 'main' into db_clean
andrei-lazarov Aug 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,18 @@ jobs:

- name: Build for all boards
run: |
yq -r '(keys)[]' device_db.yaml | while read ITER; do
echo "Building for board: $ITER"
BOARD=$ITER make clean && BOARD=$ITER make -j16 || exit 1
echo "Checking if files were created for board: $ITER"
yq -r 'to_entries | sort_by(.key)[] | "\(.key) \(.value.device_type)"' device_db.yaml | while read ITER TYPE; do
echo "Building for board: $ITER (router)"
BOARD=$ITER DEVICE_TYPE=router make clean && BOARD=$ITER DEVICE_TYPE=router make -j16 || exit 1
echo "Checking if files were created for board: $ITER (router)"
ls -l bin/$ITER/

echo "Building for board: $ITER (end_device)"
if [ "$TYPE" = "end_device" ]; then
BOARD=${ITER} DEVICE_TYPE=end_device make clean && BOARD=${ITER} DEVICE_TYPE=end_device make -j16 || exit 1
echo "Checking if files were created for board: $ITER (end_device)"
ls -l bin/${ITER}_END_DEVICE/
fi
done

- name: Update Z2M converters
Expand Down
12 changes: 7 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PROJECT_NAME = tlc_switch

BOARD ?= TS0012
VERSION = 18
VERSION := 18

DEBUG ?= 0

Expand All @@ -17,7 +17,7 @@ DEVICE_DB_FILE := device_db.yaml

# Board and version defines

DEVICE_TYPE := $(shell yq -r .$(BOARD).device_type $(DEVICE_DB_FILE))
DEVICE_TYPE ?= $(shell yq -r .$(BOARD).device_type $(DEVICE_DB_FILE))
CONFIG_STR := $(shell yq -r .$(BOARD).config_str $(DEVICE_DB_FILE))
FROM_TUYA_MANUFACTURER_ID := $(shell yq -r .$(BOARD).tuya_manufacturer_id $(DEVICE_DB_FILE))
FROM_TUYA_IMAGE_TYPE := $(shell yq -r .$(BOARD).tuya_image_type $(DEVICE_DB_FILE))
Expand All @@ -26,11 +26,13 @@ FIRMWARE_IMAGE_TYPE := $(shell yq -r .$(BOARD).firmware_image_type $(DEVICE_DB_F
ifeq ($(DEVICE_TYPE), router)
TEL_CHIP := -DMCU_CORE_8258=1 -DROUTER=1 -DMCU_STARTUP_8258=1
LIBS := -ldrivers_8258 -lzb_router
BOARD_FILE := $(BOARD)
endif

ifeq ($(DEVICE_TYPE), end_device)
TEL_CHIP := -DMCU_CORE_8258=1 -DEND_DEVICE=1 -DMCU_STARTUP_8258=1 -DPM_ENABLE
LIBS := -ldrivers_8258 -lzb_ed
BOARD_FILE := $(BOARD)_END_DEVICE
endif


Expand All @@ -45,7 +47,7 @@ endif
PROJECT_PATH := .

BUILD_PATH :=$(PROJECT_PATH)/$(BUILD_DIR)
BIN_PATH := $(PROJECT_PATH)/$(BIN_DIR)/$(BOARD)
BIN_PATH := $(PROJECT_PATH)/$(BIN_DIR)/$(BOARD_FILE)
TC32_PATH := $(PROJECT_PATH)/$(TOOLCHAIN_DIR)/tc32/bin
SRC_PATH := $(PROJECT_PATH)/$(SRC_DIR)
SDK_PATH := $(PROJECT_PATH)/$(SDK_DIR)
Expand Down Expand Up @@ -130,12 +132,12 @@ LS_FLAGS := $(SRC_PATH)/boot.link
-include makefiles/zigbee.mk


LST_FILE := $(BUILD_PATH)/$(PROJECT_NAME)-$(BOARD).lst
LST_FILE := $(BUILD_PATH)/$(PROJECT_NAME)-$(BOARD_FILE).lst
BIN_FILE := $(BIN_PATH)/$(PROJECT_NAME).bin
OTA_FILE := $(BIN_PATH)/$(PROJECT_NAME).zigbee
FROM_TUYA_OTA_FILE := $(BIN_PATH)/$(PROJECT_NAME)-from_tuya.zigbee
FORCE_OTA_FILE:= $(BIN_PATH)/$(PROJECT_NAME)-forced.zigbee
ELF_FILE := $(BUILD_PATH)/$(PROJECT_NAME)-$(BOARD).elf
ELF_FILE := $(BUILD_PATH)/$(PROJECT_NAME)-$(BOARD_FILE).elf

Z2M_INDEX_FILE := zigbee2mqtt/ota/index_$(DEVICE_TYPE).json

Expand Down
Loading