developer/xiuos
1
0
Fork 0
forked from xuos/xiuos
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

6
APP_Framework/Framework/connection/4g/ec200t/Kconfig
View File

@@ -2,7 +2,7 @@ config ADAPTER_4G_EC200T
string "EC200T adapter name"
default "ec200t"
if ADD_XIZI_FETURES
if ADD_XIZI_FEATURES
config ADAPTER_EC200T_USING_PWRKEY
bool "EC200T using PWRKEY pin number"
default n
@@ -37,7 +37,7 @@ if ADD_XIZI_FETURES
endif
endif
if ADD_NUTTX_FETURES
if ADD_NUTTX_FEATURES
config ADAPTER_EC200T_USING_PWRKEY
bool "EC200T using PWRKEY pin number"
default n
@@ -72,7 +72,7 @@ if ADD_NUTTX_FETURES
endif
endif
if ADD_RTTHREAD_FETURES
if ADD_RTTHREAD_FEATURES
config ADAPTER_EC200T_PWRKEY
int "EC200T PWRKEY pin number"
default "97"

2
APP_Framework/Framework/connection/4g/ec200t/ec200t.c
View File

@@ -142,7 +142,7 @@ out:
return ret;
}
#ifdef ADD_RTTHREAD_FETURES
#ifdef ADD_RTTHREAD_FEATURES
static int Ec200tIoctl(struct Adapter *adapter, int cmd, void *args){ return 0;}
#else
static int Ec200tIoctl(struct Adapter *adapter, int cmd, void *args)

14
APP_Framework/Framework/connection/adapter_agent.c
View File

@@ -26,10 +26,10 @@
#include <math.h>
#include <stdlib.h>
#include <string.h>
#ifdef ADD_XIZI_FETURES
#ifdef ADD_XIZI_FEATURES
# include <user_api.h>
#endif
#ifdef ADD_RTTHREAD_FETURES
#ifdef ADD_RTTHREAD_FEATURES
#include <rtthread.h>
#endif
#define AT_CMD_MAX_LEN 128
@@ -424,26 +424,26 @@ int DeleteATAgent(ATAgentType agent)
PrivClose(agent->fd);
}
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
if (agent->lock.sem.semcount > 0) {
printf("delete agent lock = %d\n",agent->lock.sem.semcount);
PrivMutexDelete(&agent->lock);
}
#elif defined ADD_RTTHREAD_FETURES
#elif defined ADD_RTTHREAD_FEATURES
#else
if (agent->lock) {
printf("delete agent lock = %d\n",agent->lock);
PrivMutexDelete(&agent->lock);
}
#endif
#ifdef ADD_XIZI_FETURES
#ifdef ADD_XIZI_FEATURES
if (agent->entm_rx_notice) {
printf("delete agent entm_rx_notice = %d\n",agent->entm_rx_notice);
PrivSemaphoreDelete(&agent->entm_rx_notice);
}
#else
#endif
#ifdef ADD_XIZI_FETURES
#ifdef ADD_XIZI_FEATURES
if (agent->rsp_sem) {
printf("delete agent rsp_sem = %d\n",agent->rsp_sem);
PrivSemaphoreDelete(&agent->rsp_sem);
@@ -518,7 +518,7 @@ static int ATAgentInit(ATAgentType agent)
agent->receive_mode = DEFAULT_MODE;
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
pthread_attr_t attr = PTHREAD_ATTR_INITIALIZER;
attr.priority = 18;
attr.stacksize = 8192;

6
APP_Framework/Framework/connection/at_agent.h
View File

@@ -52,7 +52,7 @@ struct ATAgent
uint32 maintain_len;
uint32 maintain_max;
#ifdef ADD_XIZI_FETURES
#ifdef ADD_XIZI_FEATURES
int lock;
#else
pthread_mutex_t lock;
@@ -63,7 +63,7 @@ struct ATAgent
char reply_end_last_char;
char reply_end_char;
uint32 reply_char_num;
#ifdef ADD_XIZI_FETURES
#ifdef ADD_XIZI_FEATURES
int rsp_sem;
#else
sem_t rsp_sem;
@@ -74,7 +74,7 @@ struct ATAgent
char entm_recv_buf[ENTM_RECV_MAX];
uint32 entm_recv_len;
enum ReceiveMode receive_mode;
#ifdef ADD_XIZI_FETURES
#ifdef ADD_XIZI_FEATURES
int entm_rx_notice;
#else
sem_t entm_rx_notice;

6
APP_Framework/Framework/connection/bluetooth/hc08/Kconfig
View File

@@ -2,7 +2,7 @@ config ADAPTER_BLUETOOTH_HC08
string "HC08 adapter name"
default "hc08"
if ADD_XIZI_FETURES
if ADD_XIZI_FEATURES
config ADAPTER_HC08_RECV_BUFFER_SIZE
int "HC08 recv data buffer size"
default "128"
@@ -31,7 +31,7 @@ if ADD_XIZI_FETURES
endif
endif
if ADD_NUTTX_FETURES
if ADD_NUTTX_FEATURES
config ADAPTER_HC08_WORK_ROLE
string "HC08 work role M(MASTER) or S(SLAVER)"
@@ -58,7 +58,7 @@ if ADD_NUTTX_FETURES
endif
if ADD_RTTHREAD_FETURES
if ADD_RTTHREAD_FEATURES
config ADAPTER_HC08_RECV_BUFFER_SIZE
int "HC08 recv data buffer size"
default "128"

4
APP_Framework/Framework/connection/bluetooth/hc08/hc08.c
View File

@@ -353,7 +353,7 @@ static int Hc08Ioctl(struct Adapter *adapter, int cmd, void *args)
}
PrivTaskDelay(500);
#ifdef ADD_RTTHREAD_FETURES
#ifdef ADD_RTTHREAD_FEATURES
//Step3 : show hc08 device info, hc08_get send "AT+RX" response device info
char device_info[HC08_RESP_DEFAULT_SIZE * 2] = {0};
if (Hc08AtConfigure(adapter->agent, HC08_AT_CMD_GET_DEVICE_INFO, NULL, device_info) < 0) {
@@ -369,7 +369,7 @@ static int Hc08Ioctl(struct Adapter *adapter, int cmd, void *args)
if (Hc08AtConfigure(adapter->agent, HC08_AT_CMD_GET_LUUID, NULL, NULL) < 0) {
return -1;
}
#ifdef ADD_RTTHREAD_FETURES
#ifdef ADD_RTTHREAD_FEATURES
uint32_t suuid=1234;
if (Hc08AtConfigure(adapter->agent, HC08_AT_CMD_SET_SUUID, &luuid, NULL) < 0) {
return -1;

6
APP_Framework/Framework/connection/ethernet/hfa21_ethernet/Kconfig
View File

@@ -2,7 +2,7 @@ config ADAPTER_ETHERNET_HFA21
string "HFA21 ETHERNET adapter name"
default "hfa21_ethernet"
if ADD_XIZI_FETURES
if ADD_XIZI_FEATURES
config ADAPTER_HFA21_DRIVER_EXTUART
bool "Using extra uart to support ethernet"
@@ -24,11 +24,11 @@ if ADD_XIZI_FETURES
endif
endif
if ADD_NUTTX_FETURES
if ADD_NUTTX_FEATURES
endif
if ADD_RTTHREAD_FETURES
if ADD_RTTHREAD_FEATURES
config ADAPTER_HFA21_DRIVER
string "HFA21 device uart driver path"
default "/dev/uart3"

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;

6
APP_Framework/Framework/connection/nbiot/bc28/Kconfig
View File

@@ -2,7 +2,7 @@ config ADAPTER_NBIOT_BC28
string "BC28 adapter name"
default "bc28"
if ADD_XIZI_FETURES
if ADD_XIZI_FEATURES
config ADAPTER_BC28_RESETPIN
int "BC28 RESET pin number"
default "100"
@@ -31,11 +31,11 @@ if ADD_XIZI_FETURES
endif
endif
if ADD_NUTTX_FETURES
if ADD_NUTTX_FEATURES
endif
if ADD_RTTHREAD_FETURES
if ADD_RTTHREAD_FEATURES
config ADAPTER_BC28_DRIVER
string "BC28 device uart driver path"
default "/dev/uart2"

2
APP_Framework/Framework/connection/wifi/adapter_wifi.c
View File

@@ -297,7 +297,7 @@ int WifiRecv(int argc, char *argv[])
}
PRIV_SHELL_CMD_FUNCTION(WifiRecv, a WiFi receive sample, PRIV_SHELL_CMD_MAIN_ATTR);
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
enum
{

8
APP_Framework/Framework/connection/wifi/esp07s_wifi/Kconfig
View File

@@ -2,7 +2,7 @@ config ADAPTER_WIFI_ESP07S
string "ESP07S WIFI adapter name"
default "esp07s_wifi"
if ADD_XIZI_FETURES
if ADD_XIZI_FEATURES
config ADAPTER_ESP07S_DRIVER_EXTUART
bool "Using extra uart to support wifi"
@@ -24,7 +24,7 @@ if ADD_XIZI_FETURES
endif
endif
if ADD_NUTTX_FETURES
if ADD_NUTTX_FEATURES
config ADAPTER_ESP07S_DRIVER_EXTUART
bool "Using extra uart to support wifi"
default n
@@ -45,8 +45,8 @@ if ADD_NUTTX_FETURES
endif
endif
if ADD_RTTHREAD_FETURES
if ADD_RTTHREAD_FETURES
if ADD_RTTHREAD_FEATURES
if ADD_RTTHREAD_FEATURES
config ADAPTER_ESP07S_DRIVER_EXTUART
bool "Using extra uart to support wifi"
default n

4
APP_Framework/Framework/connection/wifi/esp8285_wifi/Kconfig
View File

@@ -2,13 +2,13 @@ config ADAPTER_WIFI_ESP8285
string "ESP8285 WIFI adapter name"
default "esp8285_wifi"
if ADD_NUTTX_FETURES
if ADD_NUTTX_FEATURES
config ADAPTER_ESP8285_DRIVER
string "ESP8285 device uart driver path"
default "/dev/ttyS1"
endif
if ADD_XIZI_FETURES
if ADD_XIZI_FEATURES
config ADAPTER_ESP8285_DRIVER
string "ESP8285 device uart driver path"
default "/dev/uart1_dev1"

6
APP_Framework/Framework/connection/wifi/hfa21_wifi/Kconfig
View File

@@ -2,7 +2,7 @@ config ADAPTER_WIFI_HFA21
string "HFA21 WIFI adapter name"
default "hfa21_wifi"
if ADD_XIZI_FETURES
if ADD_XIZI_FEATURES
config ADAPTER_HFA21_DRIVER_EXTUART
bool "Using extra uart to support wifi"
@@ -24,11 +24,11 @@ if ADD_XIZI_FETURES
endif
endif
if ADD_NUTTX_FETURES
if ADD_NUTTX_FEATURES
endif
if ADD_RTTHREAD_FETURES
if ADD_RTTHREAD_FEATURES
config ADAPTER_HFA21_DRIVER
string "HFA21 device uart driver path"
default "/dev/uart3"

6
APP_Framework/Framework/connection/zigbee/e18/Kconfig
View File

@@ -17,7 +17,7 @@ choice
endchoice
if ADD_XIZI_FETURES
if ADD_XIZI_FEATURES
config ADAPTER_E18_MODEPIN
int "E18 MODE pin number"
default "61"
@@ -46,7 +46,7 @@ if ADD_XIZI_FETURES
endif
endif
if ADD_NUTTX_FETURES
if ADD_NUTTX_FEATURES
if ARCH_BOARD_XIDATONG_ARM32
config ADAPTER_E18_MODEPIN
int "E18 MODE pin number"
@@ -84,6 +84,6 @@ endif
endif
if ADD_RTTHREAD_FETURES
if ADD_RTTHREAD_FEATURES
endif

10
APP_Framework/Framework/connection/zigbee/e18/e18.c
View File

@@ -43,7 +43,7 @@ char *cmd_set_ch = "AT+CH=11"; /*set channel as 11*/
static int E18HardwareModeGet()
{
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
#ifdef CONFIG_ARCH_BOARD_XIDATONG_ARM32
int ret = 0;
int pin_fd;
@@ -96,7 +96,7 @@ static int E18HardwareModeGet()
static int E18HardwareModeSet(void)
{
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
#ifdef CONFIG_ARCH_BOARD_XIDATONG_ARM32
int ret = 0;
int pin_fd;
@@ -227,7 +227,7 @@ static int E18NetworkModeConfig(struct Adapter *adapter)
}
out:
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
if(E18_AS_HEX_MODE == mode)
#else
if(E18_AS_AT_MODE == mode)
@@ -302,7 +302,7 @@ static int E18NetRoleConfig(struct Adapter *adapter)
}
out:
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
if(E18_AS_HEX_MODE == mode)
#else
if(E18_AS_AT_MODE == mode)
@@ -449,7 +449,7 @@ static int E18Join(struct Adapter *adapter, unsigned char *priv_net_group)
// }
if(!ret){
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
if(E18_AS_HEX_MODE == mode)
#else
if(E18_AS_AT_MODE == mode)