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
785e96ed
Commit
785e96ed
authored
Oct 21, 2020
by
尹佳钦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增队列接收数据
parent
e8d57f6a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
4 deletions
+30
-4
platform/zigbee/app/builder/Z3GatewayHost/Makefile
platform/zigbee/app/builder/Z3GatewayHost/Makefile
+1
-0
platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_device_table_db.c
.../zigbee/app/builder/Z3GatewayHost/ZB/kk_device_table_db.c
+3
-0
platform/zigbee/app/builder/Z3GatewayHost/kk_test.c
platform/zigbee/app/builder/Z3GatewayHost/kk_test.c
+5
-0
platform/zigbee/app/builder/Z3GatewayHost/rpc_api/src/rpc_interface_parse.c
...p/builder/Z3GatewayHost/rpc_api/src/rpc_interface_parse.c
+16
-3
platform/zigbee/app/builder/Z3GatewayHost/yjq_ezsp.c
platform/zigbee/app/builder/Z3GatewayHost/yjq_ezsp.c
+5
-1
No files found.
platform/zigbee/app/builder/Z3GatewayHost/Makefile
View file @
785e96ed
...
@@ -292,6 +292,7 @@ APPLICATION_FILES= \
...
@@ -292,6 +292,7 @@ APPLICATION_FILES= \
./ZB/kk_rgb_hsl_convert.c
\
./ZB/kk_rgb_hsl_convert.c
\
./ZB/kk_color_space.c
\
./ZB/kk_color_space.c
\
./ZB/sub_device_manage.c
\
./ZB/sub_device_manage.c
\
./ZB/kk_ncp_queue.c
\
./ZB/kk_topo_batch_handle.c
\
./ZB/kk_topo_batch_handle.c
\
./ZB/kk_wlist_mng.c
\
./ZB/kk_wlist_mng.c
\
./kk_test.c
\
./kk_test.c
\
...
...
platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_device_table_db.c
View file @
785e96ed
#include "kk_device_table_db.h"
#include "kk_device_table_db.h"
#include "sqlite3.h"
#include "sqlite3.h"
#include "kk_ncp_queue.h"
void
kk_mac_conver
(
EmberEUI64
mac
,
char
*
macString
)
void
kk_mac_conver
(
EmberEUI64
mac
,
char
*
macString
)
{
{
...
@@ -535,6 +536,8 @@ void emberAfPluginDeviceTableInitialized(void)
...
@@ -535,6 +536,8 @@ void emberAfPluginDeviceTableInitialized(void)
kk_load_dev_map_table
();
kk_load_dev_map_table
();
kk_device_map_print
();
kk_device_map_print
();
kk_device_config_load_from_db
();
kk_device_config_load_from_db
();
#define NCP_QUEUE_MAX_SIZE 50
ncp_queue_init
(
NCP_QUEUE_MAX_SIZE
);
}
}
void
test_123
(
int
val
)
void
test_123
(
int
val
)
...
...
platform/zigbee/app/builder/Z3GatewayHost/kk_test.c
View file @
785e96ed
#include "kk_test.h"
#include "kk_test.h"
#include "kk_ncp_queue.h"
static
void
kk_rpc_send_message
(
cJSON
*
data
,
char
*
msgtype
,
char
*
method
,
EmberEUI64
mac
)
static
void
kk_rpc_send_message
(
cJSON
*
data
,
char
*
msgtype
,
char
*
method
,
EmberEUI64
mac
)
{
{
...
@@ -190,6 +191,8 @@ error_return:
...
@@ -190,6 +191,8 @@ error_return:
extern
void
ncp_queue_tick
(
void
);
...
@@ -201,6 +204,8 @@ void emberAfMainTickCallback(void)
...
@@ -201,6 +204,8 @@ void emberAfMainTickCallback(void)
static
unsigned
int
last_time
;
static
unsigned
int
last_time
;
unsigned
int
time
=
halCommonGetInt32uMillisecondTick
();
unsigned
int
time
=
halCommonGetInt32uMillisecondTick
();
kk_sub_dev_manage
();
kk_sub_dev_manage
();
ncp_queue_tick
();
if
((
time
-
last_time
)
>=
3000
){
if
((
time
-
last_time
)
>=
3000
){
last_time
=
time
;
last_time
=
time
;
...
...
platform/zigbee/app/builder/Z3GatewayHost/rpc_api/src/rpc_interface_parse.c
View file @
785e96ed
...
@@ -225,7 +225,19 @@ static int eval_request(struct jrpc_server *server, cJSON *root) {
...
@@ -225,7 +225,19 @@ static int eval_request(struct jrpc_server *server, cJSON *root) {
#define KK_THING_OTA_DEVICE_UPGRADE "/ota/device/upgrade"
#define KK_THING_OTA_DEVICE_UPGRADE "/ota/device/upgrade"
void
ncp_queue_tick
(
void
)
{
cJSON
*
root
=
NULL
;
char
*
str
;
if
(
ncp_queue_dequeue
(
&
root
)
==
0
){
str
=
rpc_cJSON_Print
(
root
);
printf
(
"dequeue cJson = %s
\n
"
,
str
);
free
(
str
);
eval_request
(
&
my_server
,
root
);
rpc_cJSON_Delete
(
root
);
}
}
void
_cb
(
void
*
data
,
int
len
,
char
*
chlmark
){
void
_cb
(
void
*
data
,
int
len
,
char
*
chlmark
){
if
(
data
!=
NULL
){
if
(
data
!=
NULL
){
printf
(
"plat_cb: %s [%d]RECEIVED
\r\n
"
,
data
,
len
);
printf
(
"plat_cb: %s [%d]RECEIVED
\r\n
"
,
data
,
len
);
...
@@ -241,12 +253,13 @@ void _cb(void* data, int len, char* chlmark){
...
@@ -241,12 +253,13 @@ void _cb(void* data, int len, char* chlmark){
kk_ota_process
(
root
);
kk_ota_process
(
root
);
}
else
{
}
else
{
eval_request
(
&
my_server
,
root
);
ncp_queue_enqueue
((
void
*
)
root
);
//eval_request(&my_server, root);
}
}
}
}
//shift processed request, discarding it
//shift processed request, discarding it
rpc_cJSON_Delete
(
root
);
//
rpc_cJSON_Delete(root);
}
else
{
}
else
{
if
(
1
)
{
if
(
1
)
{
printf
(
"INVALID JSON Received:
\n
---
\n
%s
\n
---
\n
"
,
printf
(
"INVALID JSON Received:
\n
---
\n
%s
\n
---
\n
"
,
...
...
platform/zigbee/app/builder/Z3GatewayHost/yjq_ezsp.c
View file @
785e96ed
#include "yjq_ezsp.h"
#include "yjq_ezsp.h"
#include "./jsonrpc/rpccJSON.h"
...
@@ -91,6 +94,7 @@ extern void kk_print_network_info(void);
...
@@ -91,6 +94,7 @@ extern void kk_print_network_info(void);
extern
void
test_123
(
int
val
);
extern
void
test_123
(
int
val
);
extern
void
kk_ota_test111
();
extern
void
kk_ota_test111
();
extern
void
kk_ota_test123123123
();
extern
void
kk_ota_test123123123
();
extern
int
ncp_queue_enqueue
(
void
*
data
);
void
kk_message_process
(
char
*
messageString
)
void
kk_message_process
(
char
*
messageString
)
{
{
...
@@ -116,7 +120,7 @@ void kk_message_process(char *messageString)
...
@@ -116,7 +120,7 @@ void kk_message_process(char *messageString)
kk_ota_test123123123
();
kk_ota_test123123123
();
}
}
if
(
MEMCOMPARE
(
messageString
,
"AT+TEST
\r\n
"
,
len
)
==
0
){
if
(
MEMCOMPARE
(
messageString
,
"AT+TEST
\r\n
"
,
len
)
==
0
){
kk_ota_test111
();
}
}
}
}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
...
...
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