feat modify XiUOS_Kernel dir from Ubiquitous/XiUOS to Ubiquitous/XiZi

This commit is contained in:
Liu_Weichao 2022-03-01 14:15:01 +08:00
parent f45477ab2a
commit 5078ff66cc
2178 changed files with 431 additions and 434 deletions

View File

@ -7,7 +7,7 @@ ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
endif
ifeq ($(CONFIG_ADD_XIUOS_FETURES),y)
ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
SRC_DIR := general_functions app_test
SRC_FILES := main.c framework_init.c

View File

@ -12,7 +12,7 @@ menu "test app"
bool "Config test adc"
default n
if USER_TEST_ADC
if ADD_XIUOS_FETURES
if ADD_XIZI_FETURES
config ADC_DEV_DRIVER
string "Set ADC dev path"
default "/dev/adc1_dev"
@ -23,7 +23,7 @@ menu "test app"
bool "Config test dac"
default n
if USER_TEST_DAC
if ADD_XIUOS_FETURES
if ADD_XIZI_FETURES
config DAC_DEV_DRIVER
string "Set DAC dev path"
default "/dev/dac_dev"

View File

@ -42,7 +42,7 @@ Modification:
1. support spi flash open, read and write function
*************************************************/
#include <xiuos.h>
#include <xizi.h>
#include <device.h>
#include <flash_spi.h>
#include <user_api.h>

View File

@ -18,7 +18,7 @@
* @date 2021-05-29
*/
#include <transform.h>
#include <xiuos.h>
#include <xizi.h>
#include "board.h"
#include "sys_arch.h"
#include <lwip/sockets.h>

View File

@ -18,7 +18,7 @@
* @date 2021-05-29
*/
#include <transform.h>
#include <xiuos.h>
#include <xizi.h>
#include "board.h"
#include "sys_arch.h"
#include "lwip/udp.h"

View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
#include <xiuos.h>
#include <xizi.h>
#include <stdio.h>
#include <cstdlib>
using namespace std;

View File

@ -5,7 +5,7 @@ ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
include $(APPDIR)/Application.mk
endif
ifeq ($(CONFIG_ADD_XIUOS_FETURES),y)
ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
SRC_FILES := double_list.c single_list.c
include $(KERNEL_ROOT)/compiler.mk
endif

View File

@ -51,7 +51,7 @@ ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
endif
ifeq ($(CONFIG_ADD_XIUOS_FETURES),y)
ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
SRC_FILES :=
ifeq ($(CONFIG_APPLICATION_SENSOR_HCHO_TB600B_WQ_HCHO1OS), y)

View File

@ -18,7 +18,7 @@
* @date 2021.12.10
*/
#ifdef ADD_XIUOS_FETURES
#ifdef ADD_XIZI_FETURES
# include <user_api.h>
#endif
#include <sensor.h>

View File

@ -18,7 +18,7 @@
* @date 2021.04.23
*/
#ifdef ADD_XIUOS_FETURES
#ifdef ADD_XIZI_FETURES
# include <user_api.h>
#endif
#include <sensor.h>

View File

@ -18,7 +18,7 @@
* @date 2021.12.15
*/
#ifdef ADD_XIUOS_FETURES
#ifdef ADD_XIZI_FETURES
# include <user_api.h>
#endif
#include <sensor.h>

View File

@ -18,7 +18,7 @@
* @date 2021.04.23
*/
#ifdef ADD_XIUOS_FETURES
#ifdef ADD_XIZI_FETURES
# include <user_api.h>
#endif

View File

@ -18,7 +18,7 @@
* @date 2021.12.14
*/
#ifdef ADD_XIUOS_FETURES
#ifdef ADD_XIZI_FETURES
# include <user_api.h>
#endif
#include <sensor.h>

View File

@ -18,7 +18,7 @@
* @date 2021.04.23
*/
#ifdef ADD_XIUOS_FETURES
#ifdef ADD_XIZI_FETURES
# include <user_api.h>
#endif

View File

@ -18,7 +18,7 @@
* @date 2021.04.23
*/
#ifdef ADD_XIUOS_FETURES
#ifdef ADD_XIZI_FETURES
# include <user_api.h>
#endif

View File

@ -18,7 +18,7 @@
* @date 2021.04.23
*/
#ifdef ADD_XIUOS_FETURES
#ifdef ADD_XIZI_FETURES
# include <user_api.h>
#endif

View File

@ -18,7 +18,7 @@
* @date 2021.04.23
*/
#ifdef ADD_XIUOS_FETURES
#ifdef ADD_XIZI_FETURES
# include <user_api.h>
#endif

View File

@ -18,7 +18,7 @@
* @date 2021.12.15
*/
#ifdef ADD_XIUOS_FETURES
#ifdef ADD_XIZI_FETURES
# include <user_api.h>
#endif
#include <sensor.h>

View File

@ -5,10 +5,10 @@ menu "Framework"
default y
choice
prompt "select os features"
default ADD_XIUOS_FETURES
default ADD_XIZI_FETURES
config ADD_XIUOS_FETURES
bool "add xiuos fetures"
config ADD_XIZI_FETURES
bool "add xizi fetures"
config ADD_NUTTX_FETURES
bool "add nuttx fetures"

View File

@ -2,7 +2,7 @@ config ADAPTER_4G_EC200T
string "EC200T adapter name"
default "ec200t"
if ADD_XIUOS_FETURES
if ADD_XIZI_FETURES
config ADAPTER_EC200T_PWRKEY
int "EC200T PWRKEY pin number"
default "97"

View File

@ -2,7 +2,7 @@ config ADAPTER_BLUETOOTH_HC08
string "HC08 adapter name"
default "hc08"
if ADD_XIUOS_FETURES
if ADD_XIZI_FETURES
config ADAPTER_HC08_RECV_BUFFER_SIZE
int "HC08 recv data buffer size"
default "128"

View File

@ -2,7 +2,7 @@ config ADAPTER_ETHERNET_HFA21
string "HFA21 ETHERNET adapter name"
default "hfa21_ethernet"
if ADD_XIUOS_FETURES
if ADD_XIZI_FETURES
config ADAPTER_HFA21_DRIVER_EXTUART
bool "Using extra uart to support ethernet"

View File

@ -2,7 +2,7 @@ config ADAPTER_LORA_SX1278
string "SX1278 adapter name"
default "sx1278"
if ADD_XIUOS_FETURES
if ADD_XIZI_FETURES
config ADAPTER_SX1278_DRIVER
string "SX1278 device spi driver path"
default "/dev/spi2_lora"

View File

@ -2,7 +2,7 @@ config ADAPTER_NBIOT_BC28
string "BC28 adapter name"
default "bc28"
if ADD_XIUOS_FETURES
if ADD_XIZI_FETURES
config ADAPTER_BC28_RESETPIN
int "BC28 RESET pin number"
default "100"

View File

@ -2,7 +2,7 @@ config ADAPTER_WIFI_HFA21
string "HFA21 WIFI adapter name"
default "hfa21_wifi"
if ADD_XIUOS_FETURES
if ADD_XIZI_FETURES
config ADAPTER_HFA21_DRIVER_EXTUART
bool "Using extra uart to support wifi"

View File

@ -17,7 +17,7 @@ choice
endchoice
if ADD_XIUOS_FETURES
if ADD_XIZI_FETURES
config ADAPTER_E18_DRIVER_EXTUART
bool "Using extra uart to support zigbee"

View File

@ -6,7 +6,7 @@ ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
endif
ifeq ($(CONFIG_ADD_XIUOS_FETURES),y)
ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
SRC_FILES := sensor.c
ifeq ($(CONFIG_SENSOR_HCHO),y)

View File

@ -12,7 +12,7 @@ config SENSOR_AS830
string "as830 quantity name"
default "ch4_1"
if ADD_XIUOS_FETURES
if ADD_XIZI_FETURES
config SENSOR_AS830_DRIVER_EXTUART
bool "Using extra uart to support as830"
default y

View File

@ -5,7 +5,7 @@ ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
include $(APPDIR)/Application.mk
endif
ifeq ($(CONFIG_ADD_XIUOS_FETURES),y)
ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
SRC_FILES := as830.c
include $(KERNEL_ROOT)/compiler.mk
endif

View File

@ -12,7 +12,7 @@ config SENSOR_ZG09
string "zg09 quantity name"
default "co2_1"
if ADD_XIUOS_FETURES
if ADD_XIZI_FETURES
config SENSOR_ZG09_DRIVER_EXTUART
bool "Using extra uart to support zg09"
default y

View File

@ -6,7 +6,7 @@ ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
include $(APPDIR)/Application.mk
endif
ifeq ($(CONFIG_ADD_XIUOS_FETURES),y)
ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
SRC_FILES := zg09.c
include $(KERNEL_ROOT)/compiler.mk
endif

View File

@ -12,7 +12,7 @@ config SENSOR_TB600B_WQ_HCHO1OS
string "tb600b wq_hcho1os quantity name"
default "hcho_1"
if ADD_XIUOS_FETURES
if ADD_XIZI_FETURES
config SENSOR_TB600B_WQ_HCHO1OS_DRIVER_EXTUART
bool "Using extra uart to support tb600b wq_hcho1os"
default y

View File

@ -6,7 +6,7 @@ ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
include $(APPDIR)/Application.mk
endif
ifeq ($(CONFIG_ADD_XIUOS_FETURES),y)
ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
SRC_FILES := tb600b_wq_hcho1os.c
include $(KERNEL_ROOT)/compiler.mk
endif

View File

@ -12,7 +12,7 @@ config SENSOR_HS300X_HUMIDITY
string "HS300x quantity name"
default "humidity_1"
if ADD_XIUOS_FETURES
if ADD_XIZI_FETURES
config SENSOR_DEVICE_HS300X_DEV
string "HS300x device name"
default "/dev/i2c1_dev0"

View File

@ -6,7 +6,7 @@ ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
endif
ifeq ($(CONFIG_ADD_XIUOS_FETURES),y)
ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
SRC_FILES := hs300x_humi.c
include $(KERNEL_ROOT)/compiler.mk

View File

@ -12,7 +12,7 @@ config SENSOR_TB600B_IAQ10
string "tb600b iaq10 quantity name"
default "iaq_1"
if ADD_XIUOS_FETURES
if ADD_XIZI_FETURES
config SENSOR_TB600B_IAQ10_DRIVER_EXTUART
bool "Using extra uart to support tb600b iaq10"
default y

View File

@ -6,7 +6,7 @@ ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
endif
ifeq ($(CONFIG_ADD_XIUOS_FETURES),y)
ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
SRC_FILES := tb600b_iaq10.c
include $(KERNEL_ROOT)/compiler.mk
endif

View File

@ -38,7 +38,7 @@ config SENSOR_PS5308
default "pm10_1"
endif
if ADD_XIUOS_FETURES
if ADD_XIZI_FETURES
config SENSOR_PS5308_DRIVER_EXTUART
bool "Using extra uart to support PS5308"
default y

View File

@ -5,7 +5,7 @@ ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
include $(APPDIR)/Application.mk
endif
ifeq ($(CONFIG_ADD_XIUOS_FETURES),y)
ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
SRC_FILES := ps5308.c
include $(KERNEL_ROOT)/compiler.mk
endif

View File

@ -12,7 +12,7 @@ config SENSOR_HS300X_TEMPERATURE
string "HS300x quantity name"
default "temperature_1"
if ADD_XIUOS_FETURES
if ADD_XIZI_FETURES
config SENSOR_DEVICE_HS300X_DEV
string "HS300x device name"
default "/dev/i2c1_dev0"

View File

@ -6,7 +6,7 @@ ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
endif
ifeq ($(CONFIG_ADD_XIUOS_FETURES),y)
ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
SRC_FILES := hs300x_temp.c
include $(KERNEL_ROOT)/compiler.mk
endif

View File

@ -12,7 +12,7 @@ config SENSOR_TB600B_TVOC10
string "tb600b tvoc10 quantity name"
default "tvoc_1"
if ADD_XIUOS_FETURES
if ADD_XIZI_FETURES
config SENSOR_TB600B_TVOC10_DRIVER_EXTUART
bool "Using extra uart to support tb600b tvoc10"
default y

View File

@ -6,7 +6,7 @@ ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
include $(APPDIR)/Application.mk
endif
ifeq ($(CONFIG_ADD_XIUOS_FETURES),y)
ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
SRC_FILES := tb600b_tvoc10.c
include $(KERNEL_ROOT)/compiler.mk
endif

View File

@ -12,7 +12,7 @@ config SENSOR_D124
string "D124 quantity voice name"
default "voice_1"
if ADD_XIUOS_FETURES
if ADD_XIZI_FETURES
config SENSOR_D124_DRIVER_EXTUART
bool "Using extra uart to support D124"
default y

View File

@ -6,7 +6,7 @@ ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
include $(APPDIR)/Application.mk
endif
ifeq ($(CONFIG_ADD_XIUOS_FETURES),y)
ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
SRC_FILES := d124.c
include $(KERNEL_ROOT)/compiler.mk
endif

View File

@ -1,7 +1,7 @@
SRC_DIR :=
ifeq ($(CONFIG_ADD_XIUOS_FETURES),y)
SRC_DIR += xiuos
ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
SRC_DIR += xizi
endif
include $(KERNEL_ROOT)/compiler.mk

View File

@ -30,7 +30,7 @@
#ifdef SEPARATE_COMPILE
#include "../../../../../../Ubiquitous/XiUOS/arch/kswitch.h"
#include "../../../../../../Ubiquitous/XiZi/arch/kswitch.h"
#define TASK_INFO 1
#define MEM_INFO 2
@ -164,7 +164,7 @@ int Userprintf(const char *fmt, ...);
#else
#include <xiuos.h>
#include <xizi.h>
#ifdef FS_VFS
#include <iot-vfs_posix.h>

View File

@ -4,7 +4,7 @@ ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
include $(APPDIR)/Application.mk
endif
ifeq ($(CONFIG_ADD_XIUOS_FETURES),y)
ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
SRC_DIR := Applications Framework lib
include $(KERNEL_ROOT)/compiler.mk
endif

View File

@ -493,7 +493,7 @@ CONFIG_APPLICATION_SENSOR=y
# Framework
#
CONFIG_TRANSFORM_LAYER_ATTRIUBUTE=y
CONFIG_ADD_XIUOS_FETURES=y
CONFIG_ADD_XIZI_FETURES=y
# CONFIG_ADD_NUTTX_FETURES is not set
# CONFIG_ADD_RTTHREAD_FETURES is not set
# CONFIG_SUPPORT_SENSOR_FRAMEWORK is not set

View File

@ -331,7 +331,7 @@
/* Framework */
#define TRANSFORM_LAYER_ATTRIUBUTE
#define ADD_XIUOS_FETURES
#define ADD_XIZI_FETURES
#define SUPPORT_KNOWING_FRAMEWORK
#define USING_KPU_PROCESSING
#define USING_YOLOV2

View File

@ -505,7 +505,7 @@ CONFIG_APPLICATION_SENSOR_VOICE_D124=y
# Framework
#
CONFIG_TRANSFORM_LAYER_ATTRIUBUTE=y
CONFIG_ADD_XIUOS_FETURES=y
CONFIG_ADD_XIZI_FETURES=y
# CONFIG_ADD_NUTTX_FETURES is not set
# CONFIG_ADD_RTTHREAD_FETURES is not set
CONFIG_SUPPORT_SENSOR_FRAMEWORK=y

View File

@ -323,7 +323,7 @@
/* Framework */
#define TRANSFORM_LAYER_ATTRIUBUTE
#define ADD_XIUOS_FETURES
#define ADD_XIZI_FETURES
#define SUPPORT_SENSOR_FRAMEWORK
#define SENSOR_VOICE
#define SENSOR_D124

View File

@ -74,7 +74,7 @@ COMPILE_ALL:
$(MAKE) -C $$dir; \
done
@cp link.mk build/Makefile
@$(MAKE) -C build TARGET=XiUOS_$(BOARD).elf LINK_FLAGS=LFLAGS
@$(MAKE) -C build TARGET=XiZi_$(BOARD).elf LINK_FLAGS=LFLAGS
@rm build/Makefile build/make.obj

View File

@ -1,6 +1,6 @@
# XiUOS README
[矽璓XiUOS](http://xuos.io/)是一款面向智慧车间的工业物联网操作系统,主要由一个极简的微型实时操作系统内核和其上的工业物联框架构成,通过高效管理工业物联网设备、支撑工业物联应用,在生产车间内实现智能化的“感知环境、联网传输、知悉识别、控制调整”,促进以工业设备和工业控制系统为核心的人、机、物深度互联,帮助提升生产线的数字化和智能化水平。
[矽璓XiUOS](http://xuos.io/)是一款面向智慧车间的工业物联网操作系统,主要由一个极简的微型实时操作系统内核XiZi和其上的工业物联框架构成,通过高效管理工业物联网设备、支撑工业物联应用,在生产车间内实现智能化的“感知环境、联网传输、知悉识别、控制调整”,促进以工业设备和工业控制系统为核心的人、机、物深度互联,帮助提升生产线的数字化和智能化水平。
## 目录结构

View File

@ -53,7 +53,7 @@ History:
1. Date: 2021-05-13
Author: AIIT XUOS Lab
Modification:
1. take startup_gcc.c from revision 10636 of the Stellaris Firmware Development Package for XiUOS
1. take startup_gcc.c from revision 10636 of the Stellaris Firmware Development Package for XiZi kernel
*************************************************/
extern unsigned _sdata[], _edata[],

View File

@ -53,7 +53,7 @@ History:
1. Date: 2021-05-13
Author: AIIT XUOS Lab
Modification:
1. take startup_gcc.c from revision 10636 of the Stellaris Firmware Development Package for XiUOS
1. take startup_gcc.c from revision 10636 of the Stellaris Firmware Development Package for XiZi kernel
*************************************************/

View File

@ -42,7 +42,7 @@ History:
1. Date: 2021-11-30
Author: AIIT XUOS Lab
Modification:
1. take startup_stm32f103xb.s for XiUOS
1. take startup_stm32f103xb.s for XiZi kernel
*************************************************/
.syntax unified

View File

@ -53,7 +53,7 @@ History:
1. Date: 2021-05-13
Author: AIIT XUOS Lab
Modification:
1. take startup_gcc.c from revision 10636 of the Stellaris Firmware Development Package for XiUOS
1. take startup_gcc.c from revision 10636 of the Stellaris Firmware Development Package for XiZi kernel
*************************************************/
extern unsigned long _sidata;

Some files were not shown because too many files have changed in this diff Show More