Commits · bf4454182d979ffaf24015b778deac0feca60cd0 · 陈伟灿 / k-sdk

18 Sep, 2020 13 commits
- 【修改内容】添加kk_log.h · bf445418
  chen.weican authored Sep 18, 2020
```
【提交人】陈伟灿
```
  bf445418
- 【修改内容】修改后台进程检测脚本 · 70cb1a92
  chen.weican authored Sep 18, 2020
```
【提交人】陈伟灿
```
  70cb1a92
- 【修改内容】修改启动后误报offline的bug · 15e812ee
  chen.weican authored Sep 18, 2020
```
【提交人】陈伟灿
```
  15e812ee
- 【修改内容】修改子设备删除后导致其他子设备都无法操作的BUG · c60ccdf7
  chen.weican authored Sep 18, 2020
```
【提交人】陈伟灿
```
  c60ccdf7
- 【修改内容】1，增加gateway的配置文件；2，去掉kk_sub_tsl.c，同一改用kk_device_manage里的接口 · 8c3bbd07
  chen.weican authored Sep 18, 2020
```
【提交人】陈伟灿
```
  8c3bbd07
- Merge branch 'yjq' into 'master' · a615faf9
  陈伟灿 authored Sep 18, 2020
```
Yjq

See merge request chenweican/k-sdk!11
```
  a615faf9
- 新增ISA接口 · 2a352fcf
  尹佳钦 authored Sep 18, 2020
  
  2a352fcf
- Merge branch 'master' of http://172.17.3.10:17001/chenweican/k-sdk · 1003bad8
  尹佳钦 authored Sep 18, 2020
  
  1003bad8
- 新增IAS接口 · 0c4d8ff1
  尹佳钦 authored Sep 18, 2020
  
  0c4d8ff1
- Merge branch 'cwc' into 'master' · d6172530
  陈伟灿 authored Sep 18, 2020
```
Cwc

See merge request chenweican/k-sdk!10
```
  d6172530
- Merge branch 'master' of http://172.17.3.10:17001/chenweican/k-sdk · 7c5ca916
  chen.weican authored Sep 18, 2020
  
  7c5ca916
- 【修改内容】1，去掉一些调试打印；2，修改子设备离线后主机重启无法上报online的bug。 · b53763ab
  chen.weican authored Sep 18, 2020
```
【提交人】陈伟灿
```
  b53763ab
- Merge branch 'cwc' into 'master' · d4dbde19
  陈伟灿 authored Sep 18, 2020
```
【修改内容】恢复子设备删除功能

See merge request chenweican/k-sdk!9
```
  d4dbde19
17 Sep, 2020 16 commits
- 【修改内容】恢复子设备删除功能 · e9599f1d
  chen.weican authored Sep 17, 2020
```
【提交人】陈伟灿
```
  e9599f1d
- 111 · a743a1d1
  尹佳钦 authored Sep 17, 2020
  
  a743a1d1
- 111 · 2d71ac7f
  尹佳钦 authored Sep 17, 2020
  
  2d71ac7f
- 11 · 184125dd
  尹佳钦 authored Sep 17, 2020
  
  184125dd
- 123 · 3c029b7f
  尹佳钦 authored Sep 17, 2020
  
  3c029b7f
- 【修改内容】1，增加彩带灯在新框架上的控制和属性上报；2，去掉原来的zigbee map文件 · e6ffee28
  chen.weican authored Sep 17, 2020
```
【提交人】陈伟灿
```
  e6ffee28
- 暂存 · a6fb49f6
  尹佳钦 authored Sep 17, 2020
  
  a6fb49f6
- Merge branch 'master' of http://172.17.3.10:17001/chenweican/k-sdk · 863ae218
  chen.weican authored Sep 17, 2020
  
  863ae218
- 添加，彩灯配置表 · c995f942
  尹佳钦 authored Sep 17, 2020
  
  c995f942
- Merge branch 'yjq' into 'master' · c8a0e75a
  陈伟灿 authored Sep 17, 2020
```
Yjq

See merge request chenweican/k-sdk!8
```
  c8a0e75a
- 【修改内容】去掉zlog模块，改用syslog打印 · d008fc9d
  chen.weican authored Sep 17, 2020
```
【提交人】陈伟灿
```
  d008fc9d
- Merge branch 'master' of http://172.17.3.10:17001/chenweican/k-sdk · 222a4bc1
  尹佳钦 authored Sep 17, 2020
  
  222a4bc1
- Merge branch 'cwc' into 'master' · a84179ef
  陈伟灿 authored Sep 17, 2020
```
【修改内容】修改根据配置文件来实现面板的控制和属性上报

See merge request chenweican/k-sdk!7
```
  a84179ef
- 【修改内容】修改根据配置文件来实现面板的控制和属性上报 · 2c711cbb
  chen.weican authored Sep 17, 2020
```
【提交人】陈伟灿
```
  2c711cbb
- Merge branch 'master' of http://172.17.3.10:17001/chenweican/k-sdk · e61338d5
  尹佳钦 authored Sep 17, 2020
  
  e61338d5
- 2020、09、17 · bf8ce5d8
  尹佳钦 authored Sep 17, 2020
  
  bf8ce5d8
16 Sep, 2020 11 commits
- 11111 · d6475802
  尹佳钦 authored Sep 16, 2020
  
  d6475802
- Merge branch 'yjq' into 'master' · 1df76f11
  陈伟灿 authored Sep 16, 2020
```
Yjq

See merge request chenweican/k-sdk!6
```
  1df76f11
- Merge branch 'master' of http://172.17.3.10:17001/chenweican/k-sdk · e38a1ad7
  尹佳钦 authored Sep 16, 2020
  
  e38a1ad7
- 1 · 6f389bd9
  尹佳钦 authored Sep 16, 2020
  
  6f389bd9
- 2020/09/16 111 · abb3233f
  尹佳钦 authored Sep 16, 2020
  
  abb3233f
- 1 · 314eced8
  尹佳钦 authored Sep 16, 2020
  
  314eced8
- 本地合并 · 66466c28
  尹佳钦 authored Sep 16, 2020
  
  66466c28
- 1 · 2b6abaf8
  尹佳钦 authored Sep 16, 2020
  
  2b6abaf8
- Merge branch 'hzl' into 'master' · 1901a96b
  陈伟灿 authored Sep 16, 2020
```
【修改内容】恢复编译ota功能

See merge request chenweican/k-sdk!4
```
  1901a96b
- 【修改内容】恢复编译ota功能 · ff8687a7
  黄振令 authored Sep 16, 2020
```
【提交人】huang.zhenling
```
  ff8687a7
- 合并提交测试 · 51a49caf
  尹佳钦 authored Sep 16, 2020
  
  51a49caf