Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
k-sdk
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
陈伟灿
k-sdk
Commits
ff8687a7
Commit
ff8687a7
authored
Sep 16, 2020
by
黄振令
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【修改内容】恢复编译ota功能
【提交人】huang.zhenling
parent
8c997561
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
3 deletions
+5
-3
platform/zigbee/app/builder/Z3GatewayHost/Makefile
platform/zigbee/app/builder/Z3GatewayHost/Makefile
+4
-2
platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_plat_ota.c
platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_plat_ota.c
+0
-0
platform/zigbee/app/builder/Z3GatewayHost/libcurl_ubuntu.so
platform/zigbee/app/builder/Z3GatewayHost/libcurl_ubuntu.so
+0
-0
platform/zigbee/app/builder/Z3GatewayHost/rpc_api/src/rpc_interface_parse.c
...p/builder/Z3GatewayHost/rpc_api/src/rpc_interface_parse.c
+1
-1
No files found.
platform/zigbee/app/builder/Z3GatewayHost/Makefile
View file @
ff8687a7
...
@@ -88,6 +88,7 @@ INCLUDES= \
...
@@ -88,6 +88,7 @@ INCLUDES= \
-I
../../../platform/base/hal/micro/unix/host/board
\
-I
../../../platform/base/hal/micro/unix/host/board
\
-I
./rpc_api/inc
\
-I
./rpc_api/inc
\
-I
../../../../../common/sqlite/
\
-I
../../../../../common/sqlite/
\
-I
../../../../../common/curl/include
\
-I
./ZB
-I
./ZB
\
\
...
@@ -287,6 +288,7 @@ APPLICATION_FILES= \
...
@@ -287,6 +288,7 @@ APPLICATION_FILES= \
./ZB/kk_tsl_property_set.c
\
./ZB/kk_tsl_property_set.c
\
./ZB/kk_device_table_db.c
\
./ZB/kk_device_table_db.c
\
./ZB/kk_msg_report.c
\
./ZB/kk_msg_report.c
\
./ZB/kk_plat_ota.c
\
./kk_test.c
\
./kk_test.c
\
./kk_sub_tsl.c
\
./kk_sub_tsl.c
\
./kk_tsl_zigbee_map.c
\
./kk_tsl_zigbee_map.c
\
...
@@ -376,10 +378,10 @@ $(TARGET_FILE): $(APPLICATION_OBJECTS) $(LIBRARIES)
...
@@ -376,10 +378,10 @@ $(TARGET_FILE): $(APPLICATION_OBJECTS) $(LIBRARIES)
else
else
$(TARGET_FILE)
:
$(APPLICATION_OBJECTS) $(LIBRARIES)
$(TARGET_FILE)
:
$(APPLICATION_OBJECTS) $(LIBRARIES)
ifeq
($(CONFIG_VENDOR),ubuntu)
ifeq
($(CONFIG_VENDOR),ubuntu)
$(LD)
$^
$(LINKER_FLAGS)
-lm
-L
.
-lapi_com_ubuntu
-lnanomsg_ubuntu
-lanl
-pthread
-lev_ubuntu
-lkk_hal_ubuntu
-lsqlite_ubuntu
-ldl
-o
$(TARGET_FILE)
$(LD)
$^
$(LINKER_FLAGS)
-lm
-L
.
-lapi_com_ubuntu
-lnanomsg_ubuntu
-lanl
-pthread
-lev_ubuntu
-lkk_hal_ubuntu
-lsqlite_ubuntu
-l
curl_ubuntu
-l
dl
-o
$(TARGET_FILE)
@
echo
-e
'\n$@ build success'
@
echo
-e
'\n$@ build success'
else
else
$(LD)
$^
$(LINKER_FLAGS)
-lm
-L
.
-lapi_com
-lnanomsg
-lanl
-pthread
-lev
-lkk_hal
-lsqlite
-o
$(TARGET_FILE)
$(LD)
$^
$(LINKER_FLAGS)
-lm
-L
.
-lapi_com
-lnanomsg
-lanl
-pthread
-lev
-lkk_hal
-lsqlite
-
lcurl
-
o
$(TARGET_FILE)
@
echo
-e
'\n$@ build success'
@
echo
-e
'\n$@ build success'
endif
endif
endif
endif
...
...
platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_p
al
t_ota.c
→
platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_p
la
t_ota.c
View file @
ff8687a7
File moved
platform/zigbee/app/builder/Z3GatewayHost/libcurl_ubuntu.so
0 → 100644
View file @
ff8687a7
File added
platform/zigbee/app/builder/Z3GatewayHost/rpc_api/src/rpc_interface_parse.c
View file @
ff8687a7
...
@@ -238,7 +238,7 @@ void _cb(void* data, int len, char* chlmark){
...
@@ -238,7 +238,7 @@ void _cb(void* data, int len, char* chlmark){
if
(
info
!=
NULL
&&
strstr
(
rpc_cJSON_GetObjectItem
(
info
,
"msgType"
)
->
valuestring
,
KK_THING_OTA_DEVICE_UPGRADE
)
!=
NULL
){
if
(
info
!=
NULL
&&
strstr
(
rpc_cJSON_GetObjectItem
(
info
,
"msgType"
)
->
valuestring
,
KK_THING_OTA_DEVICE_UPGRADE
)
!=
NULL
){
//
kk_ota_process(root);
kk_ota_process
(
root
);
}
else
{
}
else
{
eval_request
(
&
my_server
,
root
);
eval_request
(
&
my_server
,
root
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment