custom manufacturer code

devbis · Nov 17, 2023 · e8d45e1 · e8d45e1
1 parent 0155a2e
commit e8d45e1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 23 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,18 +26,24 @@ jobs:
     - name: Get SDK
       run: git clone https://github.com/devbis/tl_zigbee_sdk.git -b 3.6.8.5 --depth 1 ${{ env.SDK_DIR }}
 
-    - name: Configure CMake
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DSDK_PREFIX=${{env.SDK_DIR}} -DTOOLCHAIN_PREFIX=${{env.TOOLCHAIN_DIR}}
+    - name: Build LYWSD03MMC Telink Code
+      id: lywsd03mmc_tl
+      run: |
+        cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DSDK_PREFIX=${{env.SDK_DIR}} -DTOOLCHAIN_PREFIX=${{env.TOOLCHAIN_DIR}} -DMANUFACTURER_CODE=0x1141
+        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target=z03mmc.zigbee
+        mv ${{ env.ARTIFACT_DIR }}/z03mmc.bin ${{ env.ARTIFACT_DIR }}/z03mmc_tl_code.bin
+        echo "status=success" >> $GITHUB_OUTPUT
 
-    - name: Build
-      id: make
+    - name: Build LYWSD03MMC
+      id: lywsd03mmc
       run: |
+        cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DSDK_PREFIX=${{env.SDK_DIR}} -DTOOLCHAIN_PREFIX=${{env.TOOLCHAIN_DIR}} -DMANUFACTURER_CODE=0
         cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target=z03mmc.zigbee
         echo "status=success" >> $GITHUB_OUTPUT
 
     - name: Upload a Build Artifact
       uses: actions/upload-artifact@v3
-      if: steps.make.outputs.status == 'success' && !cancelled()
+      if: steps.lywsd03mmc.outputs.status == 'success' && !cancelled()
       with:
         # Artifact name
         name: firmware

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -3,19 +3,17 @@
 
 SET(TARGET z03mmc)
 
-IF(NOT MIMIC_HEIMAN)
-    SET(MIMIC_HEIMAN 0)
-ELSE()
-    SET(TARGET ${TARGET}_heiman)
+IF(NOT MANUFACTURER_CODE)
+    SET(MANUFACTURER_CODE 0)
 ENDIF()
 
 
-
 ADD_DEFINITIONS(
     -DEND_DEVICE=1
     -DMCU_CORE_${TELINK_PLATFORM}=1
     -DMCU_STARTUP_${TELINK_PLATFORM}=1
     -DMIMIC_HEIMAN=${MIMIC_HEIMAN}
+    -DMANUFACTURER_CODE=${MANUFACTURER_CODE}
 )
 
 ################################

diff --git a/src/sensorEpCfg.c b/src/sensorEpCfg.c
@@ -10,16 +10,6 @@
 /**********************************************************************
  * LOCAL CONSTANTS
  */
-#if defined(MIMIC_HEIMAN) && (MIMIC_HEIMAN == 1)
-
-#ifndef ZCL_BASIC_MFG_NAME
-#define ZCL_BASIC_MFG_NAME     {6,'H','E','I','M','A','N'}
-#endif
-#ifndef ZCL_BASIC_MODEL_ID
-#define ZCL_BASIC_MODEL_ID	   {8,'S','T','H','M','-','I','1','H'}
-#endif
-
-#else // MIMIC_HEIMAN
 
 #ifndef ZCL_BASIC_MFG_NAME
 #define ZCL_BASIC_MFG_NAME     {6,'X','i','a','o','m','i'}
@@ -28,8 +18,6 @@
 #define ZCL_BASIC_MODEL_ID	   {10,'L','Y','W','S','D','0','3','M','M','C'}
 #endif
 
-#endif // MIMIC_HEIMAN
-
 #ifndef ZCL_BASIC_SW_BUILD_ID
 #define ZCL_BASIC_SW_BUILD_ID     	{9,'0','0','0','0','-','0','0','0','0'}
 #endif

diff --git a/src/version_cfg.h b/src/version_cfg.h
@@ -50,7 +50,14 @@
  * During OTA upgrade, the upgraded device will check the rules of the following three fields.
  * Refer to ZCL OTA specification for details.
  */
-#define MANUFACTURER_CODE_TELINK           	0x1141//Telink ID
+
+#if defined(MANUFACTURER_CODE) && MANUFACTURER_CODE > 0
+#define MANUFACTURER_CODE_TELINK           	(MANUFACTURER_CODE)
+#else
+// custom developer's code, name is used in cstartup_8258.S
+#define MANUFACTURER_CODE_TELINK           	0xdb15 // 'devbis'. Change code if you develop custom firmware
+#endif
+
 #define	IMAGE_TYPE							((CHIP_TYPE << 8) | IMAGE_TYPE_TEMP_HUMIDITY)
 #define	FILE_VERSION					  	((APP_RELEASE << 24) | (APP_BUILD << 16) | (STACK_RELEASE << 8) | STACK_BUILD)