xxq2506
/
xiuos5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://git.trustie.net/xuos/xiuos into develop

This commit is contained in:
Wang_Weigen 2021-05-10 10:07:50 +08:00
parent c4e0918583 0828327cd0
commit 83b223e0db
12 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applications/app_newlib/fs_syscalls.c
View File

@ -28,7 +28,7 @@ Modification: Use file system functions
#include <sys/errno.h> #include <sys/errno.h>
#include <stdio.h> #include <stdio.h>
#include "../user_api/switch_api/user_api.h" #include <user_api.h>
int _close_r(struct _reent *ptr, int fd) int _close_r(struct _reent *ptr, int fd)
{ {

2
applications/app_newlib/mem_syscalls.c
View File

@ -26,7 +26,7 @@ Author: AIIT XUOS Lab
Modification: Use malloc, realloc, calloc and free functions Modification: Use malloc, realloc, calloc and free functions
*************************************************/ *************************************************/
#include "../user_api/switch_api/user_api.h" #include <user_api.h>
void *_malloc_r (struct _reent *ptr, size_t size) void *_malloc_r (struct _reent *ptr, size_t size)
{ {

2
applications/connection_demo/nbiot_demo/nbiot_demo.c
View File

@ -28,8 +28,6 @@ extern void RegisterAdapterNBIoT(void);
void NbiotEnable(void) void NbiotEnable(void)
{ {
RegisterAdapterNBIoT();
struct AdapterAT* at_adapter = ATAdapterFind(NBIOT_ADAPTER_ID); struct AdapterAT* at_adapter = ATAdapterFind(NBIOT_ADAPTER_ID);
UserTaskDelay(5000); UserTaskDelay(5000);

5
applications/framework_init.c
View File

@ -17,6 +17,7 @@ extern int SensorFrameworkInit(void);
extern int RegisterAdapterEthernet(void); extern int RegisterAdapterEthernet(void);
extern int RegisterAdapterWifi(void); extern int RegisterAdapterWifi(void);
extern int RegisterAdapterZigbee(void); extern int RegisterAdapterZigbee(void);
extern int RegisterAdapterNBIoT(void);
extern int LoraSx12xxSpiDeviceInit(); extern int LoraSx12xxSpiDeviceInit();
extern int D124VoiceInit(void); extern int D124VoiceInit(void);
@ -100,6 +101,10 @@ static struct InitDesc connection_desc[] =
#ifdef CONNECTION_COMMUNICATION_ZIGBEE #ifdef CONNECTION_COMMUNICATION_ZIGBEE
{ "zigbee adpter", RegisterAdapterZigbee}, { "zigbee adpter", RegisterAdapterZigbee},
#endif #endif
#ifdef CONNECTION_COMMUNICATION_NB_IOT
{ "NB-IoT adpter", RegisterAdapterNBIoT},
#endif
{ "NULL", NULL }, { "NULL", NULL },
}; };

2
applications/sensor_app/co2_zg09.c
View File

@ -18,7 +18,7 @@
* @date 2021.04.23 * @date 2021.04.23
*/ */
#include "../user_api/switch_api/user_api.h" #include <user_api.h>
#include <sensor.h> #include <sensor.h>
/** /**

2
applications/sensor_app/humidity_hs300x.c
View File

@ -18,7 +18,7 @@
* @date 2021.04.23 * @date 2021.04.23
*/ */
#include "../user_api/switch_api/user_api.h" #include <user_api.h>
#include <sensor.h> #include <sensor.h>
/** /**

2
applications/sensor_app/pm1_0_ps5308.c
View File

@ -18,7 +18,7 @@
* @date 2021.04.23 * @date 2021.04.23
*/ */
#include "../user_api/switch_api/user_api.h" #include <user_api.h>
#include <sensor.h> #include <sensor.h>
/** /**

2
applications/sensor_app/temperature_hs300x.c
View File

@ -18,7 +18,7 @@
* @date 2021.04.23 * @date 2021.04.23
*/ */
#include "../user_api/switch_api/user_api.h" #include <user_api.h>
#include <sensor.h> #include <sensor.h>
/** /**

2
applications/sensor_app/voice_d124.c
View File

@ -18,7 +18,7 @@
* @date 2021.04.23 * @date 2021.04.23
*/ */
#include "../user_api/switch_api/user_api.h" #include <user_api.h>
#include <sensor.h> #include <sensor.h>
/** /**

5
framework/connection/Adapter/include/xs_adapter_at_nbiot.h
View File

@ -25,7 +25,10 @@
#include "xs_adapter_at.h" #include "xs_adapter_at.h"
#include "xs_adapter_at_agent.h" #include "xs_adapter_at_agent.h"
#include "xs_adapter_def.h" #include "xs_adapter_def.h"
#include "../../../applications/user_api/switch_api/user_api.h"
#include <stdio.h>
#include <string.h>
#include <user_api.h>
#define MAX_SOCKET_NUM 8 #define MAX_SOCKET_NUM 8

13
framework/connection/Adapter/nbiot/bc28/xs_adapter_at_nbiot.c
View File

@ -156,8 +156,11 @@ int NBIoTSocketCreate(struct AdapterAT *adapterAT, uint8_t socket_fd, uint8_t ty
printf("cmd : %s\n", at_cmd); printf("cmd : %s\n", at_cmd);
ATOrderSend(adapterAT->agent, REPLY_TIME_OUT, reply, at_cmd); ATOrderSend(adapterAT->agent, REPLY_TIME_OUT, reply, at_cmd);
MdelayKTask(3000); UserTaskDelay(3000);
printf("bak : %s\n", adapterAT->agent->maintain_buffer); printf("bak : ");
for(int i = 0; i < strlen(reply->reply_buffer); i++)
printf(" 0x%02x", reply->reply_buffer[i]);
printf("\n");
struct Socket (*socketlist)[MAX_SOCKET_NUM] = &adapterAT->socket; struct Socket (*socketlist)[MAX_SOCKET_NUM] = &adapterAT->socket;
memset(socketlist[socket_fd], 0, sizeof(struct Socket)); memset(socketlist[socket_fd], 0, sizeof(struct Socket));
@ -219,7 +222,7 @@ int NBIoTSocketConnect(struct AdapterAT *adapterAT , uint8_t socket_fd , struct
printf("cmd : %s\n", at_cmd); printf("cmd : %s\n", at_cmd);
ATOrderSend(adapterAT->agent, REPLY_TIME_OUT, reply, at_cmd); ATOrderSend(adapterAT->agent, REPLY_TIME_OUT, reply, at_cmd);
MdelayKTask(300); UserTaskDelay(300);
socketlist[socket_fd]->dst_ip = dst_ip; socketlist[socket_fd]->dst_ip = dst_ip;
socketlist[socket_fd]->dst_port = dst_port; socketlist[socket_fd]->dst_port = dst_port;
@ -267,7 +270,7 @@ int NBIoTSocketClose(struct AdapterAT *adapterAT, uint8_t socket_fd )
printf("cmd : %s\n", at_cmd); printf("cmd : %s\n", at_cmd);
ATOrderSend(adapterAT->agent, REPLY_TIME_OUT, reply, at_cmd); ATOrderSend(adapterAT->agent, REPLY_TIME_OUT, reply, at_cmd);
MdelayKTask(300); UserTaskDelay(300);
memset(socketlist[socket_fd], 0, sizeof(struct Socket)); memset(socketlist[socket_fd], 0, sizeof(struct Socket));
@ -325,7 +328,7 @@ int NbiotSend(struct Adapter *padapter, const char* data, int len, bool block, i
printf("cmd : %s\n", at_cmd); printf("cmd : %s\n", at_cmd);
ATOrderSend(adapterAT->agent, REPLY_TIME_OUT, reply, at_cmd); ATOrderSend(adapterAT->agent, REPLY_TIME_OUT, reply, at_cmd);
MdelayKTask(300); UserTaskDelay(300);
__exit: __exit:
if (reply) { if (reply) {

2
tool/shell/letter-shell/cmd.c
View File

@ -33,7 +33,7 @@ long Version(void)
return 0; return 0;
} }
SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0)|SHELL_CMD_DISABLE_RETURN, SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0)|SHELL_CMD_DISABLE_RETURN,
Version,Version, show xios Version information); Version,Version, show XiUOS Version information);
static __inline void PrintSpace(int len) static __inline void PrintSpace(int len)
{ {