Skip to content

Commit

Permalink
fix 去掉PCB 机械层 兼容OV5640
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kevincoooool
Kevincoooool committed Feb 1, 2021
1 parent d6dc1ef commit 41b8096
Show file tree
Hide file tree
Showing 20 changed files with 24,490 additions and 10,517 deletions.
Binary file modified Keil/OpenMV_CubeMX.zip
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion Keil/OpenMV_CubeMX/Inc/main.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#include <stdbool.h>

/* Exported types ------------------------------------------------------------*/
#define DEBUG(...) UsartPrintf(&huart3,"%s:%d :",__FILE__,__LINE__);UsartPrintf(&huart3 ,__VA_ARGS__)
#define DEBUG(...) UsartPrintf(&huart3,"\r\n%s:%d :",__FILE__,__LINE__);UsartPrintf(&huart3 ,__VA_ARGS__)
//#define DEBUG(...) printf(__VA_ARGS__)
//#define DEBUG(p_string) UsartPutString(&huart1 ,p_string)
/* Exported constants --------------------------------------------------------*/
Expand Down
11,274 changes: 5,680 additions & 5,594 deletions Keil/OpenMV_CubeMX/MDK-ARM/Objects/main.hex
View file

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions Keil/OpenMV_CubeMX/MDK-ARM/RTE/_Debug/RTE_Components.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,43 +16,43 @@
*/
#define CMSIS_device_header "stm32h7xx.h"

/* Keil::Device:STM32Cube HAL:COMP:1.5.0 */
/* Keil::Device:STM32Cube HAL:COMP:1.8.0 */
#define RTE_DEVICE_HAL_COMP
/* Keil::Device:STM32Cube HAL:Common:1.5.0 */
/* Keil::Device:STM32Cube HAL:Common:1.8.0 */
#define RTE_DEVICE_HAL_COMMON
/* Keil::Device:STM32Cube HAL:Cortex:1.5.0 */
/* Keil::Device:STM32Cube HAL:Cortex:1.8.0 */
#define RTE_DEVICE_HAL_CORTEX
/* Keil::Device:STM32Cube HAL:DCMI:1.5.0 */
/* Keil::Device:STM32Cube HAL:DCMI:1.8.0 */
#define RTE_DEVICE_HAL_DCMI
/* Keil::Device:STM32Cube HAL:DMA:1.5.0 */
/* Keil::Device:STM32Cube HAL:DMA:1.8.0 */
#define RTE_DEVICE_HAL_DMA
/* Keil::Device:STM32Cube HAL:Flash:1.5.0 */
/* Keil::Device:STM32Cube HAL:Flash:1.8.0 */
#define RTE_DEVICE_HAL_FLASH
/* Keil::Device:STM32Cube HAL:GPIO:1.5.0 */
/* Keil::Device:STM32Cube HAL:GPIO:1.8.0 */
#define RTE_DEVICE_HAL_GPIO
/* Keil::Device:STM32Cube HAL:I2C:1.5.0 */
/* Keil::Device:STM32Cube HAL:I2C:1.8.0 */
#define RTE_DEVICE_HAL_I2C
/* Keil::Device:STM32Cube HAL:MMC:1.5.0 */
/* Keil::Device:STM32Cube HAL:MMC:1.8.0 */
#define RTE_DEVICE_HAL_MMC
/* Keil::Device:STM32Cube HAL:PCD:1.5.0 */
/* Keil::Device:STM32Cube HAL:PCD:1.8.0 */
#define RTE_DEVICE_HAL_PCD
/* Keil::Device:STM32Cube HAL:PWR:1.5.0 */
/* Keil::Device:STM32Cube HAL:PWR:1.8.0 */
#define RTE_DEVICE_HAL_PWR
/* Keil::Device:STM32Cube HAL:RCC:1.5.0 */
/* Keil::Device:STM32Cube HAL:RCC:1.8.0 */
#define RTE_DEVICE_HAL_RCC
/* Keil::Device:STM32Cube HAL:SD:1.5.0 */
/* Keil::Device:STM32Cube HAL:SD:1.8.0 */
#define RTE_DEVICE_HAL_SD
/* Keil::Device:STM32Cube HAL:SPI:1.5.0 */
/* Keil::Device:STM32Cube HAL:SPI:1.8.0 */
#define RTE_DEVICE_HAL_SPI
/* Keil::Device:STM32Cube HAL:TIM:1.5.0 */
/* Keil::Device:STM32Cube HAL:TIM:1.8.0 */
#define RTE_DEVICE_HAL_TIM
/* Keil::Device:STM32Cube HAL:UART:1.5.0 */
/* Keil::Device:STM32Cube HAL:UART:1.8.0 */
#define RTE_DEVICE_HAL_UART
/* Keil::Device:STM32Cube HAL:USART:1.5.0 */
/* Keil::Device:STM32Cube HAL:USART:1.8.0 */
#define RTE_DEVICE_HAL_USART
/* Keil::Device:STM32Cube LL:USB:1.5.0 */
/* Keil::Device:STM32Cube LL:USB:1.8.0 */
#define RTE_DEVICE_LL_USB
/* Keil::Device:Startup:1.5.0 */
/* Keil::Device:Startup:1.8.0 */
#define RTE_DEVICE_STARTUP_STM32H7XX /* Device Startup for STM32H7 */


Expand Down
Binary file added Keil/OpenMV_CubeMX/MDK-ARM/main.bin
View file
Binary file not shown.
421 changes: 314 additions & 107 deletions Keil/OpenMV_CubeMX/MDK-ARM/main.uvguix.97354
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Keil/OpenMV_CubeMX/MDK-ARM/main.uvoptx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@
<GroupNumber>4</GroupNumber>
<FileNumber>15</FileNumber>
<FileType>1</FileType>
<tvExp>1</tvExp>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\Src\bsp_st7789vw.c</PathWithFileName>
Expand Down
20 changes: 10 additions & 10 deletions Keil/OpenMV_CubeMX/MDK-ARM/main.uvprojx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<TargetCommonOption>
<Device>STM32H743VITx</Device>
<Vendor>STMicroelectronics</Vendor>
<PackID>Keil.STM32H7xx_DFP.2.3.1</PackID>
<PackID>Keil.STM32H7xx_DFP.2.6.0</PackID>
<PackURL>https://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000,0x00020000) IRAM2(0x24000000,0x00080000) IROM(0x08000000,0x00100000) IROM2(0x08100000,0x00100000) XRAM(0x30000000,0x00048000) XRAM2(0x38000000,0x00010000) CPUTYPE("Cortex-M7") FPU3(DFPU) CLOCK(12000000) ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -49,7 +49,7 @@
<NotGenerated>0</NotGenerated>
<InvalidFlash>1</InvalidFlash>
</TargetStatus>
<OutputDirectory>.\Objects\</OutputDirectory>
<OutputDirectory>..\output\</OutputDirectory>
<OutputName>main</OutputName>
<CreateExecutable>1</CreateExecutable>
<CreateLib>0</CreateLib>
Expand Down Expand Up @@ -81,9 +81,9 @@
<nStopB2X>0</nStopB2X>
</BeforeMake>
<AfterMake>
<RunUserProg1>0</RunUserProg1>
<RunUserProg1>1</RunUserProg1>
<RunUserProg2>0</RunUserProg2>
<UserProg1Name></UserProg1Name>
<UserProg1Name>fromelf.exe --bin -o .\main.bin ..\output\main.axf</UserProg1Name>
<UserProg2Name></UserProg2Name>
<UserProg1Dos16Mode>0</UserProg1Dos16Mode>
<UserProg2Dos16Mode>0</UserProg2Dos16Mode>
Expand Down Expand Up @@ -206,7 +206,7 @@
<Ro2Chk>0</Ro2Chk>
<Ro3Chk>0</Ro3Chk>
<Ir1Chk>1</Ir1Chk>
<Ir2Chk>1</Ir2Chk>
<Ir2Chk>0</Ir2Chk>
<Ra1Chk>0</Ra1Chk>
<Ra2Chk>0</Ra2Chk>
<Ra3Chk>0</Ra3Chk>
Expand Down Expand Up @@ -887,7 +887,7 @@
<TargetCommonOption>
<Device>STM32H743VITx</Device>
<Vendor>STMicroelectronics</Vendor>
<PackID>Keil.STM32H7xx_DFP.2.3.1</PackID>
<PackID>Keil.STM32H7xx_DFP.2.6.0</PackID>
<PackURL>https://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000,0x00020000) IRAM2(0x24000000,0x00080000) IROM(0x08000000,0x00100000) IROM2(0x08100000,0x00100000) XRAM(0x30000000,0x00048000) XRAM2(0x38000000,0x00010000) CPUTYPE("Cortex-M7") FPU3(DFPU) CLOCK(12000000) ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -1904,17 +1904,17 @@
<files>
<file attr="config" category="source" condition="STM32H743_ARMCC" name="Drivers\CMSIS\Device\ST\STM32H7xx\Source\Templates\arm\startup_stm32h743xx.s" version="1.6.0">
<instance index="0">RTE\Device\STM32H743VITx\startup_stm32h743xx.s</instance>
<component Cclass="Device" Cgroup="Startup" Cvendor="Keil" Cversion="1.5.0" condition="STM32H7 CMSIS"/>
<package name="STM32H7xx_DFP" schemaVersion="1.4" url="https://www.keil.com/pack/" vendor="Keil" version="2.3.1"/>
<component Cclass="Device" Cgroup="Startup" Cvendor="Keil" Cversion="1.8.0" condition="STM32H7 CMSIS"/>
<package name="STM32H7xx_DFP" schemaVersion="1.6.3" url="https://www.keil.com/pack/" vendor="Keil" version="2.6.0"/>
<targetInfos>
<targetInfo name="Debug"/>
<targetInfo name="Release"/>
</targetInfos>
</file>
<file attr="config" category="source" name="Drivers\CMSIS\Device\ST\STM32H7xx\Source\Templates\system_stm32h7xx.c" version="1.6.0">
<instance index="0">RTE\Device\STM32H743VITx\system_stm32h7xx.c</instance>
<component Cclass="Device" Cgroup="Startup" Cvendor="Keil" Cversion="1.5.0" condition="STM32H7 CMSIS"/>
<package name="STM32H7xx_DFP" schemaVersion="1.4" url="https://www.keil.com/pack/" vendor="Keil" version="2.3.1"/>
<component Cclass="Device" Cgroup="Startup" Cvendor="Keil" Cversion="1.8.0" condition="STM32H7 CMSIS"/>
<package name="STM32H7xx_DFP" schemaVersion="1.6.3" url="https://www.keil.com/pack/" vendor="Keil" version="2.6.0"/>
<targetInfos>
<targetInfo name="Debug"/>
<targetInfo name="Release"/>
Expand Down
2 changes: 1 addition & 1 deletion Keil/OpenMV_CubeMX/Src/SDFatfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ void SDCard_Init(void)
__exit:
if (g_tSD.result != FR_OK)
{
DEBUG("DEBUG :(%s)\r\n", FR_Table[g_tSD.result]);
DEBUG("DEBUG :(%s)", FR_Table[g_tSD.result]);
f_mount(NULL, g_tSD.DiskPath, 0); //卸载文件系统
}
}
Expand Down
4 changes: 4 additions & 0 deletions Keil/OpenMV_CubeMX/Src/bsp_mcu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,10 @@ void GPIO_Configuration(void)
GPIO_InitStruct.Alternate = GPIO_AF12_SDMMC1;
HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
GPIO_InitStruct.Pin = GPIO_PIN_2;
GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
GPIO_InitStruct.Alternate = GPIO_AF12_SDMMC1;
HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
GPIO_InitStruct.Pin = GPIO_PIN_0;
GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
Expand Down
2 changes: 1 addition & 1 deletion Keil/OpenMV_CubeMX/Src/bsp_st7789vw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ void ST7789VW_DrawGrayscale(image_t *image)
// {

ST7789VW_SendData_DMA(&image->data[0],65535);
ST7789VW_SendData_DMA(&image->data[65535],(image->w)*(image->h)*2-65535);
ST7789VW_SendData_DMA(&image->data[65535],(image->w)*(image->h)*2-65535);

// }
// }
Expand Down
4 changes: 2 additions & 2 deletions Keil/OpenMV_CubeMX/Src/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ int main(void)
GPIO_Configuration();
systick_init();
USART3_Configuration(UART3_BAUD);
DEBUG("OpenMV BUILD:%04d %s %s\r\n" ,BUILD_NUMBER , __DATE__, __TIME__ );
DEBUG("OpenMV BUILD:%04d %s %s" ,BUILD_NUMBER , __DATE__, __TIME__ );

ST7789VW_Init();
UG_Init( &GUI_1, (void*)ST7789VW_DrawPoint, (UG_S16)ST7789VW_WIDTH, (UG_S16)ST7789VW_HEIGHT );
UG_DriverRegister(DRIVER_DRAW_LINE,(void*)ST7789VW_DrawLine);
Expand Down
Loading

0 comments on commit 41b8096

Please sign in to comment.