projects
/
mirrors
/
FD230.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a156b46
eba512b
)
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
10/1
10/head
11/target/1
author
luozheng
<1732036298@qq.com>
Mon, 15 Apr 2024 08:18:44 +0000
(16:18 +0800)
committer
luozheng
<1732036298@qq.com>
Mon, 15 Apr 2024 08:18:44 +0000
(16:18 +0800)
1
2
code/sdk/application/wearable/fd230app/CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
code/sdk/application/wearable/fd230app/CMakeLists.txt
Simple merge
diff --cc
code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
index
48e3bfa
,
78a0973
..
939bc98
---
1
/
code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
---
2
/
code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/
code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@@
-1385,7
-1541,7
+1541,7
@@@
void GetDrinkSetParamCmd(uint16_t cmd,u
\r
}
\r
\r
- void jsonCheck_weather(uint8_t *buf)//json 格式解析 天气数据
\r
-static uint8_t jsonCheck_weather(uint8_t *buf)//json 格式解析 天气数据
\r
++uint8_t jsonCheck_weather(uint8_t *buf)//json 格式解析 天气数据
\r
{
\r
uint8_t *json;
\r
json = buf;
\r