diff --git a/Hardware/key/key.c b/Hardware/key/key.c index 75bad00..629c101 100644 --- a/Hardware/key/key.c +++ b/Hardware/key/key.c @@ -47,6 +47,8 @@ uint8_t KEY_GetKey(void) { return NO_KEY; } + + return NO_KEY; } /** @@ -61,6 +63,6 @@ uint8_t KEY_GetKeyWait(void) { key = KEY_GetKey(); } - + return key; } diff --git a/Hardware/key/key.h b/Hardware/key/key.h index 5a4ed8d..caeca09 100644 --- a/Hardware/key/key.h +++ b/Hardware/key/key.h @@ -8,6 +8,8 @@ #define NO_KEY 0 #define KEY1 1 #define KEY2 2 +#define KEY3 3 +#define KEY4 4 #define KEY1_Val HAL_GPIO_ReadPin(GPIOE, GPIO_PIN_3) #define KEY2_Val HAL_GPIO_ReadPin(GPIOC, GPIO_PIN_5) diff --git a/HAL_Lib/Inc/Legacy/stm32_hal_legacy.h b/Libraries/HAL_Lib/Inc/Legacy/stm32_hal_legacy.h similarity index 100% rename from HAL_Lib/Inc/Legacy/stm32_hal_legacy.h rename to Libraries/HAL_Lib/Inc/Legacy/stm32_hal_legacy.h diff --git a/HAL_Lib/Inc/stm32_assert_template.h b/Libraries/HAL_Lib/Inc/stm32_assert_template.h similarity index 100% rename from HAL_Lib/Inc/stm32_assert_template.h rename to Libraries/HAL_Lib/Inc/stm32_assert_template.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_adc.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_adc.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_adc.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_adc.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_adc_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_adc_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_adc_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_adc_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_cec.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_cec.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_cec.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_cec.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_comp.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_comp.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_comp.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_comp.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_conf.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_conf.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_conf.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_conf.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_cordic.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_cordic.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_cordic.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_cordic.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_cortex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_cortex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_cortex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_cortex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_crc.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_crc.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_crc.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_crc.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_crc_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_crc_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_crc_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_crc_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_cryp.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_cryp.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_cryp.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_cryp.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_cryp_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_cryp_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_cryp_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_cryp_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_dac.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_dac.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_dac.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_dac.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_dac_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_dac_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_dac_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_dac_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_dcmi.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_dcmi.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_dcmi.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_dcmi.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_def.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_def.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_def.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_def.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_dfsdm.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_dfsdm.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_dfsdm.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_dfsdm.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_dfsdm_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_dfsdm_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_dfsdm_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_dfsdm_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_dma.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_dma.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_dma.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_dma.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_dma2d.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_dma2d.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_dma2d.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_dma2d.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_dma_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_dma_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_dma_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_dma_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_dsi.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_dsi.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_dsi.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_dsi.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_dts.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_dts.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_dts.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_dts.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_eth.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_eth.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_eth.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_eth.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_eth_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_eth_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_eth_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_eth_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_exti.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_exti.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_exti.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_exti.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_fdcan.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_fdcan.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_fdcan.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_fdcan.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_flash.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_flash.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_flash.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_flash.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_flash_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_flash_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_flash_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_flash_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_fmac.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_fmac.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_fmac.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_fmac.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_gfxmmu.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_gfxmmu.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_gfxmmu.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_gfxmmu.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_gpio.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_gpio.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_gpio.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_gpio.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_gpio_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_gpio_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_gpio_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_gpio_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_hash.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_hash.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_hash.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_hash.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_hash_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_hash_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_hash_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_hash_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_hcd.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_hcd.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_hcd.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_hcd.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_hrtim.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_hrtim.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_hrtim.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_hrtim.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_hsem.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_hsem.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_hsem.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_hsem.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_i2c.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_i2c.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_i2c.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_i2c.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_i2c_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_i2c_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_i2c_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_i2c_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_i2s.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_i2s.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_i2s.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_i2s.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_i2s_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_i2s_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_i2s_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_i2s_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_irda.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_irda.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_irda.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_irda.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_irda_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_irda_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_irda_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_irda_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_iwdg.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_iwdg.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_iwdg.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_iwdg.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_jpeg.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_jpeg.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_jpeg.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_jpeg.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_lptim.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_lptim.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_lptim.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_lptim.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_ltdc.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_ltdc.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_ltdc.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_ltdc.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_ltdc_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_ltdc_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_ltdc_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_ltdc_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_mdios.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_mdios.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_mdios.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_mdios.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_mdma.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_mdma.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_mdma.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_mdma.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_mmc.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_mmc.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_mmc.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_mmc.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_mmc_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_mmc_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_mmc_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_mmc_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_nand.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_nand.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_nand.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_nand.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_nor.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_nor.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_nor.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_nor.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_opamp.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_opamp.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_opamp.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_opamp.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_opamp_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_opamp_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_opamp_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_opamp_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_ospi.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_ospi.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_ospi.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_ospi.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_otfdec.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_otfdec.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_otfdec.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_otfdec.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_pcd.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_pcd.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_pcd.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_pcd.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_pcd_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_pcd_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_pcd_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_pcd_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_pssi.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_pssi.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_pssi.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_pssi.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_pwr.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_pwr.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_pwr.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_pwr.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_pwr_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_pwr_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_pwr_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_pwr_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_qspi.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_qspi.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_qspi.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_qspi.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_ramecc.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_ramecc.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_ramecc.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_ramecc.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_rcc.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_rcc.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_rcc.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_rcc.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_rcc_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_rcc_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_rcc_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_rcc_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_rng.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_rng.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_rng.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_rng.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_rng_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_rng_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_rng_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_rng_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_rtc.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_rtc.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_rtc.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_rtc.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_rtc_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_rtc_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_rtc_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_rtc_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_sai.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_sai.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_sai.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_sai.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_sai_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_sai_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_sai_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_sai_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_sd.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_sd.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_sd.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_sd.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_sd_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_sd_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_sd_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_sd_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_sdram.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_sdram.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_sdram.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_sdram.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_smartcard.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_smartcard.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_smartcard.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_smartcard.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_smartcard_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_smartcard_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_smartcard_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_smartcard_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_smbus.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_smbus.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_smbus.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_smbus.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_spdifrx.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_spdifrx.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_spdifrx.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_spdifrx.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_spi.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_spi.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_spi.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_spi.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_spi_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_spi_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_spi_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_spi_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_sram.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_sram.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_sram.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_sram.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_swpmi.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_swpmi.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_swpmi.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_swpmi.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_tim.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_tim.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_tim.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_tim.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_tim_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_tim_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_tim_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_tim_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_uart.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_uart.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_uart.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_uart.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_uart_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_uart_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_uart_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_uart_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_usart.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_usart.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_usart.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_usart.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_usart_ex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_usart_ex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_usart_ex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_usart_ex.h diff --git a/HAL_Lib/Inc/stm32h7xx_hal_wwdg.h b/Libraries/HAL_Lib/Inc/stm32h7xx_hal_wwdg.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_hal_wwdg.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_hal_wwdg.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_adc.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_adc.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_adc.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_adc.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_bdma.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_bdma.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_bdma.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_bdma.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_bus.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_bus.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_bus.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_bus.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_comp.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_comp.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_comp.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_comp.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_cordic.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_cordic.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_cordic.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_cordic.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_cortex.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_cortex.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_cortex.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_cortex.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_crc.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_crc.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_crc.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_crc.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_crs.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_crs.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_crs.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_crs.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_dac.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_dac.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_dac.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_dac.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_delayblock.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_delayblock.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_delayblock.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_delayblock.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_dma.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_dma.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_dma.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_dma.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_dma2d.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_dma2d.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_dma2d.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_dma2d.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_dmamux.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_dmamux.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_dmamux.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_dmamux.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_exti.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_exti.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_exti.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_exti.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_fmac.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_fmac.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_fmac.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_fmac.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_fmc.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_fmc.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_fmc.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_fmc.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_gpio.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_gpio.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_gpio.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_gpio.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_hrtim.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_hrtim.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_hrtim.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_hrtim.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_hsem.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_hsem.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_hsem.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_hsem.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_i2c.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_i2c.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_i2c.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_i2c.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_iwdg.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_iwdg.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_iwdg.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_iwdg.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_lptim.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_lptim.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_lptim.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_lptim.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_lpuart.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_lpuart.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_lpuart.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_lpuart.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_mdma.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_mdma.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_mdma.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_mdma.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_opamp.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_opamp.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_opamp.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_opamp.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_pwr.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_pwr.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_pwr.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_pwr.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_rcc.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_rcc.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_rcc.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_rcc.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_rng.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_rng.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_rng.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_rng.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_rtc.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_rtc.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_rtc.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_rtc.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_sdmmc.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_sdmmc.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_sdmmc.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_sdmmc.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_spi.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_spi.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_spi.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_spi.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_swpmi.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_swpmi.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_swpmi.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_swpmi.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_system.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_system.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_system.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_system.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_tim.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_tim.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_tim.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_tim.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_usart.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_usart.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_usart.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_usart.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_usb.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_usb.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_usb.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_usb.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_utils.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_utils.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_utils.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_utils.h diff --git a/HAL_Lib/Inc/stm32h7xx_ll_wwdg.h b/Libraries/HAL_Lib/Inc/stm32h7xx_ll_wwdg.h similarity index 100% rename from HAL_Lib/Inc/stm32h7xx_ll_wwdg.h rename to Libraries/HAL_Lib/Inc/stm32h7xx_ll_wwdg.h diff --git a/HAL_Lib/Src/stm32h7xx_hal.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_adc.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_adc.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_adc.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_adc.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_adc_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_adc_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_adc_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_adc_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_cec.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_cec.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_cec.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_cec.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_comp.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_comp.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_comp.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_comp.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_cordic.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_cordic.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_cordic.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_cordic.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_cortex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_cortex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_cortex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_cortex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_crc.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_crc.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_crc.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_crc.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_crc_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_crc_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_crc_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_crc_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_cryp.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_cryp.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_cryp.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_cryp.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_cryp_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_cryp_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_cryp_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_cryp_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_dac.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_dac.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_dac.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_dac.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_dac_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_dac_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_dac_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_dac_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_dcmi.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_dcmi.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_dcmi.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_dcmi.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_dfsdm.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_dfsdm.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_dfsdm.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_dfsdm.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_dfsdm_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_dfsdm_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_dfsdm_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_dfsdm_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_dma.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_dma.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_dma.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_dma.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_dma2d.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_dma2d.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_dma2d.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_dma2d.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_dma_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_dma_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_dma_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_dma_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_dsi.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_dsi.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_dsi.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_dsi.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_dts.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_dts.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_dts.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_dts.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_eth.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_eth.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_eth.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_eth.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_eth_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_eth_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_eth_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_eth_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_exti.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_exti.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_exti.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_exti.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_fdcan.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_fdcan.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_fdcan.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_fdcan.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_flash.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_flash.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_flash.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_flash.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_flash_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_flash_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_flash_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_flash_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_fmac.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_fmac.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_fmac.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_fmac.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_gfxmmu.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_gfxmmu.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_gfxmmu.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_gfxmmu.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_gpio.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_gpio.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_gpio.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_gpio.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_hash.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_hash.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_hash.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_hash.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_hash_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_hash_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_hash_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_hash_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_hcd.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_hcd.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_hcd.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_hcd.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_hrtim.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_hrtim.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_hrtim.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_hrtim.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_hsem.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_hsem.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_hsem.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_hsem.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_i2c.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_i2c.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_i2c.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_i2c.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_i2c_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_i2c_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_i2c_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_i2c_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_i2s.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_i2s.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_i2s.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_i2s.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_i2s_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_i2s_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_i2s_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_i2s_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_irda.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_irda.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_irda.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_irda.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_iwdg.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_iwdg.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_iwdg.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_iwdg.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_jpeg.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_jpeg.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_jpeg.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_jpeg.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_lptim.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_lptim.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_lptim.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_lptim.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_ltdc.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_ltdc.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_ltdc.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_ltdc.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_ltdc_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_ltdc_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_ltdc_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_ltdc_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_mdios.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_mdios.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_mdios.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_mdios.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_mdma.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_mdma.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_mdma.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_mdma.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_mmc.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_mmc.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_mmc.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_mmc.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_mmc_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_mmc_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_mmc_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_mmc_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_msp.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_msp.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_msp.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_msp.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_msp_template.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_msp_template.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_msp_template.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_msp_template.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_nand.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_nand.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_nand.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_nand.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_nor.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_nor.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_nor.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_nor.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_opamp.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_opamp.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_opamp.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_opamp.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_opamp_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_opamp_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_opamp_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_opamp_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_ospi.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_ospi.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_ospi.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_ospi.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_otfdec.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_otfdec.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_otfdec.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_otfdec.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_pcd.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_pcd.c similarity index 99% rename from HAL_Lib/Src/stm32h7xx_hal_pcd.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_pcd.c index e577f40..81185b9 100644 --- a/HAL_Lib/Src/stm32h7xx_hal_pcd.c +++ b/Libraries/HAL_Lib/Src/stm32h7xx_hal_pcd.c @@ -998,10 +998,11 @@ HAL_StatusTypeDef HAL_PCD_UnRegisterLpmCallback(PCD_HandleTypeDef *hpcd) */ HAL_StatusTypeDef HAL_PCD_Start(PCD_HandleTypeDef *hpcd) { + USB_OTG_GlobalTypeDef *USBx = hpcd->Instance; __HAL_LOCK(hpcd); - + if ((hpcd->Init.battery_charging_enable == 1U) && (hpcd->Init.phy_itface != USB_OTG_ULPI_PHY)) { diff --git a/HAL_Lib/Src/stm32h7xx_hal_pcd_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_pcd_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_pcd_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_pcd_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_pssi.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_pssi.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_pssi.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_pssi.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_pwr.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_pwr.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_pwr.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_pwr.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_pwr_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_pwr_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_pwr_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_pwr_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_qspi.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_qspi.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_qspi.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_qspi.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_ramecc.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_ramecc.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_ramecc.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_ramecc.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_rcc.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_rcc.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_rcc.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_rcc.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_rcc_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_rcc_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_rcc_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_rcc_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_rng.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_rng.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_rng.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_rng.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_rng_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_rng_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_rng_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_rng_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_rtc.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_rtc.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_rtc.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_rtc.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_rtc_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_rtc_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_rtc_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_rtc_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_sai.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_sai.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_sai.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_sai.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_sai_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_sai_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_sai_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_sai_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_sd.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_sd.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_sd.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_sd.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_sd_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_sd_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_sd_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_sd_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_sdram.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_sdram.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_sdram.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_sdram.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_smartcard.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_smartcard.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_smartcard.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_smartcard.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_smartcard_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_smartcard_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_smartcard_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_smartcard_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_smbus.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_smbus.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_smbus.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_smbus.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_spdifrx.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_spdifrx.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_spdifrx.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_spdifrx.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_spi.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_spi.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_spi.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_spi.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_spi_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_spi_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_spi_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_spi_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_sram.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_sram.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_sram.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_sram.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_swpmi.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_swpmi.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_swpmi.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_swpmi.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_tim.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_tim.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_tim.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_tim.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_tim_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_tim_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_tim_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_tim_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_timebase_rtc_alarm_template.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_timebase_rtc_alarm_template.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_timebase_rtc_alarm_template.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_timebase_rtc_alarm_template.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_timebase_rtc_wakeup_template.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_timebase_rtc_wakeup_template.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_timebase_rtc_wakeup_template.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_timebase_rtc_wakeup_template.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_timebase_tim_template.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_timebase_tim_template.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_timebase_tim_template.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_timebase_tim_template.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_uart.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_uart.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_uart.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_uart.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_uart_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_uart_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_uart_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_uart_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_usart.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_usart.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_usart.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_usart.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_usart_ex.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_usart_ex.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_usart_ex.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_usart_ex.c diff --git a/HAL_Lib/Src/stm32h7xx_hal_wwdg.c b/Libraries/HAL_Lib/Src/stm32h7xx_hal_wwdg.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_hal_wwdg.c rename to Libraries/HAL_Lib/Src/stm32h7xx_hal_wwdg.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_adc.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_adc.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_adc.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_adc.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_bdma.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_bdma.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_bdma.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_bdma.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_comp.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_comp.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_comp.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_comp.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_cordic.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_cordic.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_cordic.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_cordic.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_crc.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_crc.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_crc.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_crc.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_crs.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_crs.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_crs.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_crs.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_dac.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_dac.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_dac.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_dac.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_delayblock.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_delayblock.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_delayblock.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_delayblock.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_dma.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_dma.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_dma.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_dma.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_dma2d.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_dma2d.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_dma2d.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_dma2d.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_exti.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_exti.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_exti.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_exti.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_fmac.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_fmac.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_fmac.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_fmac.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_fmc.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_fmc.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_fmc.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_fmc.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_gpio.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_gpio.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_gpio.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_gpio.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_hrtim.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_hrtim.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_hrtim.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_hrtim.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_i2c.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_i2c.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_i2c.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_i2c.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_lptim.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_lptim.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_lptim.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_lptim.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_lpuart.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_lpuart.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_lpuart.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_lpuart.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_mdma.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_mdma.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_mdma.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_mdma.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_opamp.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_opamp.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_opamp.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_opamp.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_pwr.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_pwr.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_pwr.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_pwr.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_rcc.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_rcc.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_rcc.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_rcc.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_rng.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_rng.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_rng.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_rng.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_rtc.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_rtc.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_rtc.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_rtc.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_sdmmc.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_sdmmc.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_sdmmc.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_sdmmc.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_spi.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_spi.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_spi.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_spi.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_swpmi.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_swpmi.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_swpmi.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_swpmi.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_tim.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_tim.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_tim.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_tim.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_usart.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_usart.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_usart.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_usart.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_usb.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_usb.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_usb.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_usb.c diff --git a/HAL_Lib/Src/stm32h7xx_ll_utils.c b/Libraries/HAL_Lib/Src/stm32h7xx_ll_utils.c similarity index 100% rename from HAL_Lib/Src/stm32h7xx_ll_utils.c rename to Libraries/HAL_Lib/Src/stm32h7xx_ll_utils.c diff --git a/Project/STM32Player.uvprojx b/Project/STM32Player.uvprojx index 1f10c4a..c97fcd9 100644 --- a/Project/STM32Player.uvprojx +++ b/Project/STM32Player.uvprojx @@ -339,7 +339,7 @@ USE_HAL_DRIVER, STM32H743xx - ..\Core;..\User\Main;..\User\GameEngine;..\User\Picture;..\HAL_Lib\Inc;..\System\delay;..\System\sys;..\System\usart;..\System\spi;..\System\gpio;..\Hardware\led;..\Hardware\key;..\Hardware\LCD240;..\Hardware\GBK_LibDrive;..\Hardware\lcd + ..\Core;..\Hardware\led;..\Hardware\key;..\Hardware\lcd;..\Hardware\sdio;..\Libraries\HAL_Lib\Inc;..\Libraries\FatFs;..\Libraries\FatFs\drivers;..\System\delay;..\System\sys;..\System\spi;..\System\gpio;..\User\Main;..\User\GameEngine;..\User\Picture;..\User\SD;..\User\APP_Reader @@ -456,97 +456,127 @@ stm32h7xx_hal.c 1 - ..\HAL_Lib\Src\stm32h7xx_hal.c + ..\Libraries\HAL_Lib\Src\stm32h7xx_hal.c stm32h7xx_hal_adc.c 1 - ..\HAL_Lib\Src\stm32h7xx_hal_adc.c + ..\Libraries\HAL_Lib\Src\stm32h7xx_hal_adc.c stm32h7xx_hal_adc_ex.c 1 - ..\HAL_Lib\Src\stm32h7xx_hal_adc_ex.c + ..\Libraries\HAL_Lib\Src\stm32h7xx_hal_adc_ex.c stm32h7xx_hal_cortex.c 1 - ..\HAL_Lib\Src\stm32h7xx_hal_cortex.c - - - stm32h7xx_hal_dac.c - 1 - ..\HAL_Lib\Src\stm32h7xx_hal_dac.c - - - stm32h7xx_hal_dac_ex.c - 1 - ..\HAL_Lib\Src\stm32h7xx_hal_dac_ex.c + ..\Libraries\HAL_Lib\Src\stm32h7xx_hal_cortex.c stm32h7xx_hal_dma.c 1 - ..\HAL_Lib\Src\stm32h7xx_hal_dma.c + ..\Libraries\HAL_Lib\Src\stm32h7xx_hal_dma.c stm32h7xx_hal_dma_ex.c 1 - ..\HAL_Lib\Src\stm32h7xx_hal_dma_ex.c - - - stm32h7xx_hal_exti.c - 1 - ..\HAL_Lib\Src\stm32h7xx_hal_exti.c + ..\Libraries\HAL_Lib\Src\stm32h7xx_hal_dma_ex.c stm32h7xx_hal_gpio.c 1 - ..\HAL_Lib\Src\stm32h7xx_hal_gpio.c - - - stm32h7xx_hal_msp.c - 1 - ..\HAL_Lib\Src\stm32h7xx_hal_msp.c + ..\Libraries\HAL_Lib\Src\stm32h7xx_hal_gpio.c stm32h7xx_hal_rcc.c 1 - ..\HAL_Lib\Src\stm32h7xx_hal_rcc.c + ..\Libraries\HAL_Lib\Src\stm32h7xx_hal_rcc.c stm32h7xx_hal_rcc_ex.c 1 - ..\HAL_Lib\Src\stm32h7xx_hal_rcc_ex.c + ..\Libraries\HAL_Lib\Src\stm32h7xx_hal_rcc_ex.c - stm32h7xx_hal_rtc.c + stm32h7xx_hal_lptim.c 1 - ..\HAL_Lib\Src\stm32h7xx_hal_rtc.c + ..\Libraries\HAL_Lib\Src\stm32h7xx_hal_lptim.c - stm32h7xx_hal_rtc_ex.c + stm32h7xx_hal_mdma.c 1 - ..\HAL_Lib\Src\stm32h7xx_hal_rtc_ex.c + ..\Libraries\HAL_Lib\Src\stm32h7xx_hal_mdma.c - stm32h7xx_hal_spi.c + stm32h7xx_hal_pwr.c 1 - ..\HAL_Lib\Src\stm32h7xx_hal_spi.c + ..\Libraries\HAL_Lib\Src\stm32h7xx_hal_pwr.c - stm32h7xx_hal_spi_ex.c + stm32h7xx_hal_sram.c 1 - ..\HAL_Lib\Src\stm32h7xx_hal_spi_ex.c + ..\Libraries\HAL_Lib\Src\stm32h7xx_hal_sram.c stm32h7xx_hal_tim.c 1 - ..\HAL_Lib\Src\stm32h7xx_hal_tim.c + ..\Libraries\HAL_Lib\Src\stm32h7xx_hal_tim.c stm32h7xx_hal_tim_ex.c 1 - ..\HAL_Lib\Src\stm32h7xx_hal_tim_ex.c + ..\Libraries\HAL_Lib\Src\stm32h7xx_hal_tim_ex.c + + + stm32h7xx_ll_fmc.c + 1 + ..\Libraries\HAL_Lib\Src\stm32h7xx_ll_fmc.c + + + stm32h7xx_hal_pcd.c + 1 + ..\Libraries\HAL_Lib\Src\stm32h7xx_hal_pcd.c + + + stm32h7xx_hal_pcd_ex.c + 1 + ..\Libraries\HAL_Lib\Src\stm32h7xx_hal_pcd_ex.c + + + stm32h7xx_hal_pwr_ex.c + 1 + ..\Libraries\HAL_Lib\Src\stm32h7xx_hal_pwr_ex.c + + + stm32h7xx_hal_sd.c + 1 + ..\Libraries\HAL_Lib\Src\stm32h7xx_hal_sd.c + + + stm32h7xx_hal_sd_ex.c + 1 + ..\Libraries\HAL_Lib\Src\stm32h7xx_hal_sd_ex.c + + + stm32h7xx_ll_sdmmc.c + 1 + ..\Libraries\HAL_Lib\Src\stm32h7xx_ll_sdmmc.c + + + stm32h7xx_ll_usb.c + 1 + ..\Libraries\HAL_Lib\Src\stm32h7xx_ll_usb.c + + + stm32h7xx_hal_spi.c + 1 + ..\Libraries\HAL_Lib\Src\stm32h7xx_hal_spi.c + + + stm32h7xx_hal_spi_ex.c + 1 + ..\Libraries\HAL_Lib\Src\stm32h7xx_hal_spi_ex.c @@ -568,6 +598,11 @@ 1 ..\Hardware\lcd\lcd.c + + sdio.c + 1 + ..\Hardware\sdio\sdio.c + @@ -588,6 +623,46 @@ 1 ..\User\GameEngine\GE_Font.c + + GE_GUI.c + 1 + ..\User\GameEngine\GE_GUI.c + + + + + FatFs + + + diskio.c + 1 + ..\Libraries\FatFs\diskio.c + + + ff.c + 1 + ..\Libraries\FatFs\ff.c + + + ff_gen_drv.c + 1 + ..\Libraries\FatFs\ff_gen_drv.c + + + syscall.c + 1 + ..\Libraries\FatFs\option\syscall.c + + + sd_diskio_dma.c + 1 + ..\Libraries\FatFs\drivers\sd_diskio_dma.c + + + cc936.c + 1 + ..\Libraries\FatFs\option\cc936.c + @@ -600,6 +675,26 @@ + + SD + + + SD.c + 1 + ..\User\SD\SD.c + + + + + APP_Reader + + + APP_Reader.c + 1 + ..\User\APP_Reader\APP_Reader.c + + + diff --git a/User/APP_Reader/APP_Reader.c b/User/APP_Reader/APP_Reader.c new file mode 100644 index 0000000..3c97183 --- /dev/null +++ b/User/APP_Reader/APP_Reader.c @@ -0,0 +1,451 @@ +#include "stdio.h" + +#include "sys.h" +#include "delay.h" + +#include "key.h" +#include "lcd.h" + +#include "GameEngine.h" +#include "SD.h" + +#include "APP_Reader.h" + +/**************************************** 私有定义 ****************************************/ + +typedef struct +{ + FSIZE_t page_ptr; + uint32_t page_size; +} Page; //页结构定义 + +typedef struct +{ + uint8_t font_size; + uint32_t page_num; + uint32_t page_amount; +} Save; //存档结构定义 + +/*****************************************************************************************/ + +/**************************************** 全局变量 ****************************************/ + +FIL file; //文件 +char filename[32]; //文件名 +char filepath[32]; //文件路径 + +FIL page_file; //分页文件 +char page_filepath[32]; //分页文件名 +char page_filename[32]; //分页文件路径 + +FIL save_file; //存档文件 +char save_filepath[32]; //存档文件名 +char save_filename[32]; //存档文件路径 + +uint32_t page_amount = 1; //页数 +uint8_t current_font_size = FONT_24; //当前字体设置 +uint32_t current_page = 1; //当前页码 + +/*****************************************************************************************/ + +/**************************************** 私有函数 ****************************************/ + +uint8_t APP_Reader_ReadPage(uint8_t font_size, uint32_t page_num); +uint8_t APP_Reader_SplitPages(uint8_t font_size); +uint8_t APP_Reader_Menu(void); +uint8_t APP_Reader_SaveWrite(void); +uint8_t APP_Reader_SaveRead(void); +void APP_Reader_Msg(uint8_t *head, uint8_t *content); + +/*****************************************************************************************/ + +/** + * @brief 启动阅读器 + */ +void APP_Reader_Launcher(void) +{ + //GUI 选取文件 + if (SD_SelectFile(filename, "txt") != SD_OK) + { + APP_Reader_Msg("警告", "选取文件出错！\n\n请按任意键返回"); + + return; + } + + SD_GetPath(filepath, filename); + + //打开文件 + if (f_open(&file, filepath, FA_OPEN_EXISTING | FA_READ) != FR_OK) + { + APP_Reader_Msg("警告", "打开文件出错！\n\n请按任意键返回"); + + return; + } + + //读存档 + uint8_t is_saved = 0; + if (APP_Reader_SaveRead() == 0) + is_saved = 1; + + uint32_t save_page_amount = page_amount; + + //分页 + if (APP_Reader_SplitPages(current_font_size) != 0) + { + APP_Reader_Msg("警告", "分页出错！\n\n请按任意键返回"); + + return; + } + + if (is_saved == 0 || save_page_amount != page_amount) + current_page = 1; + + //开始阅读 + f_open(&page_file, page_filepath, FA_OPEN_EXISTING | FA_READ); //打开分页文件 + while (1) + { + LCD_Disp_Off; + GE_Draw_ClrAll(WHITE); + + if (APP_Reader_ReadPage(current_font_size, current_page) != 0) + { + GE_Draw_ClrAll(WHITE); + LCD_Disp_On; + APP_Reader_Msg("警告", "发生错误！\n\n请按任意键返回"); + + return; + } + LCD_Disp_On; + + switch (KEY_GetKeyWait()) + { + case KEY1: //设置菜单 + { + if (APP_Reader_Menu() != 0) + return; + } + break; + case KEY2: //向后翻页 + { + if (current_page == page_amount) + APP_Reader_Msg("提示", "已到最后一页！"); + else + current_page++; + } + break; + case KEY3: //目前不存在此键 + { + if (current_page == 1) + APP_Reader_Msg("提示", "已到第一页！"); + else + current_page--; + } + break; + case KEY4: //目前不存在此键 + { + } + } + } +} + +/** + * @brief 显示某一页 + * @param font_size: 字体大小 + * @param page_num: 页码，从 1 开始 + * @retval 成功返回 0，失败返回 1 + */ +uint8_t APP_Reader_ReadPage(uint8_t font_size, uint32_t page_num) +{ + FRESULT f_res; + uint32_t br; + uint32_t page_br; + Page page; + + //读分页信息 + f_res = f_lseek(&page_file, (page_num - 1) * sizeof(Page)); + f_res = f_read(&page_file, &page, sizeof(Page), &page_br); + + //读取文件 + uint8_t buffer[1500]; + + f_res = f_lseek(&file, page.page_ptr); + f_res = f_read(&file, buffer, page.page_size, &br); + + if (f_res != FR_OK) + return 1; + + *((uint8_t *)buffer + page.page_size) = '\0'; + + if (font_size == FONT_16) + ge_font_print_set.font_size = FONT_16; + else + ge_font_print_set.font_size = FONT_24; + + GE_Font_Print_WithSet(0, 0, BORDER_MAX, BORDER_MAX, buffer); + + char temp_str[15]; + sprintf(temp_str, "页数:%d/%d %.1f%%", page_num, page_amount, (float)page_num / (float)page_amount * 100.0); + GE_Font_Print(1, 223, BORDER_MAX, BORDER_MAX, FONT_16, BLUE, WHITE, TRUE, temp_str); + + return 0; +} + +/** + * @brief 对文本文件分页 + * @param font_size: 字体大小 + * @retval 成功返回 0，失败返回 1 + */ +uint8_t APP_Reader_SplitPages(uint8_t font_size) +{ + uint32_t br; + FRESULT f_res; + char ch; + uint8_t x, y; + Page page; + FSIZE_t fptr = 0; + + uint32_t page_bw; + + uint8_t x_max, y_max; + if (font_size == FONT_16) + { + x_max = 40; + y_max = 13; + } + else + { + x_max = 26; + y_max = 9; + } + + strcpy(page_filename, filename); + strcat(page_filename, ".page"); + + SD_GetPath(page_filepath, page_filename); + + f_res = f_open(&page_file, page_filepath, FA_CREATE_ALWAYS | FA_WRITE); + + page_amount = 1; + f_lseek(&file, 0); + page.page_size = 0; + + while (1) + { + x = 0; + y = 0; + + while (1) + { + if (f_res != FR_OK) + return 1; + + f_res = f_read(&file, &ch, 1, &br); //读一个字符 + page.page_size++; + + if (br == 0) //分页完毕 + { + page.page_ptr = fptr; + f_res = f_write(&page_file, &page, sizeof(Page), &page_bw); + + f_res = f_close(&page_file); + + if (f_res != FR_OK) + return 1; + else + return 0; + } + + if (ch <= 0x80) //ASCII 字符 + { + if (ch == '\r' || ch == '\0') //忽略的字符 + continue; + + if ((x + 1 > x_max) || (ch == '\n')) + { + x = 0; + y++; + + if (y + 1 > y_max) + { + if (ch != '\n') + f_res = f_lseek(&file, file.fptr - 1); + + page.page_size--; + break; + } + } + + if (ch != '\n') + x++; + } + else //GBK 字符 + { + f_res = f_lseek(&file, file.fptr + 1); + page.page_size++; + + if (x + 2 > x_max) + { + x = 0; + y++; + + if (y + 1 > y_max) + { + f_res = f_lseek(&file, file.fptr - 2); + page.page_size -= 2; + break; + } + } + + x += 2; + } + } + + page_amount++; //页数增加 + page.page_ptr = fptr; //本页起始指针 + f_res = f_write(&page_file, &page, sizeof(Page), &page_bw); //写入分页文件 + page.page_size = 0; //页大小归零 + fptr = file.fptr; //下页起始指针 + } +} + +/** + * @brief 设置菜单 + * @retval 返回阅读器返回 0，结束阅读返回 1 + */ +uint8_t APP_Reader_Menu(void) +{ + uint8_t content[2][GE_GUI_MENUBOX_CONTENT_LEN] = {"字体设置", "退出"}; + + GE_Draw_Fill(50, 50, 220, 140, WHITE); + switch (GE_GUI_MenuBox(50, 50, 220, 140, "菜单", 2, content, NULL)) + { + case 1: + { + GE_Draw_Fill(50, 50, 220, 140, WHITE); + + uint8_t content[2][GE_GUI_MENUBOX_CONTENT_LEN] = {"大号字体", "小号字体"}; + if (GE_GUI_MenuBox(50, 50, 220, 140, "字体设置", 2, content, NULL) == 1) + { + if (current_font_size == FONT_24) + { + APP_Reader_Msg("提示", "您正在使用大号字体！"); + current_page--; + } + else + { + float read_pos = (float)current_page / (float)page_amount; + current_font_size = FONT_24; + f_close(&page_file); + APP_Reader_SplitPages(current_font_size); + f_open(&page_file, page_filepath, FA_OPEN_EXISTING | FA_READ); + current_page = (float)page_amount * read_pos; + } + } + else + { + if (current_font_size == FONT_16) + { + APP_Reader_Msg("提示", "您正在使用小号字体！"); + current_page--; + } + else + { + float read_pos = (float)current_page / (float)page_amount; + current_font_size = FONT_16; + f_close(&page_file); + APP_Reader_SplitPages(current_font_size); + f_open(&page_file, page_filepath, FA_OPEN_EXISTING | FA_READ); + current_page = (float)page_amount * read_pos; + } + } + } + break; + + case 2: + { + //关闭文件 + f_close(&page_file); + f_close(&file); + + APP_Reader_SaveWrite(); + + return 1; + } + break; + } + + return 0; +} + +/** + * @brief 读存档 + * @retval 有存档返回 0，无存档返回 1 + */ +uint8_t APP_Reader_SaveRead(void) +{ + uint32_t save_br; + Save save; + + strcpy(save_filename, filename); + strcat(save_filename, ".save"); + + SD_GetPath(save_filepath, save_filename); + + if (f_open(&save_file, save_filepath, FA_OPEN_EXISTING | FA_READ) != FR_OK || + f_read(&save_file, &save, sizeof(Save), &save_br) != FR_OK) + { + f_close(&save_file); + + return 1; + } + + f_close(&save_file); + + if (save.font_size == FONT_16) + current_font_size = FONT_16; + else if (save.font_size == FONT_24) + current_font_size = FONT_24; + else + return 1; + + current_page = save.page_num; + page_amount = save.page_amount; + + return 0; +} + +/** + * @brief 写存档 + * @retval 成功返回 0，失败返回 1 + */ +uint8_t APP_Reader_SaveWrite(void) +{ + uint32_t save_bw; + Save save; + + save.font_size = current_font_size; + save.page_num = current_page; + save.page_amount = page_amount; + + strcpy(save_filename, filename); + strcat(save_filename, ".save"); + + SD_GetPath(save_filepath, save_filename); + f_open(&save_file, save_filepath, FA_CREATE_ALWAYS | FA_WRITE); + f_write(&save_file, &save, sizeof(Save), &save_bw); + f_close(&save_file); + + return 0; +} + +/** + * @brief 消息框，任意键按下后退出 + * @param head: 标题 + * @param content: 内容 + */ +void APP_Reader_Msg(uint8_t *head, uint8_t *content) +{ + GE_Draw_Fill(60, 75, 200, 90, WHITE); + GE_GUI_MsgBox(60, 75, 200, 90, head, content, NULL); + KEY_GetKeyWait(); +} diff --git a/User/APP_Reader/APP_Reader.h b/User/APP_Reader/APP_Reader.h new file mode 100644 index 0000000..c296fa4 --- /dev/null +++ b/User/APP_Reader/APP_Reader.h @@ -0,0 +1,6 @@ +#ifndef __APP_READER +#define __APP_READER + +void APP_Reader_Launcher(void); + +#endif diff --git a/User/GameEngine/GE_Draw.c b/User/GameEngine/GE_Draw.c index 8b7d7a0..c4d861b 100644 --- a/User/GameEngine/GE_Draw.c +++ b/User/GameEngine/GE_Draw.c @@ -1,4 +1,9 @@ +//游戏引擎图像绘制库 + +#include "stdlib.h" + #include "sys.h" +#include "spi.h" #include "lcd.h" #include "GameEngine.h" @@ -30,6 +35,8 @@ void GE_Draw_Init(void) //绘制图片设置 ge_draw_pic_set.is_reverse = FALSE; ge_draw_pic_set.pos_mode = UP_LEFT; + + GE_Draw_ClrAll(WHITE); } /** diff --git a/User/GameEngine/GE_Draw.h b/User/GameEngine/GE_Draw.h index ed90180..ca02480 100644 --- a/User/GameEngine/GE_Draw.h +++ b/User/GameEngine/GE_Draw.h @@ -1,3 +1,5 @@ +//游戏引擎图像绘制库 + #ifndef __GE_DRAW_H #define __GE_DRAW_H diff --git a/User/GameEngine/GE_Font.c b/User/GameEngine/GE_Font.c index b8ddf37..18dc137 100644 --- a/User/GameEngine/GE_Font.c +++ b/User/GameEngine/GE_Font.c @@ -1,4 +1,4 @@ -//文字显示库 +//游戏引擎文字显示库 #include "sys.h" #include "lcd.h" @@ -217,7 +217,7 @@ uint8_t GE_Font_PrintGBK(uint16_t x, uint16_t y, uint8_t *ch, uint8_t font_size, * @param font_color: 字体颜色 * @param back_color: 背景颜色。透明时无效 * @param is_transparent: 是否透明 - * @param str: 字符创。需为 uint8_t * + * @param str: 字符串。需为 uint8_t * */ uint8_t GE_Font_Print( uint16_t x_start, @@ -257,6 +257,12 @@ uint8_t GE_Font_Print( break; } + if (*str == '\r') + { + str++; + continue; + } + if ((x + font_size / 2 > x_end_plus_1) || (*str == '\n')) { x = x_start; @@ -301,7 +307,7 @@ uint8_t GE_Font_Print( * @param y_start * @param width: 显示窗的宽 * @param height: 显示窗口的高 - * @param str: 字符创。需为 uint8_t * + * @param str: 字符串。需为 uint8_t * */ uint8_t GE_Font_Print_WithSet(uint16_t x_start, uint16_t y_start, uint16_t width, uint16_t height, uint8_t *str) { diff --git a/User/GameEngine/GE_Font.h b/User/GameEngine/GE_Font.h index e0becbb..4df4137 100644 --- a/User/GameEngine/GE_Font.h +++ b/User/GameEngine/GE_Font.h @@ -1,4 +1,4 @@ -//文字显示库 +//游戏引擎文字显示库 #ifndef __GE_FONT_H #define __GE_FONT_H @@ -14,7 +14,7 @@ void GE_FontInit(void); #define FONT_48 48 #define FONT_64 64 -//边界范围 +//边界最大 #define BORDER_MAX 0xffff typedef struct diff --git a/User/GameEngine/GameEngine.c b/User/GameEngine/GameEngine.c index de08f86..18c8797 100644 --- a/User/GameEngine/GameEngine.c +++ b/User/GameEngine/GameEngine.c @@ -1,3 +1,5 @@ +//游戏引擎 + #include "sys.h" #include "delay.h" #include "led.h" @@ -10,11 +12,7 @@ */ void GE_Init(void) { -#ifdef EN_GE_DRAW GE_Draw_Init(); -#endif - -#ifdef EN_GE_FONT GE_Font_Init(); -#endif + GE_GUI_Init(); } diff --git a/User/GameEngine/GameEngine.h b/User/GameEngine/GameEngine.h index 727f5de..405ef06 100644 --- a/User/GameEngine/GameEngine.h +++ b/User/GameEngine/GameEngine.h @@ -3,17 +3,9 @@ #ifndef __GAMEENGINE_H #define __GAMEENGINE_H -//在这里注释掉不需要的子库 -#define EN_GE_DRAW -#define EN_GE_FONT //FONT 子库依赖于 DRAW - -#ifdef EN_GE_DRAW #include "GE_Draw.h" -#endif - -#ifdef EN_GE_FONT #include "GE_Font.h" -#endif +#include "GE_GUI.h" #define FALSE 0 #define TRUE 1 diff --git a/User/Main/main.c b/User/Main/main.c index 798f5b4..a8570a0 100644 --- a/User/Main/main.c +++ b/User/Main/main.c @@ -5,95 +5,36 @@ #include "lcd.h" #include "GameEngine.h" +#include "SD.h" -#include "Picture.h" +#include "APP_Reader.h" int main(void) { + MPU_Config(); //配置 MPU Cache_Enable(); //打开 L1-Cache HAL_Init(); //初始化 HAL 库 Clock_Init(160, 5, 2, 4); //设置时钟为 400MHz SYSCLK_Init(400); //延时初始化 + //初始化外设 LED_Init(); KEY_Init(); LCD_Init(); + //初始化模块 GE_Init(); - //LED KEY LCD 功能测试 - GE_Draw_ClrAll(WHITE); + if (SD_Init() == SD_OK) + { + APP_Reader_Launcher(); + SD_DeInit(); - //文字显示设置 - ge_font_print_set.font_size = FONT_16; - - GE_Font_Print_WithSet(0, 0, BORDER_MAX, BORDER_MAX, "1. 图形绘制测试"); - GE_Font_Print_WithSet(0, LCD_HEIGHT - FONT_16, BORDER_MAX, BORDER_MAX, "按任意键继续"); - - GE_Draw_Point(160, 120, RED); - GE_Draw_Line(0, 0, 320, 240, GREEN); - GE_Draw_Fill(100, 100, 40, 40, BLUE); - GE_Draw_Rectangle(200, 200, 20, 20, YELLOW); - GE_Draw_Circle(160, 120, 90, PURPLE); - - KEY_GetKeyWait(); - - GE_Draw_ClrAll(WHITE); - GE_Font_Print_WithSet(0, 0, BORDER_MAX, BORDER_MAX, "2. 文字显示测试"); - GE_Font_Print_WithSet(0, LCD_HEIGHT - FONT_16, BORDER_MAX, BORDER_MAX, "按任意键继续"); - - GE_Font_Print( - 0, - FONT_16, - BORDER_MAX, - BORDER_MAX, - FONT_32, - BLACK, - WHITE, - TRUE, - "Look，这是一个会自动换行的句子。"); - - GE_Font_Print( - 0, - FONT_16 + FONT_32 * 2, - BORDER_MAX, - BORDER_MAX, - FONT_24, - BLACK, - WHITE, - TRUE, - "Look，这是一个有\n换行的句子。"); - - GE_Font_Print( - 0, - FONT_16 + FONT_32 * 2 + FONT_24 * 2, - BORDER_MAX, - BORDER_MAX, - FONT_12, - BLACK, - WHITE, - TRUE, - "Look，这是一个有\n换行的句子。"); - - KEY_GetKeyWait(); - - GE_Draw_ClrAll(WHITE); - GE_Font_Print_WithSet(0, 0, BORDER_MAX, BORDER_MAX, "3. 图像显示测试"); - GE_Font_Print_WithSet(0, LCD_HEIGHT - FONT_16, BORDER_MAX, BORDER_MAX, "按任意键继续"); - - KEY_GetKeyWait(); - - GE_Draw_Pic(0, 0, FALSE, UP_LEFT, pic_minecraft, 320, 240); - - KEY_GetKeyWait(); - - GE_Draw_ClrAll(WHITE); - GE_Font_Print_WithSet(0, 0, BORDER_MAX, BORDER_MAX, "4. LED 测试"); - GE_Font_Print_WithSet(0, LCD_HEIGHT - FONT_16, BORDER_MAX, BORDER_MAX, "按任意键，LED 翻转"); + GE_Draw_ClrAll(WHITE); + GE_Draw_Pic_WithSet(0, 0, BORDER_MAX, BORDER_MAX, "阅读器运行结束，请重置！"); + } while (1) { - KEY_GetKeyWait(); - LED2_Toggle; } }