OpenXX/xiuos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix ADD_XIZI_FETURES/ADD_NUTTX_FETURES/ADD_RTTHREAD_FETURES error

Browse Source
This commit is contained in:
Liu_Weichao
2023-06-20 13:20:41 +08:00
parent 5c08cae005
commit cf85c4b99c
71 changed files with 190 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
APP_Framework/Framework/connection/lora/adapter_lora.c
View File

@@ -930,7 +930,7 @@ int AdapterLoraTest(void)
//create lora gateway task
#ifdef AS_LORA_GATEWAY_ROLE
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
pthread_attr_t lora_gateway_attr = PTHREAD_ATTR_INITIALIZER;
lora_gateway_attr.priority = 20;
lora_gateway_attr.stacksize = 2048;
@@ -943,7 +943,7 @@ int AdapterLoraTest(void)
PrivTaskCreate(&lora_recv_data_task, &lora_gateway_attr, &LoraReceiveTask, (void *)adapter);
PrivTaskStartup(&lora_recv_data_task);
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
lora_gateway_attr.priority = 19;
#else
lora_gateway_attr.schedparam.sched_priority = 19;
@@ -953,7 +953,7 @@ int AdapterLoraTest(void)
PrivTaskStartup(&lora_gateway_task);
#else //AS_LORA_CLIENT_ROLE
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
pthread_attr_t lora_client_attr = PTHREAD_ATTR_INITIALIZER;
lora_client_attr.priority = 20;
lora_client_attr.stacksize = 2048;
@@ -965,7 +965,7 @@ int AdapterLoraTest(void)
PrivTaskCreate(&lora_recv_data_task, &lora_client_attr, &LoraReceiveTask, (void *)adapter);
PrivTaskStartup(&lora_recv_data_task);
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
lora_client_attr.priority = 19;
#else
lora_client_attr.schedparam.sched_priority = 19;

2
APP_Framework/Framework/connection/lora/e22/Kconfig
View File

@@ -2,7 +2,7 @@ config ADAPTER_LORA_E22
string "E22-400T30S adapter name"
default "e22"
if ADD_NUTTX_FETURES
if ADD_NUTTX_FEATURES
config ADAPTER_E22_M0_PATH
string "E22 M0 pin device"

6
APP_Framework/Framework/connection/lora/e220/Kconfig
View File

@@ -2,7 +2,7 @@ config ADAPTER_LORA_E220
string "E220-400T22S adapter name"
default "e220"
if ADD_XIZI_FETURES
if ADD_XIZI_FEATURES
config ADAPTER_E220_M0
int "E220 M0 pin number"
default "11"
@@ -35,7 +35,7 @@ if ADD_XIZI_FETURES
endif
endif
if ADD_NUTTX_FETURES
if ADD_NUTTX_FEATURES
config ADAPTER_E220_M0_PATH
string "E220 M0 pin device"
@@ -66,7 +66,7 @@ if ADD_NUTTX_FETURES
endif
if ADD_RTTHREAD_FETURES
if ADD_RTTHREAD_FEATURES
config ADAPTER_E220_M0
int "E220 M0 pin number"
default "11"

16
APP_Framework/Framework/connection/lora/e220/e220.c
View File

@@ -21,7 +21,7 @@
#include <adapter.h>
#define E220_GATEWAY_ADDRESS 0xFFFF
#ifdef ADD_RTTHREAD_FETURES
#ifdef ADD_RTTHREAD_FEATURES
#define E220_CHANNEL 0x02
#else
#define E220_CHANNEL 0x05
@@ -35,7 +35,7 @@
#define E220_ADDRESS ADAPTER_LORA_NET_ROLE_ID
#endif
#ifdef ADD_RTTHREAD_FETURES
#ifdef ADD_RTTHREAD_FEATURES
#define E220_UART_BAUD_RATE 9600
#else
#define E220_UART_BAUD_RATE 115200
@@ -54,7 +54,7 @@ enum E220LoraMode
* @param mode Lora working mode
* @return NULL
*/
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
static void E220LoraModeConfig(enum E220LoraMode mode)
{
int m0_fd, m1_fd;
@@ -338,7 +338,7 @@ static int E220GetRegisterParam(uint8 *buf)
* @param adapter - Lora device pointer
* @return success: 0, failure: -1
*/
#ifdef ADD_RTTHREAD_FETURES
#ifdef ADD_RTTHREAD_FEATURES
static int E220Open(struct Adapter *adapter)
{
/*step1: open e220 uart port*/
@@ -614,7 +614,7 @@ static void LoraOpen(void)
E220Open(adapter);
}
#ifdef ADD_RTTHREAD_FETURES
#ifdef ADD_RTTHREAD_FEATURES
MSH_CMD_EXPORT(LoraOpen,Lora open test sample);
static void LoraRead(void *parameter)
@@ -692,7 +692,7 @@ static void LoraRead(void *parameter)
#endif
#ifdef ADD_XIZI_FETURES
#ifdef ADD_XIZI_FEATURES
static void LoraTest(void)
{
int ret;
@@ -727,7 +727,7 @@ static void LoraSend(int argc, char *argv[])
PRIV_SHELL_CMD_FUNCTION(LoraSend, a lora test send sample, PRIV_SHELL_CMD_MAIN_ATTR);
#endif
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
void E220LoraReceive(void)
{
int ret;
@@ -763,7 +763,7 @@ void E220LoraSend(int argc, char *argv[])
}
#endif
#ifdef ADD_RTTHREAD_FETURES
#ifdef ADD_RTTHREAD_FEATURES
static void LoraReadStart(void)
{
int ret;

6
APP_Framework/Framework/connection/lora/sx1278/Kconfig
View File

@@ -2,20 +2,20 @@ config ADAPTER_LORA_SX1278
string "SX1278 adapter name"
default "sx1278"
if ADD_XIZI_FETURES
if ADD_XIZI_FEATURES
config ADAPTER_SX1278_DRIVER
string "SX1278 device spi driver path"
default "/dev/spi2_lora"
endif
if ADD_NUTTX_FETURES
if ADD_NUTTX_FEATURES
config ADAPTER_SX1278_DRIVER
string "SX1278 device spi driver path"
default "/dev/spi2_lora"
endif
if ADD_RTTHREAD_FETURES
if ADD_RTTHREAD_FEATURES
config ADAPTER_SX1278_DRIVER
string "SX1278 device spi driver path"
default "/dev/sx1278"

10
APP_Framework/Framework/connection/lora/sx1278/sx1278.c
View File

@@ -20,7 +20,7 @@
#include <adapter.h>
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
/**
* @description: Sx127x_Nuttx_Write function for nuttx
* @param fd - file descriptor to write to
@@ -104,7 +104,7 @@ static int Sx1278Ioctl(struct Adapter *adapter, int cmd, void *args)
* @param priv_net_group - priv_net_group params
* @return success: 0, failure: -1
*/
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
static int Sx1278Join(struct Adapter *adapter, unsigned char *priv_net_group)
{
int ret;
@@ -140,7 +140,7 @@ static int Sx1278Join(struct Adapter *adapter, unsigned char *priv_net_group)
* @param len - data len
* @return success: 0, failure: -1
*/
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
static int Sx1278Send(struct Adapter *adapter, const void *buf, size_t len)
{
int ret;
@@ -170,7 +170,7 @@ static int Sx1278Send(struct Adapter *adapter, const void *buf, size_t len)
* @param len - data len
* @return success: 0, failure: -1
*/
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
static int Sx1278Recv(struct Adapter *adapter, void *buf, size_t len)
{
int ret;
@@ -196,7 +196,7 @@ static int Sx1278Recv(struct Adapter *adapter, void *buf, size_t len)
* @param priv_net_group - priv_net_group params
* @return success: 0, failure: -1
*/
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
static int Sx1278Quit(struct Adapter *adapter, unsigned char *priv_net_group)
{
int ret;