diff --git a/APP_Framework/Applications/app_test/test_adc.c b/APP_Framework/Applications/app_test/test_adc.c index 5bece90df..c8cb94bfc 100644 --- a/APP_Framework/Applications/app_test/test_adc.c +++ b/APP_Framework/Applications/app_test/test_adc.c @@ -18,10 +18,10 @@ * @date: 2022/1/7 */ -#ifdef ADD_XIZI_FETURES #include #include #include +#ifdef ADD_XIZI_FETURES void TestAdc(void) { diff --git a/APP_Framework/Applications/app_test/test_camera.c b/APP_Framework/Applications/app_test/test_camera.c index 12a023774..5f9c03e65 100644 --- a/APP_Framework/Applications/app_test/test_camera.c +++ b/APP_Framework/Applications/app_test/test_camera.c @@ -18,11 +18,10 @@ * @date: 2022/12/7 */ -#ifdef ADD_XIZI_FETURES - #include #include #include +#ifdef ADD_XIZI_FETURES static uint16_t image_buff[384000]; diff --git a/APP_Framework/Applications/app_test/test_can.c b/APP_Framework/Applications/app_test/test_can.c index c406cf83e..046503642 100644 --- a/APP_Framework/Applications/app_test/test_can.c +++ b/APP_Framework/Applications/app_test/test_can.c @@ -17,10 +17,10 @@ * @author: AIIT XUOS Lab * @date: 2023/2/17 */ -#ifdef ADD_XIZI_FETURES #include #include #include +#ifdef ADD_XIZI_FETURES void TestCAN(void) diff --git a/APP_Framework/Applications/app_test/test_dac.c b/APP_Framework/Applications/app_test/test_dac.c index f0412f86d..4aa105eb1 100644 --- a/APP_Framework/Applications/app_test/test_dac.c +++ b/APP_Framework/Applications/app_test/test_dac.c @@ -17,10 +17,10 @@ * @author: AIIT XUOS Lab * @date: 2022/1/11 */ -#ifdef ADD_XIZI_FETURES #include #include #include +#ifdef ADD_XIZI_FETURES void TestDac(void) { diff --git a/APP_Framework/Applications/app_test/test_ethernet.c b/APP_Framework/Applications/app_test/test_ethernet.c index fbe3d6586..a94a8c15c 100644 --- a/APP_Framework/Applications/app_test/test_ethernet.c +++ b/APP_Framework/Applications/app_test/test_ethernet.c @@ -17,10 +17,10 @@ * @author: AIIT XUOS Lab * @date: 2022/12/17 */ -#ifdef ADD_XIZI_FETURES #include #include #include +#ifdef ADD_XIZI_FETURES #include diff --git a/APP_Framework/Applications/app_test/test_flash.c b/APP_Framework/Applications/app_test/test_flash.c index f86f617b0..e2ea3be86 100644 --- a/APP_Framework/Applications/app_test/test_flash.c +++ b/APP_Framework/Applications/app_test/test_flash.c @@ -17,10 +17,10 @@ * @author: AIIT XUOS Lab * @date: 2022/12/17 */ -#ifdef ADD_XIZI_FETURES #include #include #include +#ifdef ADD_XIZI_FETURES void TestFlash(void) { diff --git a/APP_Framework/Applications/app_test/test_fs.c b/APP_Framework/Applications/app_test/test_fs.c index dbb984467..280d599c8 100644 --- a/APP_Framework/Applications/app_test/test_fs.c +++ b/APP_Framework/Applications/app_test/test_fs.c @@ -17,10 +17,10 @@ * @author: AIIT XUOS Lab * @date: 2022/11/17 */ -#ifdef ADD_XIZI_FETURES #include #include #include +#ifdef ADD_XIZI_FETURES #define MAX_READ_LENGTH 1000 diff --git a/APP_Framework/Applications/app_test/test_gpio.c b/APP_Framework/Applications/app_test/test_gpio.c index 9e92ed3e5..ea2262416 100644 --- a/APP_Framework/Applications/app_test/test_gpio.c +++ b/APP_Framework/Applications/app_test/test_gpio.c @@ -17,19 +17,24 @@ * @author: AIIT XUOS Lab * @date: 2022/12/17 */ -#ifdef ADD_XIZI_FETURES #include #include #include +#ifdef ADD_XIZI_FETURES +#ifdef BOARD_EDU_RISCV64_EVB #define BSP_LED_PIN 29 #define BSP_KEY_PIN 31 +#elif defined BOARD_HC32F4A0_EVB +#define BSP_LED_PIN 134 +#define BSP_KEY_PIN 176 +#endif #define NULL_PARAMETER 0 void TestGpio(void) { int pin_fd = PrivOpen(GPIO_DEV_DRIVER, O_RDWR); - if(pin_fd<0){ + if(pin_fd < 0) { printf("open pin fd error:%d\n",pin_fd); return; } @@ -51,8 +56,8 @@ void TestGpio(void) } //config key pin in board - parameter.pin = BSP_KEY_PIN; - parameter.mode = GPIO_CFG_INPUT; + parameter.pin = BSP_KEY_PIN; + parameter.mode = GPIO_CFG_INPUT; if (0 != PrivIoctl(pin_fd, OPE_CFG, &ioctl_cfg)) { printf("ioctl pin fd error %d\n", pin_fd); @@ -68,7 +73,7 @@ void TestGpio(void) //recycle read pin and write pin until key break while(1){ - if(0>PrivRead(pin_fd,&pin_key,NULL_PARAMETER)){ + if(0 > PrivRead(pin_fd, &pin_key, NULL_PARAMETER)) { printf("read pin fd error %d\n", pin_fd); PrivClose(pin_fd); return; @@ -81,12 +86,11 @@ void TestGpio(void) pin_led.val = GPIO_LOW; } - if(0>PrivWrite(pin_fd,&pin_led,NULL_PARAMETER)){ - printf("write pin fd error %d\n", pin_fd); - PrivClose(pin_fd); - return; - } - + if(0 > PrivWrite(pin_fd, &pin_led, NULL_PARAMETER)) { + printf("write pin fd error %d\n", pin_fd); + PrivClose(pin_fd); + return; + } } } diff --git a/APP_Framework/Applications/app_test/test_hwtimer.c b/APP_Framework/Applications/app_test/test_hwtimer.c index d39cf814e..c44a63bc3 100644 --- a/APP_Framework/Applications/app_test/test_hwtimer.c +++ b/APP_Framework/Applications/app_test/test_hwtimer.c @@ -17,10 +17,10 @@ * @author: AIIT XUOS Lab * @date: 2022/12/17 */ -#ifdef ADD_XIZI_FETURES #include #include #include +#ifdef ADD_XIZI_FETURES #define BSP_LED_PIN 134 #define NULL_PARAMETER 0 diff --git a/APP_Framework/Applications/app_test/test_i2c.c b/APP_Framework/Applications/app_test/test_i2c.c index 09ee520aa..5428d9296 100644 --- a/APP_Framework/Applications/app_test/test_i2c.c +++ b/APP_Framework/Applications/app_test/test_i2c.c @@ -17,10 +17,10 @@ * @author: AIIT XUOS Lab * @date: 2022/12/17 */ -#ifdef ADD_XIZI_FETURES #include #include #include +#ifdef ADD_XIZI_FETURES #define I2C_SLAVE_ADDRESS 0x0012U diff --git a/APP_Framework/Applications/app_test/test_lcd_edu.c b/APP_Framework/Applications/app_test/test_lcd_edu.c index d118e7374..edb1ac96c 100644 --- a/APP_Framework/Applications/app_test/test_lcd_edu.c +++ b/APP_Framework/Applications/app_test/test_lcd_edu.c @@ -17,10 +17,10 @@ * @author: AIIT XUOS Lab * @date: 2022/12/17 */ -#ifdef ADD_XIZI_FETURES #include #include #include +#ifdef ADD_XIZI_FETURES #define GRAPHIC_CTRL_RECT_UPDATE 0x00 #define LCD_STRING_TYPE 0 diff --git a/APP_Framework/Applications/app_test/test_loraE220.c b/APP_Framework/Applications/app_test/test_loraE220.c index 33b1bdaba..45eddd69b 100644 --- a/APP_Framework/Applications/app_test/test_loraE220.c +++ b/APP_Framework/Applications/app_test/test_loraE220.c @@ -17,10 +17,10 @@ * @author: AIIT XUOS Lab * @date: 2022/12/17 */ -#ifdef ADD_XIZI_FETURES #include #include #include +#ifdef ADD_XIZI_FETURES #define NULL_PARAMETER 0 #define E220_CFG_LENGTH diff --git a/APP_Framework/Applications/app_test/test_rs485.c b/APP_Framework/Applications/app_test/test_rs485.c index 64c44a2a6..1c90a5190 100644 --- a/APP_Framework/Applications/app_test/test_rs485.c +++ b/APP_Framework/Applications/app_test/test_rs485.c @@ -17,10 +17,10 @@ * @author: AIIT XUOS Lab * @date: 2022/12/17 */ -#ifdef ADD_XIZI_FETURES #include #include #include +#ifdef ADD_XIZI_FETURES #define BSP_485_DIR_PIN 24 diff --git a/APP_Framework/Applications/app_test/test_rtc.c b/APP_Framework/Applications/app_test/test_rtc.c index fb6bc015a..cff31edbc 100644 --- a/APP_Framework/Applications/app_test/test_rtc.c +++ b/APP_Framework/Applications/app_test/test_rtc.c @@ -17,10 +17,10 @@ * @author: AIIT XUOS Lab * @date: 2022/12/17 */ -#ifdef ADD_XIZI_FETURES #include #include #include +#ifdef ADD_XIZI_FETURES void TestRTC(int argc,char *argv[]) { diff --git a/APP_Framework/Applications/app_test/test_touch.c b/APP_Framework/Applications/app_test/test_touch.c index 1b863ab70..e378b9de6 100644 --- a/APP_Framework/Applications/app_test/test_touch.c +++ b/APP_Framework/Applications/app_test/test_touch.c @@ -48,7 +48,7 @@ void TestTouch(void) #define LCD_DOT_TYPE 1 #define LCD_SIZE 320 -#elif ADD_XIZI_FETURES +#elif defined ADD_XIZI_FETURES void TestTouch(void) { diff --git a/APP_Framework/Applications/app_test/test_wdt.c b/APP_Framework/Applications/app_test/test_wdt.c index a9e429c41..99115c038 100644 --- a/APP_Framework/Applications/app_test/test_wdt.c +++ b/APP_Framework/Applications/app_test/test_wdt.c @@ -17,10 +17,10 @@ * @author: AIIT XUOS Lab * @date: 2022/12/17 */ -#ifdef ADD_XIZI_FETURES #include #include #include +#ifdef ADD_XIZI_FETURES void TestWDT(int argc, char *agrv[]) {