From 7dfabab8e8a6511cc9e20fcfc1dbcc729c6fb970 Mon Sep 17 00:00:00 2001 From: SEEKFREE_Kang Date: Mon, 1 Feb 2021 09:41:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BA=93=E4=BE=8B=E7=A8=8B?= =?UTF-8?q?=E4=B8=AD=E5=85=B3=E4=BA=8E=E6=91=84=E5=83=8F=E5=A4=B4=E5=9C=BA?= =?UTF-8?q?=E4=B8=AD=E6=96=AD=E4=BB=A5=E5=8F=8Adma=E4=B8=AD=E6=96=AD=20?= =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=80=BC=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Example/1-ADC_Demo/USER/isr.c | 17 ++++++++------- .../10-Interrupt_Priority_Set_Demo/USER/isr.c | 17 ++++++++------- Example/11-Systick_Demo/USER/isr.c | 17 ++++++++------- Example/12-Dual_Core_Demo/USER/isr.c | 17 ++++++++------- Example/13-FFT_Demo/USER/isr.c | 17 ++++++++------- .../USER/isr.c | 17 ++++++++------- .../USER/isr.c | 21 +++++++++---------- Example/2-LED_Blink_Demo/USER/isr.c | 17 ++++++++------- Example/3-PIT_Demo/USER/isr.c | 17 ++++++++------- Example/4-Encoder_Demo/USER/isr.c | 17 ++++++++------- Example/5-UART_Demo/USER/isr.c | 17 ++++++++------- Example/6-Printf_Demo/USER/isr.c | 17 ++++++++------- Example/7-GPIO_Interrupt_Demo/USER/isr.c | 17 ++++++++------- Example/8-EEPROM_Demo/USER/isr.c | 17 ++++++++------- Example/9-PWM_Demo/USER/isr.c | 17 ++++++++------- Seekfree_TC264_Opensource_Library/.cproject | 2 ++ 16 files changed, 152 insertions(+), 109 deletions(-) diff --git a/Example/1-ADC_Demo/USER/isr.c b/Example/1-ADC_Demo/USER/isr.c index 8240255..c55a012 100644 --- a/Example/1-ADC_Demo/USER/isr.c +++ b/Example/1-ADC_Demo/USER/isr.c @@ -1,3 +1,5 @@ + + /********************************************************************************************************************* * COPYRIGHT NOTICE * Copyright (c) 2020,逐飞科技 @@ -20,8 +22,6 @@ #include "isr_config.h" #include "isr.h" -//在isr.c的中断函数，函数定义的第二个参数固定为0，请不要更改，即使你用CPU1处理中断也不要更改，需要CPU1处理中断只需要在isr_config.h内修改对应的宏定义即可 - //PIT中断函数 示例 IFX_INTERRUPT(cc60_pit_ch0_isr, 0, CCU6_0_CH0_ISR_PRIORITY) @@ -108,8 +108,9 @@ IFX_INTERRUPT(eru_ch3_ch7_isr, 0, ERU_CH3_CH7_INT_PRIO) if(GET_GPIO_FLAG(ERU_CH3_REQ6_P02_0))//通道3中断 { CLEAR_GPIO_FLAG(ERU_CH3_REQ6_P02_0); - if (1 == camera_type) mt9v03x_vsync(); - else if (3 == camera_type) ov7725_vsync(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_vsync(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_vsync(); + else if (CAMERA_BIN == camera_type) ov7725_vsync(); } if(GET_GPIO_FLAG(ERU_CH7_REQ16_P15_1))//通道7中断 @@ -125,8 +126,9 @@ IFX_INTERRUPT(dma_ch5_isr, 0, ERU_DMA_INT_PRIO) { enableInterrupts();//开启中断嵌套 - if (1 == camera_type) mt9v03x_dma(); - else if (3 == camera_type) ov7725_dma(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_dma(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_dma(); + else if (CAMERA_BIN == camera_type) ov7725_dma(); } @@ -157,7 +159,8 @@ IFX_INTERRUPT(uart1_rx_isr, 0, UART1_RX_INT_PRIO) { enableInterrupts();//开启中断嵌套 IfxAsclin_Asc_isrReceive(&uart1_handle); - mt9v03x_uart_callback(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_uart_callback(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_callback(); } IFX_INTERRUPT(uart1_er_isr, 0, UART1_ER_INT_PRIO) { diff --git a/Example/10-Interrupt_Priority_Set_Demo/USER/isr.c b/Example/10-Interrupt_Priority_Set_Demo/USER/isr.c index 8240255..c55a012 100644 --- a/Example/10-Interrupt_Priority_Set_Demo/USER/isr.c +++ b/Example/10-Interrupt_Priority_Set_Demo/USER/isr.c @@ -1,3 +1,5 @@ + + /********************************************************************************************************************* * COPYRIGHT NOTICE * Copyright (c) 2020,逐飞科技 @@ -20,8 +22,6 @@ #include "isr_config.h" #include "isr.h" -//在isr.c的中断函数，函数定义的第二个参数固定为0，请不要更改，即使你用CPU1处理中断也不要更改，需要CPU1处理中断只需要在isr_config.h内修改对应的宏定义即可 - //PIT中断函数 示例 IFX_INTERRUPT(cc60_pit_ch0_isr, 0, CCU6_0_CH0_ISR_PRIORITY) @@ -108,8 +108,9 @@ IFX_INTERRUPT(eru_ch3_ch7_isr, 0, ERU_CH3_CH7_INT_PRIO) if(GET_GPIO_FLAG(ERU_CH3_REQ6_P02_0))//通道3中断 { CLEAR_GPIO_FLAG(ERU_CH3_REQ6_P02_0); - if (1 == camera_type) mt9v03x_vsync(); - else if (3 == camera_type) ov7725_vsync(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_vsync(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_vsync(); + else if (CAMERA_BIN == camera_type) ov7725_vsync(); } if(GET_GPIO_FLAG(ERU_CH7_REQ16_P15_1))//通道7中断 @@ -125,8 +126,9 @@ IFX_INTERRUPT(dma_ch5_isr, 0, ERU_DMA_INT_PRIO) { enableInterrupts();//开启中断嵌套 - if (1 == camera_type) mt9v03x_dma(); - else if (3 == camera_type) ov7725_dma(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_dma(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_dma(); + else if (CAMERA_BIN == camera_type) ov7725_dma(); } @@ -157,7 +159,8 @@ IFX_INTERRUPT(uart1_rx_isr, 0, UART1_RX_INT_PRIO) { enableInterrupts();//开启中断嵌套 IfxAsclin_Asc_isrReceive(&uart1_handle); - mt9v03x_uart_callback(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_uart_callback(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_callback(); } IFX_INTERRUPT(uart1_er_isr, 0, UART1_ER_INT_PRIO) { diff --git a/Example/11-Systick_Demo/USER/isr.c b/Example/11-Systick_Demo/USER/isr.c index 8240255..c55a012 100644 --- a/Example/11-Systick_Demo/USER/isr.c +++ b/Example/11-Systick_Demo/USER/isr.c @@ -1,3 +1,5 @@ + + /********************************************************************************************************************* * COPYRIGHT NOTICE * Copyright (c) 2020,逐飞科技 @@ -20,8 +22,6 @@ #include "isr_config.h" #include "isr.h" -//在isr.c的中断函数，函数定义的第二个参数固定为0，请不要更改，即使你用CPU1处理中断也不要更改，需要CPU1处理中断只需要在isr_config.h内修改对应的宏定义即可 - //PIT中断函数 示例 IFX_INTERRUPT(cc60_pit_ch0_isr, 0, CCU6_0_CH0_ISR_PRIORITY) @@ -108,8 +108,9 @@ IFX_INTERRUPT(eru_ch3_ch7_isr, 0, ERU_CH3_CH7_INT_PRIO) if(GET_GPIO_FLAG(ERU_CH3_REQ6_P02_0))//通道3中断 { CLEAR_GPIO_FLAG(ERU_CH3_REQ6_P02_0); - if (1 == camera_type) mt9v03x_vsync(); - else if (3 == camera_type) ov7725_vsync(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_vsync(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_vsync(); + else if (CAMERA_BIN == camera_type) ov7725_vsync(); } if(GET_GPIO_FLAG(ERU_CH7_REQ16_P15_1))//通道7中断 @@ -125,8 +126,9 @@ IFX_INTERRUPT(dma_ch5_isr, 0, ERU_DMA_INT_PRIO) { enableInterrupts();//开启中断嵌套 - if (1 == camera_type) mt9v03x_dma(); - else if (3 == camera_type) ov7725_dma(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_dma(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_dma(); + else if (CAMERA_BIN == camera_type) ov7725_dma(); } @@ -157,7 +159,8 @@ IFX_INTERRUPT(uart1_rx_isr, 0, UART1_RX_INT_PRIO) { enableInterrupts();//开启中断嵌套 IfxAsclin_Asc_isrReceive(&uart1_handle); - mt9v03x_uart_callback(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_uart_callback(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_callback(); } IFX_INTERRUPT(uart1_er_isr, 0, UART1_ER_INT_PRIO) { diff --git a/Example/12-Dual_Core_Demo/USER/isr.c b/Example/12-Dual_Core_Demo/USER/isr.c index 8240255..c55a012 100644 --- a/Example/12-Dual_Core_Demo/USER/isr.c +++ b/Example/12-Dual_Core_Demo/USER/isr.c @@ -1,3 +1,5 @@ + + /********************************************************************************************************************* * COPYRIGHT NOTICE * Copyright (c) 2020,逐飞科技 @@ -20,8 +22,6 @@ #include "isr_config.h" #include "isr.h" -//在isr.c的中断函数，函数定义的第二个参数固定为0，请不要更改，即使你用CPU1处理中断也不要更改，需要CPU1处理中断只需要在isr_config.h内修改对应的宏定义即可 - //PIT中断函数 示例 IFX_INTERRUPT(cc60_pit_ch0_isr, 0, CCU6_0_CH0_ISR_PRIORITY) @@ -108,8 +108,9 @@ IFX_INTERRUPT(eru_ch3_ch7_isr, 0, ERU_CH3_CH7_INT_PRIO) if(GET_GPIO_FLAG(ERU_CH3_REQ6_P02_0))//通道3中断 { CLEAR_GPIO_FLAG(ERU_CH3_REQ6_P02_0); - if (1 == camera_type) mt9v03x_vsync(); - else if (3 == camera_type) ov7725_vsync(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_vsync(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_vsync(); + else if (CAMERA_BIN == camera_type) ov7725_vsync(); } if(GET_GPIO_FLAG(ERU_CH7_REQ16_P15_1))//通道7中断 @@ -125,8 +126,9 @@ IFX_INTERRUPT(dma_ch5_isr, 0, ERU_DMA_INT_PRIO) { enableInterrupts();//开启中断嵌套 - if (1 == camera_type) mt9v03x_dma(); - else if (3 == camera_type) ov7725_dma(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_dma(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_dma(); + else if (CAMERA_BIN == camera_type) ov7725_dma(); } @@ -157,7 +159,8 @@ IFX_INTERRUPT(uart1_rx_isr, 0, UART1_RX_INT_PRIO) { enableInterrupts();//开启中断嵌套 IfxAsclin_Asc_isrReceive(&uart1_handle); - mt9v03x_uart_callback(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_uart_callback(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_callback(); } IFX_INTERRUPT(uart1_er_isr, 0, UART1_ER_INT_PRIO) { diff --git a/Example/13-FFT_Demo/USER/isr.c b/Example/13-FFT_Demo/USER/isr.c index 8240255..c55a012 100644 --- a/Example/13-FFT_Demo/USER/isr.c +++ b/Example/13-FFT_Demo/USER/isr.c @@ -1,3 +1,5 @@ + + /********************************************************************************************************************* * COPYRIGHT NOTICE * Copyright (c) 2020,逐飞科技 @@ -20,8 +22,6 @@ #include "isr_config.h" #include "isr.h" -//在isr.c的中断函数，函数定义的第二个参数固定为0，请不要更改，即使你用CPU1处理中断也不要更改，需要CPU1处理中断只需要在isr_config.h内修改对应的宏定义即可 - //PIT中断函数 示例 IFX_INTERRUPT(cc60_pit_ch0_isr, 0, CCU6_0_CH0_ISR_PRIORITY) @@ -108,8 +108,9 @@ IFX_INTERRUPT(eru_ch3_ch7_isr, 0, ERU_CH3_CH7_INT_PRIO) if(GET_GPIO_FLAG(ERU_CH3_REQ6_P02_0))//通道3中断 { CLEAR_GPIO_FLAG(ERU_CH3_REQ6_P02_0); - if (1 == camera_type) mt9v03x_vsync(); - else if (3 == camera_type) ov7725_vsync(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_vsync(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_vsync(); + else if (CAMERA_BIN == camera_type) ov7725_vsync(); } if(GET_GPIO_FLAG(ERU_CH7_REQ16_P15_1))//通道7中断 @@ -125,8 +126,9 @@ IFX_INTERRUPT(dma_ch5_isr, 0, ERU_DMA_INT_PRIO) { enableInterrupts();//开启中断嵌套 - if (1 == camera_type) mt9v03x_dma(); - else if (3 == camera_type) ov7725_dma(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_dma(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_dma(); + else if (CAMERA_BIN == camera_type) ov7725_dma(); } @@ -157,7 +159,8 @@ IFX_INTERRUPT(uart1_rx_isr, 0, UART1_RX_INT_PRIO) { enableInterrupts();//开启中断嵌套 IfxAsclin_Asc_isrReceive(&uart1_handle); - mt9v03x_uart_callback(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_uart_callback(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_callback(); } IFX_INTERRUPT(uart1_er_isr, 0, UART1_ER_INT_PRIO) { diff --git a/Example/14-Specifies_Variable_Or_Code_Location_Demo/USER/isr.c b/Example/14-Specifies_Variable_Or_Code_Location_Demo/USER/isr.c index 8240255..c55a012 100644 --- a/Example/14-Specifies_Variable_Or_Code_Location_Demo/USER/isr.c +++ b/Example/14-Specifies_Variable_Or_Code_Location_Demo/USER/isr.c @@ -1,3 +1,5 @@ + + /********************************************************************************************************************* * COPYRIGHT NOTICE * Copyright (c) 2020,逐飞科技 @@ -20,8 +22,6 @@ #include "isr_config.h" #include "isr.h" -//在isr.c的中断函数，函数定义的第二个参数固定为0，请不要更改，即使你用CPU1处理中断也不要更改，需要CPU1处理中断只需要在isr_config.h内修改对应的宏定义即可 - //PIT中断函数 示例 IFX_INTERRUPT(cc60_pit_ch0_isr, 0, CCU6_0_CH0_ISR_PRIORITY) @@ -108,8 +108,9 @@ IFX_INTERRUPT(eru_ch3_ch7_isr, 0, ERU_CH3_CH7_INT_PRIO) if(GET_GPIO_FLAG(ERU_CH3_REQ6_P02_0))//通道3中断 { CLEAR_GPIO_FLAG(ERU_CH3_REQ6_P02_0); - if (1 == camera_type) mt9v03x_vsync(); - else if (3 == camera_type) ov7725_vsync(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_vsync(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_vsync(); + else if (CAMERA_BIN == camera_type) ov7725_vsync(); } if(GET_GPIO_FLAG(ERU_CH7_REQ16_P15_1))//通道7中断 @@ -125,8 +126,9 @@ IFX_INTERRUPT(dma_ch5_isr, 0, ERU_DMA_INT_PRIO) { enableInterrupts();//开启中断嵌套 - if (1 == camera_type) mt9v03x_dma(); - else if (3 == camera_type) ov7725_dma(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_dma(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_dma(); + else if (CAMERA_BIN == camera_type) ov7725_dma(); } @@ -157,7 +159,8 @@ IFX_INTERRUPT(uart1_rx_isr, 0, UART1_RX_INT_PRIO) { enableInterrupts();//开启中断嵌套 IfxAsclin_Asc_isrReceive(&uart1_handle); - mt9v03x_uart_callback(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_uart_callback(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_callback(); } IFX_INTERRUPT(uart1_er_isr, 0, UART1_ER_INT_PRIO) { diff --git a/Example/15-Cpu1_Handles_Interrupts_Demo/USER/isr.c b/Example/15-Cpu1_Handles_Interrupts_Demo/USER/isr.c index 14f48ea..c55a012 100644 --- a/Example/15-Cpu1_Handles_Interrupts_Demo/USER/isr.c +++ b/Example/15-Cpu1_Handles_Interrupts_Demo/USER/isr.c @@ -1,3 +1,5 @@ + + /********************************************************************************************************************* * COPYRIGHT NOTICE * Copyright (c) 2020,逐飞科技 @@ -20,8 +22,6 @@ #include "isr_config.h" #include "isr.h" -//在isr.c的中断函数，函数定义的第二个参数固定为0，请不要更改，即使你用CPU1处理中断也不要更改，需要CPU1处理中断只需要在isr_config.h内修改对应的宏定义即可 - //PIT中断函数 示例 IFX_INTERRUPT(cc60_pit_ch0_isr, 0, CCU6_0_CH0_ISR_PRIORITY) @@ -62,13 +62,11 @@ IFX_INTERRUPT(eru_ch0_ch4_isr, 0, ERU_CH0_CH4_INT_PRIO) if(GET_GPIO_FLAG(ERU_CH0_REQ4_P10_7))//通道0中断 { CLEAR_GPIO_FLAG(ERU_CH0_REQ4_P10_7); - printf("eru ch0 be triggered\n"); } if(GET_GPIO_FLAG(ERU_CH4_REQ13_P15_5))//通道4中断 { CLEAR_GPIO_FLAG(ERU_CH4_REQ13_P15_5); - printf("eru ch4 be triggered\n"); } } @@ -78,13 +76,11 @@ IFX_INTERRUPT(eru_ch1_ch5_isr, 0, ERU_CH1_CH5_INT_PRIO) if(GET_GPIO_FLAG(ERU_CH1_REQ5_P10_8))//通道1中断 { CLEAR_GPIO_FLAG(ERU_CH1_REQ5_P10_8); - printf("eru ch1 be triggered\n"); } if(GET_GPIO_FLAG(ERU_CH5_REQ1_P15_8))//通道5中断 { CLEAR_GPIO_FLAG(ERU_CH5_REQ1_P15_8); - printf("eru ch5 be triggered\n"); } } @@ -112,8 +108,9 @@ IFX_INTERRUPT(eru_ch3_ch7_isr, 0, ERU_CH3_CH7_INT_PRIO) if(GET_GPIO_FLAG(ERU_CH3_REQ6_P02_0))//通道3中断 { CLEAR_GPIO_FLAG(ERU_CH3_REQ6_P02_0); - if (1 == camera_type) mt9v03x_vsync(); - else if (3 == camera_type) ov7725_vsync(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_vsync(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_vsync(); + else if (CAMERA_BIN == camera_type) ov7725_vsync(); } if(GET_GPIO_FLAG(ERU_CH7_REQ16_P15_1))//通道7中断 @@ -129,8 +126,9 @@ IFX_INTERRUPT(dma_ch5_isr, 0, ERU_DMA_INT_PRIO) { enableInterrupts();//开启中断嵌套 - if (1 == camera_type) mt9v03x_dma(); - else if (3 == camera_type) ov7725_dma(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_dma(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_dma(); + else if (CAMERA_BIN == camera_type) ov7725_dma(); } @@ -161,7 +159,8 @@ IFX_INTERRUPT(uart1_rx_isr, 0, UART1_RX_INT_PRIO) { enableInterrupts();//开启中断嵌套 IfxAsclin_Asc_isrReceive(&uart1_handle); - mt9v03x_uart_callback(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_uart_callback(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_callback(); } IFX_INTERRUPT(uart1_er_isr, 0, UART1_ER_INT_PRIO) { diff --git a/Example/2-LED_Blink_Demo/USER/isr.c b/Example/2-LED_Blink_Demo/USER/isr.c index 8240255..c55a012 100644 --- a/Example/2-LED_Blink_Demo/USER/isr.c +++ b/Example/2-LED_Blink_Demo/USER/isr.c @@ -1,3 +1,5 @@ + + /********************************************************************************************************************* * COPYRIGHT NOTICE * Copyright (c) 2020,逐飞科技 @@ -20,8 +22,6 @@ #include "isr_config.h" #include "isr.h" -//在isr.c的中断函数，函数定义的第二个参数固定为0，请不要更改，即使你用CPU1处理中断也不要更改，需要CPU1处理中断只需要在isr_config.h内修改对应的宏定义即可 - //PIT中断函数 示例 IFX_INTERRUPT(cc60_pit_ch0_isr, 0, CCU6_0_CH0_ISR_PRIORITY) @@ -108,8 +108,9 @@ IFX_INTERRUPT(eru_ch3_ch7_isr, 0, ERU_CH3_CH7_INT_PRIO) if(GET_GPIO_FLAG(ERU_CH3_REQ6_P02_0))//通道3中断 { CLEAR_GPIO_FLAG(ERU_CH3_REQ6_P02_0); - if (1 == camera_type) mt9v03x_vsync(); - else if (3 == camera_type) ov7725_vsync(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_vsync(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_vsync(); + else if (CAMERA_BIN == camera_type) ov7725_vsync(); } if(GET_GPIO_FLAG(ERU_CH7_REQ16_P15_1))//通道7中断 @@ -125,8 +126,9 @@ IFX_INTERRUPT(dma_ch5_isr, 0, ERU_DMA_INT_PRIO) { enableInterrupts();//开启中断嵌套 - if (1 == camera_type) mt9v03x_dma(); - else if (3 == camera_type) ov7725_dma(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_dma(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_dma(); + else if (CAMERA_BIN == camera_type) ov7725_dma(); } @@ -157,7 +159,8 @@ IFX_INTERRUPT(uart1_rx_isr, 0, UART1_RX_INT_PRIO) { enableInterrupts();//开启中断嵌套 IfxAsclin_Asc_isrReceive(&uart1_handle); - mt9v03x_uart_callback(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_uart_callback(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_callback(); } IFX_INTERRUPT(uart1_er_isr, 0, UART1_ER_INT_PRIO) { diff --git a/Example/3-PIT_Demo/USER/isr.c b/Example/3-PIT_Demo/USER/isr.c index 3ae9f25..f345040 100644 --- a/Example/3-PIT_Demo/USER/isr.c +++ b/Example/3-PIT_Demo/USER/isr.c @@ -1,3 +1,5 @@ + + /********************************************************************************************************************* * COPYRIGHT NOTICE * Copyright (c) 2020,逐飞科技 @@ -20,8 +22,6 @@ #include "isr_config.h" #include "isr.h" -//在isr.c的中断函数，函数定义的第二个参数固定为0，请不要更改，即使你用CPU1处理中断也不要更改，需要CPU1处理中断只需要在isr_config.h内修改对应的宏定义即可 - //PIT中断函数 示例 uint16 time; @@ -110,8 +110,9 @@ IFX_INTERRUPT(eru_ch3_ch7_isr, 0, ERU_CH3_CH7_INT_PRIO) if(GET_GPIO_FLAG(ERU_CH3_REQ6_P02_0))//通道3中断 { CLEAR_GPIO_FLAG(ERU_CH3_REQ6_P02_0); - if (1 == camera_type) mt9v03x_vsync(); - else if (3 == camera_type) ov7725_vsync(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_vsync(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_vsync(); + else if (CAMERA_BIN == camera_type) ov7725_vsync(); } if(GET_GPIO_FLAG(ERU_CH7_REQ16_P15_1))//通道7中断 @@ -127,8 +128,9 @@ IFX_INTERRUPT(dma_ch5_isr, 0, ERU_DMA_INT_PRIO) { enableInterrupts();//开启中断嵌套 - if (1 == camera_type) mt9v03x_dma(); - else if (3 == camera_type) ov7725_dma(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_dma(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_dma(); + else if (CAMERA_BIN == camera_type) ov7725_dma(); } @@ -159,7 +161,8 @@ IFX_INTERRUPT(uart1_rx_isr, 0, UART1_RX_INT_PRIO) { enableInterrupts();//开启中断嵌套 IfxAsclin_Asc_isrReceive(&uart1_handle); - mt9v03x_uart_callback(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_uart_callback(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_callback(); } IFX_INTERRUPT(uart1_er_isr, 0, UART1_ER_INT_PRIO) { diff --git a/Example/4-Encoder_Demo/USER/isr.c b/Example/4-Encoder_Demo/USER/isr.c index 8240255..c55a012 100644 --- a/Example/4-Encoder_Demo/USER/isr.c +++ b/Example/4-Encoder_Demo/USER/isr.c @@ -1,3 +1,5 @@ + + /********************************************************************************************************************* * COPYRIGHT NOTICE * Copyright (c) 2020,逐飞科技 @@ -20,8 +22,6 @@ #include "isr_config.h" #include "isr.h" -//在isr.c的中断函数，函数定义的第二个参数固定为0，请不要更改，即使你用CPU1处理中断也不要更改，需要CPU1处理中断只需要在isr_config.h内修改对应的宏定义即可 - //PIT中断函数 示例 IFX_INTERRUPT(cc60_pit_ch0_isr, 0, CCU6_0_CH0_ISR_PRIORITY) @@ -108,8 +108,9 @@ IFX_INTERRUPT(eru_ch3_ch7_isr, 0, ERU_CH3_CH7_INT_PRIO) if(GET_GPIO_FLAG(ERU_CH3_REQ6_P02_0))//通道3中断 { CLEAR_GPIO_FLAG(ERU_CH3_REQ6_P02_0); - if (1 == camera_type) mt9v03x_vsync(); - else if (3 == camera_type) ov7725_vsync(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_vsync(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_vsync(); + else if (CAMERA_BIN == camera_type) ov7725_vsync(); } if(GET_GPIO_FLAG(ERU_CH7_REQ16_P15_1))//通道7中断 @@ -125,8 +126,9 @@ IFX_INTERRUPT(dma_ch5_isr, 0, ERU_DMA_INT_PRIO) { enableInterrupts();//开启中断嵌套 - if (1 == camera_type) mt9v03x_dma(); - else if (3 == camera_type) ov7725_dma(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_dma(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_dma(); + else if (CAMERA_BIN == camera_type) ov7725_dma(); } @@ -157,7 +159,8 @@ IFX_INTERRUPT(uart1_rx_isr, 0, UART1_RX_INT_PRIO) { enableInterrupts();//开启中断嵌套 IfxAsclin_Asc_isrReceive(&uart1_handle); - mt9v03x_uart_callback(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_uart_callback(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_callback(); } IFX_INTERRUPT(uart1_er_isr, 0, UART1_ER_INT_PRIO) { diff --git a/Example/5-UART_Demo/USER/isr.c b/Example/5-UART_Demo/USER/isr.c index 8240255..c55a012 100644 --- a/Example/5-UART_Demo/USER/isr.c +++ b/Example/5-UART_Demo/USER/isr.c @@ -1,3 +1,5 @@ + + /********************************************************************************************************************* * COPYRIGHT NOTICE * Copyright (c) 2020,逐飞科技 @@ -20,8 +22,6 @@ #include "isr_config.h" #include "isr.h" -//在isr.c的中断函数，函数定义的第二个参数固定为0，请不要更改，即使你用CPU1处理中断也不要更改，需要CPU1处理中断只需要在isr_config.h内修改对应的宏定义即可 - //PIT中断函数 示例 IFX_INTERRUPT(cc60_pit_ch0_isr, 0, CCU6_0_CH0_ISR_PRIORITY) @@ -108,8 +108,9 @@ IFX_INTERRUPT(eru_ch3_ch7_isr, 0, ERU_CH3_CH7_INT_PRIO) if(GET_GPIO_FLAG(ERU_CH3_REQ6_P02_0))//通道3中断 { CLEAR_GPIO_FLAG(ERU_CH3_REQ6_P02_0); - if (1 == camera_type) mt9v03x_vsync(); - else if (3 == camera_type) ov7725_vsync(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_vsync(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_vsync(); + else if (CAMERA_BIN == camera_type) ov7725_vsync(); } if(GET_GPIO_FLAG(ERU_CH7_REQ16_P15_1))//通道7中断 @@ -125,8 +126,9 @@ IFX_INTERRUPT(dma_ch5_isr, 0, ERU_DMA_INT_PRIO) { enableInterrupts();//开启中断嵌套 - if (1 == camera_type) mt9v03x_dma(); - else if (3 == camera_type) ov7725_dma(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_dma(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_dma(); + else if (CAMERA_BIN == camera_type) ov7725_dma(); } @@ -157,7 +159,8 @@ IFX_INTERRUPT(uart1_rx_isr, 0, UART1_RX_INT_PRIO) { enableInterrupts();//开启中断嵌套 IfxAsclin_Asc_isrReceive(&uart1_handle); - mt9v03x_uart_callback(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_uart_callback(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_callback(); } IFX_INTERRUPT(uart1_er_isr, 0, UART1_ER_INT_PRIO) { diff --git a/Example/6-Printf_Demo/USER/isr.c b/Example/6-Printf_Demo/USER/isr.c index 8240255..c55a012 100644 --- a/Example/6-Printf_Demo/USER/isr.c +++ b/Example/6-Printf_Demo/USER/isr.c @@ -1,3 +1,5 @@ + + /********************************************************************************************************************* * COPYRIGHT NOTICE * Copyright (c) 2020,逐飞科技 @@ -20,8 +22,6 @@ #include "isr_config.h" #include "isr.h" -//在isr.c的中断函数，函数定义的第二个参数固定为0，请不要更改，即使你用CPU1处理中断也不要更改，需要CPU1处理中断只需要在isr_config.h内修改对应的宏定义即可 - //PIT中断函数 示例 IFX_INTERRUPT(cc60_pit_ch0_isr, 0, CCU6_0_CH0_ISR_PRIORITY) @@ -108,8 +108,9 @@ IFX_INTERRUPT(eru_ch3_ch7_isr, 0, ERU_CH3_CH7_INT_PRIO) if(GET_GPIO_FLAG(ERU_CH3_REQ6_P02_0))//通道3中断 { CLEAR_GPIO_FLAG(ERU_CH3_REQ6_P02_0); - if (1 == camera_type) mt9v03x_vsync(); - else if (3 == camera_type) ov7725_vsync(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_vsync(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_vsync(); + else if (CAMERA_BIN == camera_type) ov7725_vsync(); } if(GET_GPIO_FLAG(ERU_CH7_REQ16_P15_1))//通道7中断 @@ -125,8 +126,9 @@ IFX_INTERRUPT(dma_ch5_isr, 0, ERU_DMA_INT_PRIO) { enableInterrupts();//开启中断嵌套 - if (1 == camera_type) mt9v03x_dma(); - else if (3 == camera_type) ov7725_dma(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_dma(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_dma(); + else if (CAMERA_BIN == camera_type) ov7725_dma(); } @@ -157,7 +159,8 @@ IFX_INTERRUPT(uart1_rx_isr, 0, UART1_RX_INT_PRIO) { enableInterrupts();//开启中断嵌套 IfxAsclin_Asc_isrReceive(&uart1_handle); - mt9v03x_uart_callback(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_uart_callback(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_callback(); } IFX_INTERRUPT(uart1_er_isr, 0, UART1_ER_INT_PRIO) { diff --git a/Example/7-GPIO_Interrupt_Demo/USER/isr.c b/Example/7-GPIO_Interrupt_Demo/USER/isr.c index 14f48ea..8430894 100644 --- a/Example/7-GPIO_Interrupt_Demo/USER/isr.c +++ b/Example/7-GPIO_Interrupt_Demo/USER/isr.c @@ -1,3 +1,5 @@ + + /********************************************************************************************************************* * COPYRIGHT NOTICE * Copyright (c) 2020,逐飞科技 @@ -20,8 +22,6 @@ #include "isr_config.h" #include "isr.h" -//在isr.c的中断函数，函数定义的第二个参数固定为0，请不要更改，即使你用CPU1处理中断也不要更改，需要CPU1处理中断只需要在isr_config.h内修改对应的宏定义即可 - //PIT中断函数 示例 IFX_INTERRUPT(cc60_pit_ch0_isr, 0, CCU6_0_CH0_ISR_PRIORITY) @@ -112,8 +112,9 @@ IFX_INTERRUPT(eru_ch3_ch7_isr, 0, ERU_CH3_CH7_INT_PRIO) if(GET_GPIO_FLAG(ERU_CH3_REQ6_P02_0))//通道3中断 { CLEAR_GPIO_FLAG(ERU_CH3_REQ6_P02_0); - if (1 == camera_type) mt9v03x_vsync(); - else if (3 == camera_type) ov7725_vsync(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_vsync(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_vsync(); + else if (CAMERA_BIN == camera_type) ov7725_vsync(); } if(GET_GPIO_FLAG(ERU_CH7_REQ16_P15_1))//通道7中断 @@ -129,8 +130,9 @@ IFX_INTERRUPT(dma_ch5_isr, 0, ERU_DMA_INT_PRIO) { enableInterrupts();//开启中断嵌套 - if (1 == camera_type) mt9v03x_dma(); - else if (3 == camera_type) ov7725_dma(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_dma(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_dma(); + else if (CAMERA_BIN == camera_type) ov7725_dma(); } @@ -161,7 +163,8 @@ IFX_INTERRUPT(uart1_rx_isr, 0, UART1_RX_INT_PRIO) { enableInterrupts();//开启中断嵌套 IfxAsclin_Asc_isrReceive(&uart1_handle); - mt9v03x_uart_callback(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_uart_callback(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_callback(); } IFX_INTERRUPT(uart1_er_isr, 0, UART1_ER_INT_PRIO) { diff --git a/Example/8-EEPROM_Demo/USER/isr.c b/Example/8-EEPROM_Demo/USER/isr.c index 8240255..c55a012 100644 --- a/Example/8-EEPROM_Demo/USER/isr.c +++ b/Example/8-EEPROM_Demo/USER/isr.c @@ -1,3 +1,5 @@ + + /********************************************************************************************************************* * COPYRIGHT NOTICE * Copyright (c) 2020,逐飞科技 @@ -20,8 +22,6 @@ #include "isr_config.h" #include "isr.h" -//在isr.c的中断函数，函数定义的第二个参数固定为0，请不要更改，即使你用CPU1处理中断也不要更改，需要CPU1处理中断只需要在isr_config.h内修改对应的宏定义即可 - //PIT中断函数 示例 IFX_INTERRUPT(cc60_pit_ch0_isr, 0, CCU6_0_CH0_ISR_PRIORITY) @@ -108,8 +108,9 @@ IFX_INTERRUPT(eru_ch3_ch7_isr, 0, ERU_CH3_CH7_INT_PRIO) if(GET_GPIO_FLAG(ERU_CH3_REQ6_P02_0))//通道3中断 { CLEAR_GPIO_FLAG(ERU_CH3_REQ6_P02_0); - if (1 == camera_type) mt9v03x_vsync(); - else if (3 == camera_type) ov7725_vsync(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_vsync(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_vsync(); + else if (CAMERA_BIN == camera_type) ov7725_vsync(); } if(GET_GPIO_FLAG(ERU_CH7_REQ16_P15_1))//通道7中断 @@ -125,8 +126,9 @@ IFX_INTERRUPT(dma_ch5_isr, 0, ERU_DMA_INT_PRIO) { enableInterrupts();//开启中断嵌套 - if (1 == camera_type) mt9v03x_dma(); - else if (3 == camera_type) ov7725_dma(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_dma(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_dma(); + else if (CAMERA_BIN == camera_type) ov7725_dma(); } @@ -157,7 +159,8 @@ IFX_INTERRUPT(uart1_rx_isr, 0, UART1_RX_INT_PRIO) { enableInterrupts();//开启中断嵌套 IfxAsclin_Asc_isrReceive(&uart1_handle); - mt9v03x_uart_callback(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_uart_callback(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_callback(); } IFX_INTERRUPT(uart1_er_isr, 0, UART1_ER_INT_PRIO) { diff --git a/Example/9-PWM_Demo/USER/isr.c b/Example/9-PWM_Demo/USER/isr.c index 8240255..c55a012 100644 --- a/Example/9-PWM_Demo/USER/isr.c +++ b/Example/9-PWM_Demo/USER/isr.c @@ -1,3 +1,5 @@ + + /********************************************************************************************************************* * COPYRIGHT NOTICE * Copyright (c) 2020,逐飞科技 @@ -20,8 +22,6 @@ #include "isr_config.h" #include "isr.h" -//在isr.c的中断函数，函数定义的第二个参数固定为0，请不要更改，即使你用CPU1处理中断也不要更改，需要CPU1处理中断只需要在isr_config.h内修改对应的宏定义即可 - //PIT中断函数 示例 IFX_INTERRUPT(cc60_pit_ch0_isr, 0, CCU6_0_CH0_ISR_PRIORITY) @@ -108,8 +108,9 @@ IFX_INTERRUPT(eru_ch3_ch7_isr, 0, ERU_CH3_CH7_INT_PRIO) if(GET_GPIO_FLAG(ERU_CH3_REQ6_P02_0))//通道3中断 { CLEAR_GPIO_FLAG(ERU_CH3_REQ6_P02_0); - if (1 == camera_type) mt9v03x_vsync(); - else if (3 == camera_type) ov7725_vsync(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_vsync(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_vsync(); + else if (CAMERA_BIN == camera_type) ov7725_vsync(); } if(GET_GPIO_FLAG(ERU_CH7_REQ16_P15_1))//通道7中断 @@ -125,8 +126,9 @@ IFX_INTERRUPT(dma_ch5_isr, 0, ERU_DMA_INT_PRIO) { enableInterrupts();//开启中断嵌套 - if (1 == camera_type) mt9v03x_dma(); - else if (3 == camera_type) ov7725_dma(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_dma(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_dma(); + else if (CAMERA_BIN == camera_type) ov7725_dma(); } @@ -157,7 +159,8 @@ IFX_INTERRUPT(uart1_rx_isr, 0, UART1_RX_INT_PRIO) { enableInterrupts();//开启中断嵌套 IfxAsclin_Asc_isrReceive(&uart1_handle); - mt9v03x_uart_callback(); + if (CAMERA_GRAYSCALE == camera_type) mt9v03x_uart_callback(); + else if (CAMERA_BIN_UART == camera_type) ov7725_uart_callback(); } IFX_INTERRUPT(uart1_er_isr, 0, UART1_ER_INT_PRIO) { diff --git a/Seekfree_TC264_Opensource_Library/.cproject b/Seekfree_TC264_Opensource_Library/.cproject index f72095a..0a032ca 100644 --- a/Seekfree_TC264_Opensource_Library/.cproject +++ b/Seekfree_TC264_Opensource_Library/.cproject @@ -327,6 +327,8 @@ +