Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into control_framework

APP_Framework/Applications/app_test/Kconfig

@@ -111,6 +111,9 @@ menu "test app"
                 default n
                 if USER_TEST_HWTIMER
                     if ADD_XIZI_FETURES
+                        config HWTIMER_TIMER_DEV_DRIVER
+                            string "Set pin dev path"
+                            default "/dev/timer0_dev0"
                         config HWTIMER_PIN_DEV_DRIVER
                             string "Set pin dev path"
                             default "/dev/pin_dev"
@@ -168,6 +171,18 @@ menu "test app"
                     endif
                 endif
 
+            menuconfig USER_TEST_CAN
+                select BSP_USING_CAN
+                bool "Config test can"
+                default n
+                if USER_TEST_CAN
+                    if ADD_XIZI_FETURES
+                        config CAN_DEV_DRIVER
+                            string "Set can dev path"
+                            default "/dev/can2_dev1"
+                    endif
+                endif
+
             menuconfig USER_TEST_CAMERA
                 select BSP_USING_CAMERA
                 select BSP_USING_LCD
@@ -209,6 +224,17 @@ menu "test app"
                         endchoice
                     endif
                 endif
+            
+            menuconfig USER_TEST_FLASH
+                bool "Config test w25q128 device"
+                default n
+                if USER_TEST_FLASH
+                    if ADD_XIZI_FETURES
+                        config FLASH_DEV_DRIVER
+                            string "Set flash dev path"
+                            default "/dev/qspi_W25Q128"
+                    endif
+                endif
                 
         endif
 endmenu

APP_Framework/Applications/app_test/Makefile

@@ -87,7 +87,15 @@ ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
 
     ifeq ($(CONFIG_USER_TEST_ETHERNET),y)
         SRC_FILES += test_ethernet.c
-    endif  
+    endif
+
+    ifeq ($(CONFIG_USER_TEST_FLASH),y)
+        SRC_FILES += test_flash.c
+    endif
+
+    ifeq ($(CONFIG_USER_TEST_CAN),y)
+        SRC_FILES += test_can.c
+    endif    
 
     include $(KERNEL_ROOT)/compiler.mk
 endif

APP_Framework/Applications/app_test/test_can.c

@@ -0,0 +1,66 @@
+#include <stdio.h>
+#include <string.h>
+#include <transform.h>
+
+
+void TestCAN(void)
+{
+    // config CAN pin(SCL:34.SDA:35) in menuconfig
+    int can_fd = PrivOpen(CAN_DEV_DRIVER, O_RDWR);
+    if (can_fd < 0)
+    {
+        printf("open can_fd fd error:%d\n", can_fd);
+        return;
+    }
+    printf("CAN open successful!\n");
+
+    struct PrivIoctlCfg ioctl_cfg;
+    ioctl_cfg.ioctl_driver_type = CAN_TYPE;
+
+    struct CanDriverConfigure can_config;
+    can_config.brp  = 8U;
+    can_config.tbs1 = 1U + 8U;
+    can_config.tbs2 = 4U;
+    can_config.tsjw = 4U;
+    can_config.mode = 0U;
+
+    ioctl_cfg.args = (void *)&can_config;
+
+    if (0 != PrivIoctl(can_fd, OPE_INT, &ioctl_cfg))
+    {
+        printf("init can fd error %d\n", can_fd);
+        PrivClose(can_fd);
+        return;
+    }
+    printf("CAN configure successful!\n");
+
+    uint8_t data_buff[64u] = {1,2,3,4,4,3,2,1};
+    struct CanSendConfigure frame_send;
+    frame_send.ide=0;
+    frame_send.stdid = 0x55;
+    frame_send.rtr=0;
+    frame_send.data_lenth=8;
+    frame_send.data = data_buff;
+
+    struct CanSendConfigure frame_recv;
+    uint8_t recv_buff[65U] = {0};
+    frame_recv.data = recv_buff;
+
+    // CAN write
+    while (1)
+    {
+        PrivTaskDelay(500);
+        PrivWrite(can_fd, &frame_send, NONE);
+        PrivTaskDelay(500);
+        PrivRead(can_fd, &frame_recv, NONE);
+        // if any data has received,Then printf message
+        if(frame_recv.data_lenth > 0){
+            printf("ID %08x:%s\n",frame_recv.exdid,frame_recv.data);
+        }
+    }
+
+    PrivClose(can_fd);
+    return;
+}
+
+PRIV_SHELL_CMD_FUNCTION(TestCAN, a can test sample, PRIV_SHELL_CMD_MAIN_ATTR);

APP_Framework/Applications/app_test/test_flash.c

@@ -0,0 +1,35 @@
+#include <stdio.h>
+#include <string.h>
+#include <transform.h>
+
+void TestFlash(void)
+{
+    int fd = open(FLASH_DEV_DRIVER,O_RDWR);
+    if(fd<0){
+        printf("fs fd open error:%d\n",fd);
+        return;
+    }
+    struct BusBlockWriteParam flash_writer;
+    uint8_t read_buff[8] = {1,2,3,4,5,6,7,8};
+    flash_writer.pos = 0x000000L;
+    flash_writer.size = 8;
+    flash_writer.buffer = read_buff;
+    struct BusBlockReadParam flash_reader;
+    flash_reader.pos = 0x000000L;
+    flash_reader.size = 8;
+    flash_reader.buffer = read_buff;    
+
+    PrivRead(fd,&flash_reader,NONE);
+    printf("Read data is:");
+    for(int i=0;i<flash_writer.size;i++){
+        printf("%02x ",read_buff[i]);
+        read_buff[i]++;
+    }
+    printf("\n");
+
+    PrivWrite(fd,&flash_writer,NONE);
+
+    return;
+}
+
+PRIV_SHELL_CMD_FUNCTION(TestFlash, a flash test sample, PRIV_SHELL_CMD_MAIN_ATTR);

APP_Framework/Applications/app_test/test_hwtimer.c

@@ -2,25 +2,22 @@
 #include <string.h>
 #include <transform.h>
 
-#define BSP_LED_PIN 29
+#define BSP_LED_PIN 134
 #define NULL_PARAMETER 0
 
-static uint16_t pinval=0;
 static uint16_t pin_fd=0;
+static struct PinStat pin_led;
 
 void ledflip(void *parameter)
 {
-    struct PinStat pin_led;
     pin_led.pin = BSP_LED_PIN;
-    pin_led.val = !pinval;
-    pinval = !pinval;
+    pin_led.val = !pin_led.val;
     PrivWrite(pin_fd,&pin_led,NULL_PARAMETER);
-    // printf("Timer has callback once:%d\n",pinval);
 }
 
 void TestHwTimer(void)
 {
-    x_ticks_t period = 100;//uint:10ms
+    x_ticks_t period = 100000;
     
     pin_fd = PrivOpen(HWTIMER_PIN_DEV_DRIVER, O_RDWR);
     if(pin_fd<0){
@@ -28,6 +25,12 @@ void TestHwTimer(void)
         return;
     }
 
+    int timer_fd = PrivOpen(HWTIMER_TIMER_DEV_DRIVER, O_RDWR);
+    if(timer_fd<0){
+        printf("open timer fd error:%d\n",timer_fd);
+        return;
+    }
+
     //config led pin in board
      struct PinParam parameter;
      parameter.cmd = GPIO_CONFIG_MODE;
@@ -44,10 +47,30 @@ void TestHwTimer(void)
         return;
     }
 
-    int32 timer_handle = KCreateTimer("LED on and off by 1s",&ledflip,&pin_fd,period,TIMER_TRIGGER_PERIODIC);
-    
-    KTimerStartRun(timer_handle);
+    ioctl_cfg.ioctl_driver_type = TIME_TYPE;
+    ioctl_cfg.args = (void *)&ledflip;
+    if (0 != PrivIoctl(timer_fd, OPE_INT, &ioctl_cfg)) {
+        printf("timer pin fd error %d\n", pin_fd);
+        PrivClose(pin_fd);
+        return;
+    }    
+
+    ioctl_cfg.args = (void *)&period;
+    if (0 != PrivIoctl(timer_fd, OPE_CFG, &ioctl_cfg)) {
+        printf("timer pin fd error %d\n", pin_fd);
+        PrivClose(pin_fd);
+        return;
+    }    
+
+    while(1){
+        
+    }
+
+    // int32 timer_handle = KCreateTimer("LED on and off by 1s",&ledflip,&pin_fd,period,TIMER_TRIGGER_PERIODIC);
     
+    // KTimerStartRun(timer_handle);
+    PrivClose(pin_fd);
+    PrivClose(timer_fd);
 }
 
 PRIV_SHELL_CMD_FUNCTION(TestHwTimer, a timer test sample, PRIV_SHELL_CMD_MAIN_ATTR);

APP_Framework/Applications/app_test/test_rtc.c

@@ -11,16 +11,19 @@ void TestRTC(int argc,char *argv[])
     }
     
     if(argc>1){
-        
         int times = atoi(argv[1]);
         printf("Time will be printf %d times\n",times);
+
         struct RtcDrvConfigureParam rtc_para;
+        time_t my_time=0;
+
         rtc_para.rtc_operation_cmd = OPER_RTC_SET_TIME;
-        *(rtc_para.time) = 0;
+        rtc_para.time = &my_time;
 
         struct PrivIoctlCfg ioctl_cfg;
         ioctl_cfg.ioctl_driver_type = RTC_TYPE;
         ioctl_cfg.args =  (void *)&rtc_para;
+
         PrivIoctl(rtc_fd,0,&ioctl_cfg);
 
         rtc_para.rtc_operation_cmd = OPER_RTC_GET_TIME;

APP_Framework/Applications/app_test/test_touch.c

@@ -105,6 +105,7 @@ void TestTouch(void)
         graph_param.pixel_info.y_endpos = touch_pixel.y+10;
         PrivWrite(lcd_fd, &graph_param, NULL_PARAMETER);
     }
+    PrivClose(lcd_fd);
     PrivClose(touch_fd);
 }
 

APP_Framework/Applications/knowing_app/Makefile

@@ -1,3 +1,15 @@
-SRC_DIR := mnist 
+SRC_DIR :=
+
+ifeq ($(CONFIG_APP_MNIST),y)
+SRC_DIR += mnist
+endif
+
+ifeq ($(CONFIG_USING_NNOM_DEMOAPP),y)
+SRC_DIR += nnom_demo
+endif
+
+ifeq ($(CONFIG_USING_CMSIS_5_DEMOAPP),y)
+SRC_DIR += cmsis_5_demo
+endif
 
 include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Applications/knowing_app/cmsis_5_demo/Makefile

@@ -0,0 +1,11 @@
+SRC_DIR :=
+
+ifeq ($(CONFIG_USING_CMSIS_5_NN_DEMOAPP),y)
+SRC_DIR += cmsisnn-cifar10
+endif
+
+ifeq ($(CONFIG_USING_CMSIS_5_NN_DEMOAPP_VEG_CLASSIFY),y)
+SRC_DIR += cmsisnn_vegetable_classify
+endif
+
+include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Applications/knowing_app/cmsis_5_demo/cmsisnn-cifar10/Makefile

@@ -0,0 +1,3 @@
+SRC_FILES := demo/cmsisnn_demo.c demo/tjpgd.c model/m4/nn.c
+
+include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Applications/knowing_app/cmsis_5_demo/cmsisnn_vegetable_classify/Makefile

@@ -0,0 +1,3 @@
+SRC_FILES := cmsisnn_vegetable_classify.c
+
+include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Applications/knowing_app/mnist/Makefile

@@ -1,7 +1,9 @@
+SRC_FILES := 
+ifeq ($(CONFIG_APP_MNIST),y)
 SRC_FILES := \
 		main.cpp \
 		mnistmain.c
 	CPPPATHS += -I.
-
+endif
 
 include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Applications/knowing_app/nnom_demo/Makefile

@@ -0,0 +1,5 @@
+ifeq ($(CONFIG_USING_NNOM_DEMOAPP),y)
+SRC_DIR := mnist_nnom
+endif
+
+include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Applications/knowing_app/nnom_demo/mnist_nnom/Makefile

@@ -0,0 +1,3 @@
+SRC_FILES := main.c
+
+include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Applications/knowing_app/nnom_demo/mnist_nnom/main.c

@@ -71,7 +71,9 @@ void mnist_nnom(int argc, char **argv)
 	printf("Predicted label: %d\n", predic_label);
 	printf("Probability: %d%%\n", (int)(prob * 100));
 }
-
+#ifdef ADD_XIZI_FETURES
+PRIV_SHELL_CMD_FUNCTION(mnist_nnom, a mnist_nnom test sample, PRIV_SHELL_CMD_MAIN_ATTR);
+#endif
 #ifdef __RT_THREAD_H__
 MSH_CMD_EXPORT(mnist_nnom, nnom mnist demo and image number should be followed);
 #endif