Skip to content

Commit b1b0bc0

Browse files
committed
sdk: upgrade to SDK v3.7.2.0
1 parent acbfb5d commit b1b0bc0

File tree

7 files changed

+10
-156
lines changed

7 files changed

+10
-156
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
run: git clone https://github.com/devbis/tc32.git -b linux --depth 1 ${{ env.TOOLCHAIN_DIR }}
2828

2929
- name: Get SDK
30-
run: git clone https://github.com/telink-semi/telink_zigbee_sdk.git -b V3.7.1.0 --depth 1 ${{ env.SDK_DIR }}
30+
run: git clone https://github.com/telink-semi/telink_zigbee_sdk.git -b V3.7.2.0 --depth 1 ${{ env.SDK_DIR }}
3131

3232
- name: Build LYWSD03MMC
3333
id: lywsd03mmc

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ include(cmake/TelinkSDK.cmake)
77

88
# Main project settings
99

10-
CMAKE_MINIMUM_REQUIRED(VERSION 3.8)
10+
CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
1111
PROJECT(z03mmc C)
1212
ENABLE_LANGUAGE(ASM)
1313

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ WORKDIR /workspace
2929
RUN git clone https://github.com/devbis/tc32.git -b linux --depth 1 ${TOOLCHAIN_DIR}
3030

3131
# Clone the Telink Zigbee SDK
32-
RUN git clone https://github.com/telink-semi/telink_zigbee_sdk.git -b V3.7.1.0 --depth 1 ${SDK_DIR}
32+
RUN git clone https://github.com/telink-semi/telink_zigbee_sdk.git -b V3.7.2.0 --depth 1 ${SDK_DIR}
3333

3434
# Copy project source
3535
COPY . /workspace/project/

src/device.c

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include "app_i2c.h"
1717
#include "shtv3_sensor.h"
1818
#include "lcd.h"
19-
#include "reporting.h"
2019

2120

2221
/**********************************************************************
@@ -281,24 +280,6 @@ void ind_init(void)
281280
light_init();
282281
}
283282

284-
void report_handler(void)
285-
{
286-
if(zb_isDeviceJoinedNwk()){
287-
if(zcl_reportingEntryActiveNumGet()){
288-
// u16 second = 1;//TODO: fix me
289-
290-
reportNoMinLimit();
291-
292-
//start report timer
293-
app_reportAttrTimerStart();
294-
// reportAttrTimerStart(second);
295-
}else{
296-
//stop report timer
297-
// reportAttrTimerStop();
298-
}
299-
}
300-
}
301-
302283
void app_task(void)
303284
{
304285
app_key_handler();

src/reporting.c

Lines changed: 0 additions & 102 deletions
This file was deleted.

src/reporting.h

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/zcl_sensorCb.c

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include "zcl_thermostat_ui_cfg.h"
88
#include "zcl_relative_humidity.h"
99
#include "device.h"
10-
#include "reporting.h"
1110
#include "app_ui.h"
1211

1312
/**********************************************************************
@@ -224,21 +223,13 @@ static void sensorDevice_zclDfltRspCmd(u16 clusterId, zclDefaultRspCmd_t *pDftRs
224223
*/
225224
static void sensorDevice_zclCfgReportCmd(u8 endpoint, u16 clusterId, zclCfgReportCmd_t *pCfgReportCmd)
226225
{
227-
for(u8 i = 0; i < pCfgReportCmd->numAttr; i++) {
228-
for (u8 ii = 0; ii < ZCL_REPORTING_TABLE_NUM; ii++) {
229-
if (app_reporting[ii].pEntry->used) {
230-
if (app_reporting[ii].pEntry->endPoint == endpoint && app_reporting[ii].pEntry->attrID == pCfgReportCmd->attrList[i].attrID) {
231-
if (app_reporting[ii].timerReportMinEvt) {
232-
TL_ZB_TIMER_CANCEL(&(app_reporting[ii].timerReportMinEvt));
233-
}
234-
if (app_reporting[ii].timerReportMaxEvt) {
235-
TL_ZB_TIMER_CANCEL(&(app_reporting[ii].timerReportMaxEvt));
236-
}
237-
return;
238-
}
239-
}
240-
}
241-
}
226+
// for (u8 i = 0; i < ZCL_REPORTING_TABLE_NUM; i++) {
227+
// zcl_reportTimerEvt_t *pTimerEvt = &reportTimer[i];
228+
// if (pTimerEvt->pEntry == pEntry) {
229+
// reportAttrTimerStop(pTimerEvt);
230+
// break;
231+
// }
232+
// }
242233
}
243234

244235
/*********************************************************************

0 commit comments

Comments
 (0)