Update, refactoring

ClusterM · Jan 6, 2024 · dd6204f · dd6204f · Cuculcos000 · Jan 12, 2024
1 parent fee510c
commit dd6204f
Show file tree

Hide file tree

Showing 261 changed files with 3,012 additions and 2,991 deletions.
diff --git a/STM32/.cproject → FamicomDumper/.cproject b/STM32/.cproject → FamicomDumper/.cproject
@@ -23,7 +23,8 @@
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.802816544" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.323299941" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1540624207" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.348107410" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.5 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32F103ZETx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../USB_DEVICE/Target | ../Drivers/CMSIS/Device/ST/STM32F1xx/Include | ../Drivers/CMSIS/Include | ../Core/Inc | ../Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc | ../USB_DEVICE/App | ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy | ../Drivers/STM32F1xx_HAL_Driver/Inc | ../Middlewares/ST/STM32_USB_Device_Library/Core/Inc ||  ||  || STM32F103xE | USE_HAL_DRIVER ||  || Drivers | Core/Startup | Middlewares | Core | USB_DEVICE ||  ||  || ${workspace_loc:/${ProjName}/STM32F103ZETX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None || " valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.348107410" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.6 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32F103ZETx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../USB_DEVICE/Target | ../Drivers/CMSIS/Device/ST/STM32F1xx/Include | ../Drivers/CMSIS/Include | ../Core/Inc | ../Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc | ../USB_DEVICE/App | ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy | ../Drivers/STM32F1xx_HAL_Driver/Inc | ../Middlewares/ST/STM32_USB_Device_Library/Core/Inc ||  ||  || STM32F103xE | USE_HAL_DRIVER ||  || Drivers | Core/Startup | Middlewares | Core | USB_DEVICE ||  ||  || ${workspace_loc:/${ProjName}/STM32F103ZETX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None ||  ||  || " valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.debug.option.cpuclock.133307158" superClass="com.st.stm32cube.ide.mcu.debug.option.cpuclock" useByScannerDiscovery="false" value="72" valueType="string"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1956864674" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
 							<builder buildPath="${workspace_loc:/STM32}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1575865607" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.633583979" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
@@ -108,8 +109,9 @@
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1878493876" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.892728556" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1847660064" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1207545234" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.5 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32F103ZETx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../USB_DEVICE/Target | ../Drivers/CMSIS/Device/ST/STM32F1xx/Include | ../Drivers/CMSIS/Include | ../Core/Inc | ../Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc | ../USB_DEVICE/App | ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy | ../Drivers/STM32F1xx_HAL_Driver/Inc | ../Middlewares/ST/STM32_USB_Device_Library/Core/Inc ||  ||  || STM32F103xE | USE_HAL_DRIVER ||  || Drivers | Core/Startup | Middlewares | Core | USB_DEVICE ||  ||  || ${workspace_loc:/${ProjName}/STM32F103ZETX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None || " valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1207545234" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.6 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32F103ZETx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../USB_DEVICE/Target | ../Drivers/CMSIS/Device/ST/STM32F1xx/Include | ../Drivers/CMSIS/Include | ../Core/Inc | ../Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc | ../USB_DEVICE/App | ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy | ../Drivers/STM32F1xx_HAL_Driver/Inc | ../Middlewares/ST/STM32_USB_Device_Library/Core/Inc ||  ||  || STM32F103xE | USE_HAL_DRIVER ||  || Drivers | Core/Startup | Middlewares | Core | USB_DEVICE ||  ||  || ${workspace_loc:/${ProjName}/STM32F103ZETX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None ||  ||  || " valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.convertbinary.643704967" name="Convert to binary file (-O binary)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.convertbinary" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+							<option id="com.st.stm32cube.ide.mcu.debug.option.cpuclock.503367339" superClass="com.st.stm32cube.ide.mcu.debug.option.cpuclock" value="72" valueType="string"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.743968727" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
 							<builder buildPath="${workspace_loc:/STM32}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1569906200" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1472380938" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">

diff --git a/STM32/.project → FamicomDumper/.project b/STM32/.project → FamicomDumper/.project
diff --git a/STM32/Core/Inc/comm.h → FamicomDumper/Core/Inc/comm.h b/STM32/Core/Inc/comm.h → FamicomDumper/Core/Inc/comm.h
diff --git a/STM32/Core/Inc/crc.h → FamicomDumper/Core/Inc/crc.h b/STM32/Core/Inc/crc.h → FamicomDumper/Core/Inc/crc.h
diff --git a/STM32/Core/Inc/dumper.h → FamicomDumper/Core/Inc/dumper.h b/STM32/Core/Inc/dumper.h → FamicomDumper/Core/Inc/dumper.h
diff --git a/STM32/Core/Inc/fds.h → FamicomDumper/Core/Inc/fds.h b/STM32/Core/Inc/fds.h → FamicomDumper/Core/Inc/fds.h
diff --git a/STM32/Core/Inc/flash.h → FamicomDumper/Core/Inc/flash.h b/STM32/Core/Inc/flash.h → FamicomDumper/Core/Inc/flash.h
diff --git a/STM32/Core/Inc/led.h → FamicomDumper/Core/Inc/led.h b/STM32/Core/Inc/led.h → FamicomDumper/Core/Inc/led.h
diff --git a/STM32/Core/Inc/main.h → FamicomDumper/Core/Inc/main.h b/STM32/Core/Inc/main.h → FamicomDumper/Core/Inc/main.h
@@ -82,6 +82,7 @@ void Error_Handler(void);
 #define IRQ_GPIO_Port GPIOB
 #define SHIFTERS_OE_Pin GPIO_PIN_0
 #define SHIFTERS_OE_GPIO_Port GPIOE
+
 /* USER CODE BEGIN Private defines */
 
 /* USER CODE END Private defines */

diff --git a/STM32/Core/Inc/stm32f1xx_hal_conf.h → FamicomDumper/Core/Inc/stm32f1xx_hal_conf.h b/STM32/Core/Inc/stm32f1xx_hal_conf.h → FamicomDumper/Core/Inc/stm32f1xx_hal_conf.h
diff --git a/STM32/Core/Inc/stm32f1xx_it.h → FamicomDumper/Core/Inc/stm32f1xx_it.h b/STM32/Core/Inc/stm32f1xx_it.h → FamicomDumper/Core/Inc/stm32f1xx_it.h
diff --git a/STM32/Core/Inc/unrom512.h → FamicomDumper/Core/Inc/unrom512.h b/STM32/Core/Inc/unrom512.h → FamicomDumper/Core/Inc/unrom512.h
diff --git a/STM32/Core/Src/comm.c → FamicomDumper/Core/Src/comm.c b/STM32/Core/Src/comm.c → FamicomDumper/Core/Src/comm.c
diff --git a/STM32/Core/Src/crc.c → FamicomDumper/Core/Src/crc.c b/STM32/Core/Src/crc.c → FamicomDumper/Core/Src/crc.c
diff --git a/STM32/Core/Src/dumper.c → FamicomDumper/Core/Src/dumper.c b/STM32/Core/Src/dumper.c → FamicomDumper/Core/Src/dumper.c
diff --git a/STM32/Core/Src/fds.c → FamicomDumper/Core/Src/fds.c b/STM32/Core/Src/fds.c → FamicomDumper/Core/Src/fds.c
diff --git a/STM32/Core/Src/flash.c → FamicomDumper/Core/Src/flash.c b/STM32/Core/Src/flash.c → FamicomDumper/Core/Src/flash.c
diff --git a/STM32/Core/Src/led.c → FamicomDumper/Core/Src/led.c b/STM32/Core/Src/led.c → FamicomDumper/Core/Src/led.c
diff --git a/STM32/Core/Src/main.c → FamicomDumper/Core/Src/main.c b/STM32/Core/Src/main.c → FamicomDumper/Core/Src/main.c
@@ -604,6 +604,8 @@ static void MX_DMA_Init(void)
 static void MX_GPIO_Init(void)
 {
   GPIO_InitTypeDef GPIO_InitStruct = {0};
+/* USER CODE BEGIN MX_GPIO_Init_1 */
+/* USER CODE END MX_GPIO_Init_1 */
 
   /* GPIO Ports Clock Enable */
   __HAL_RCC_GPIOF_CLK_ENABLE();
@@ -658,6 +660,8 @@ static void MX_GPIO_Init(void)
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(SHIFTERS_OE_GPIO_Port, &GPIO_InitStruct);
 
+/* USER CODE BEGIN MX_GPIO_Init_2 */
+/* USER CODE END MX_GPIO_Init_2 */
 }
 
 /* FSMC initialization function */

diff --git a/STM32/Core/Src/stm32f1xx_hal_msp.c → FamicomDumper/Core/Src/stm32f1xx_hal_msp.c b/STM32/Core/Src/stm32f1xx_hal_msp.c → FamicomDumper/Core/Src/stm32f1xx_hal_msp.c
@@ -21,6 +21,7 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include "main.h"
+
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */

diff --git a/STM32/Core/Src/stm32f1xx_it.c → FamicomDumper/Core/Src/stm32f1xx_it.c b/STM32/Core/Src/stm32f1xx_it.c → FamicomDumper/Core/Src/stm32f1xx_it.c
diff --git a/STM32/Core/Src/syscalls.c → FamicomDumper/Core/Src/syscalls.c b/STM32/Core/Src/syscalls.c → FamicomDumper/Core/Src/syscalls.c
diff --git a/STM32/Core/Src/sysmem.c → FamicomDumper/Core/Src/sysmem.c b/STM32/Core/Src/sysmem.c → FamicomDumper/Core/Src/sysmem.c
diff --git a/STM32/Core/Src/system_stm32f1xx.c → FamicomDumper/Core/Src/system_stm32f1xx.c b/STM32/Core/Src/system_stm32f1xx.c → FamicomDumper/Core/Src/system_stm32f1xx.c
diff --git a/STM32/Core/Src/unrom512.c → FamicomDumper/Core/Src/unrom512.c b/STM32/Core/Src/unrom512.c → FamicomDumper/Core/Src/unrom512.c
diff --git a/STM32/Core/Startup/startup_stm32f103zetx.s → ...mper/Core/Startup/startup_stm32f103zetx.s b/STM32/Core/Startup/startup_stm32f103zetx.s → ...mper/Core/Startup/startup_stm32f103zetx.s
diff --git a/...Device/ST/STM32F1xx/Include/stm32f103xe.h → ...Device/ST/STM32F1xx/Include/stm32f103xe.h b/...Device/ST/STM32F1xx/Include/stm32f103xe.h → ...Device/ST/STM32F1xx/Include/stm32f103xe.h
diff --git a/...S/Device/ST/STM32F1xx/Include/stm32f1xx.h → ...S/Device/ST/STM32F1xx/Include/stm32f1xx.h b/...S/Device/ST/STM32F1xx/Include/stm32f1xx.h → ...S/Device/ST/STM32F1xx/Include/stm32f1xx.h
diff --git a/...e/ST/STM32F1xx/Include/system_stm32f1xx.h → ...e/ST/STM32F1xx/Include/system_stm32f1xx.h b/...e/ST/STM32F1xx/Include/system_stm32f1xx.h → ...e/ST/STM32F1xx/Include/system_stm32f1xx.h
diff --git a/...vers/CMSIS/Device/ST/STM32F1xx/License.md → ...vers/CMSIS/Device/ST/STM32F1xx/License.md b/...vers/CMSIS/Device/ST/STM32F1xx/License.md → ...vers/CMSIS/Device/ST/STM32F1xx/License.md
diff --git a/STM32/Drivers/CMSIS/Include/cmsis_armcc.h → ...umper/Drivers/CMSIS/Include/cmsis_armcc.h b/STM32/Drivers/CMSIS/Include/cmsis_armcc.h → ...umper/Drivers/CMSIS/Include/cmsis_armcc.h
diff --git a/STM32/Drivers/CMSIS/Include/cmsis_armclang.h → ...er/Drivers/CMSIS/Include/cmsis_armclang.h b/STM32/Drivers/CMSIS/Include/cmsis_armclang.h → ...er/Drivers/CMSIS/Include/cmsis_armclang.h
diff --git a/STM32/Drivers/CMSIS/Include/cmsis_compiler.h → ...er/Drivers/CMSIS/Include/cmsis_compiler.h b/STM32/Drivers/CMSIS/Include/cmsis_compiler.h → ...er/Drivers/CMSIS/Include/cmsis_compiler.h
diff --git a/STM32/Drivers/CMSIS/Include/cmsis_gcc.h → ...mDumper/Drivers/CMSIS/Include/cmsis_gcc.h b/STM32/Drivers/CMSIS/Include/cmsis_gcc.h → ...mDumper/Drivers/CMSIS/Include/cmsis_gcc.h
diff --git a/STM32/Drivers/CMSIS/Include/cmsis_iccarm.h → ...mper/Drivers/CMSIS/Include/cmsis_iccarm.h b/STM32/Drivers/CMSIS/Include/cmsis_iccarm.h → ...mper/Drivers/CMSIS/Include/cmsis_iccarm.h
diff --git a/STM32/Drivers/CMSIS/Include/cmsis_version.h → ...per/Drivers/CMSIS/Include/cmsis_version.h b/STM32/Drivers/CMSIS/Include/cmsis_version.h → ...per/Drivers/CMSIS/Include/cmsis_version.h
diff --git a/STM32/Drivers/CMSIS/Include/core_armv8mbl.h → ...per/Drivers/CMSIS/Include/core_armv8mbl.h b/STM32/Drivers/CMSIS/Include/core_armv8mbl.h → ...per/Drivers/CMSIS/Include/core_armv8mbl.h
diff --git a/STM32/Drivers/CMSIS/Include/core_armv8mml.h → ...per/Drivers/CMSIS/Include/core_armv8mml.h b/STM32/Drivers/CMSIS/Include/core_armv8mml.h → ...per/Drivers/CMSIS/Include/core_armv8mml.h
diff --git a/STM32/Drivers/CMSIS/Include/core_cm0.h → ...omDumper/Drivers/CMSIS/Include/core_cm0.h b/STM32/Drivers/CMSIS/Include/core_cm0.h → ...omDumper/Drivers/CMSIS/Include/core_cm0.h
diff --git a/STM32/Drivers/CMSIS/Include/core_cm0plus.h → ...mper/Drivers/CMSIS/Include/core_cm0plus.h b/STM32/Drivers/CMSIS/Include/core_cm0plus.h → ...mper/Drivers/CMSIS/Include/core_cm0plus.h
diff --git a/STM32/Drivers/CMSIS/Include/core_cm1.h → ...omDumper/Drivers/CMSIS/Include/core_cm1.h b/STM32/Drivers/CMSIS/Include/core_cm1.h → ...omDumper/Drivers/CMSIS/Include/core_cm1.h
diff --git a/STM32/Drivers/CMSIS/Include/core_cm23.h → ...mDumper/Drivers/CMSIS/Include/core_cm23.h b/STM32/Drivers/CMSIS/Include/core_cm23.h → ...mDumper/Drivers/CMSIS/Include/core_cm23.h
diff --git a/STM32/Drivers/CMSIS/Include/core_cm3.h → ...omDumper/Drivers/CMSIS/Include/core_cm3.h b/STM32/Drivers/CMSIS/Include/core_cm3.h → ...omDumper/Drivers/CMSIS/Include/core_cm3.h
diff --git a/STM32/Drivers/CMSIS/Include/core_cm33.h → ...mDumper/Drivers/CMSIS/Include/core_cm33.h b/STM32/Drivers/CMSIS/Include/core_cm33.h → ...mDumper/Drivers/CMSIS/Include/core_cm33.h
diff --git a/STM32/Drivers/CMSIS/Include/core_cm4.h → ...omDumper/Drivers/CMSIS/Include/core_cm4.h b/STM32/Drivers/CMSIS/Include/core_cm4.h → ...omDumper/Drivers/CMSIS/Include/core_cm4.h
diff --git a/STM32/Drivers/CMSIS/Include/core_cm7.h → ...omDumper/Drivers/CMSIS/Include/core_cm7.h b/STM32/Drivers/CMSIS/Include/core_cm7.h → ...omDumper/Drivers/CMSIS/Include/core_cm7.h
diff --git a/STM32/Drivers/CMSIS/Include/core_sc000.h → ...Dumper/Drivers/CMSIS/Include/core_sc000.h b/STM32/Drivers/CMSIS/Include/core_sc000.h → ...Dumper/Drivers/CMSIS/Include/core_sc000.h
diff --git a/STM32/Drivers/CMSIS/Include/core_sc300.h → ...Dumper/Drivers/CMSIS/Include/core_sc300.h b/STM32/Drivers/CMSIS/Include/core_sc300.h → ...Dumper/Drivers/CMSIS/Include/core_sc300.h
diff --git a/STM32/Drivers/CMSIS/Include/mpu_armv7.h → ...mDumper/Drivers/CMSIS/Include/mpu_armv7.h b/STM32/Drivers/CMSIS/Include/mpu_armv7.h → ...mDumper/Drivers/CMSIS/Include/mpu_armv7.h
diff --git a/STM32/Drivers/CMSIS/Include/mpu_armv8.h → ...mDumper/Drivers/CMSIS/Include/mpu_armv8.h b/STM32/Drivers/CMSIS/Include/mpu_armv8.h → ...mDumper/Drivers/CMSIS/Include/mpu_armv8.h
diff --git a/STM32/Drivers/CMSIS/Include/tz_context.h → ...Dumper/Drivers/CMSIS/Include/tz_context.h b/STM32/Drivers/CMSIS/Include/tz_context.h → ...Dumper/Drivers/CMSIS/Include/tz_context.h
diff --git a/STM32/Drivers/CMSIS/LICENSE.txt → FamicomDumper/Drivers/CMSIS/LICENSE.txt b/STM32/Drivers/CMSIS/LICENSE.txt → FamicomDumper/Drivers/CMSIS/LICENSE.txt
diff --git a/..._HAL_Driver/Inc/Legacy/stm32_hal_legacy.h → ..._HAL_Driver/Inc/Legacy/stm32_hal_legacy.h b/..._HAL_Driver/Inc/Legacy/stm32_hal_legacy.h → ..._HAL_Driver/Inc/Legacy/stm32_hal_legacy.h
diff --git a/.../STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h → .../STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h b/.../STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h → .../STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
diff --git a/...1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h → ...1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h b/...1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h → ...1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h
diff --git a/...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h → ...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h b/...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h → ...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
diff --git a/...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h → ...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h b/...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h → ...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h
diff --git a/...1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h → ...1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h b/...1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h → ...1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h
diff --git a/...2F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h → ...2F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h b/...2F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h → ...2F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h
diff --git a/...F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h → ...F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h b/...F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h → ...F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h
diff --git a/...x_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h → ...x_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h b/...x_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h → ...x_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h
diff --git a/...2F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h → ...2F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h b/...2F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h → ...2F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h
diff --git a/...xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h → ...xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h b/...xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h → ...xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h
diff --git a/...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd.h → ...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd.h b/...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd.h → ...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd.h
diff --git a/...1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd_ex.h → ...1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd_ex.h b/...1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd_ex.h → ...1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd_ex.h
diff --git a/...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h → ...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h b/...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h → ...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h
diff --git a/...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h → ...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h b/...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h → ...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
diff --git a/...1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h → ...1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h b/...1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h → ...1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h
diff --git a/...2F1xx_HAL_Driver/Inc/stm32f1xx_hal_sram.h → ...2F1xx_HAL_Driver/Inc/stm32f1xx_hal_sram.h b/...2F1xx_HAL_Driver/Inc/stm32f1xx_hal_sram.h → ...2F1xx_HAL_Driver/Inc/stm32f1xx_hal_sram.h
diff --git a/...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h → ...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h b/...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h → ...32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h
diff --git a/...1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h → ...1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h b/...1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h → ...1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h
diff --git a/...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_bus.h → ...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_bus.h b/...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_bus.h → ...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_bus.h
diff --git a/...F1xx_HAL_Driver/Inc/stm32f1xx_ll_cortex.h → ...F1xx_HAL_Driver/Inc/stm32f1xx_ll_cortex.h b/...F1xx_HAL_Driver/Inc/stm32f1xx_ll_cortex.h → ...F1xx_HAL_Driver/Inc/stm32f1xx_ll_cortex.h
diff --git a/...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_dma.h → ...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_dma.h b/...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_dma.h → ...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_dma.h
diff --git a/...32F1xx_HAL_Driver/Inc/stm32f1xx_ll_exti.h → ...32F1xx_HAL_Driver/Inc/stm32f1xx_ll_exti.h b/...32F1xx_HAL_Driver/Inc/stm32f1xx_ll_exti.h → ...32F1xx_HAL_Driver/Inc/stm32f1xx_ll_exti.h
diff --git a/...32F1xx_HAL_Driver/Inc/stm32f1xx_ll_fsmc.h → ...32F1xx_HAL_Driver/Inc/stm32f1xx_ll_fsmc.h b/...32F1xx_HAL_Driver/Inc/stm32f1xx_ll_fsmc.h → ...32F1xx_HAL_Driver/Inc/stm32f1xx_ll_fsmc.h
diff --git a/...32F1xx_HAL_Driver/Inc/stm32f1xx_ll_gpio.h → ...32F1xx_HAL_Driver/Inc/stm32f1xx_ll_gpio.h b/...32F1xx_HAL_Driver/Inc/stm32f1xx_ll_gpio.h → ...32F1xx_HAL_Driver/Inc/stm32f1xx_ll_gpio.h
diff --git a/...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_pwr.h → ...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_pwr.h b/...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_pwr.h → ...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_pwr.h
diff --git a/...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_rcc.h → ...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_rcc.h b/...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_rcc.h → ...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_rcc.h
diff --git a/...F1xx_HAL_Driver/Inc/stm32f1xx_ll_system.h → ...F1xx_HAL_Driver/Inc/stm32f1xx_ll_system.h b/...F1xx_HAL_Driver/Inc/stm32f1xx_ll_system.h → ...F1xx_HAL_Driver/Inc/stm32f1xx_ll_system.h
diff --git a/...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_tim.h → ...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_tim.h b/...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_tim.h → ...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_tim.h
diff --git a/...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_usb.h → ...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_usb.h b/...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_usb.h → ...M32F1xx_HAL_Driver/Inc/stm32f1xx_ll_usb.h
diff --git a/...2F1xx_HAL_Driver/Inc/stm32f1xx_ll_utils.h → ...2F1xx_HAL_Driver/Inc/stm32f1xx_ll_utils.h b/...2F1xx_HAL_Driver/Inc/stm32f1xx_ll_utils.h → ...2F1xx_HAL_Driver/Inc/stm32f1xx_ll_utils.h
diff --git a/...2/Drivers/STM32F1xx_HAL_Driver/License.md → ...r/Drivers/STM32F1xx_HAL_Driver/License.md b/...2/Drivers/STM32F1xx_HAL_Driver/License.md → ...r/Drivers/STM32F1xx_HAL_Driver/License.md
diff --git a/.../STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c → .../STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c b/.../STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c → .../STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c
diff --git a/...1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c → ...1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c b/...1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c → ...1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c
diff --git a/...32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c → ...32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c b/...32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c → ...32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c
diff --git a/...2F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c → ...2F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c b/...2F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c → ...2F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c
diff --git a/...F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c → ...F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c b/...F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c → ...F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c
diff --git a/...x_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c → ...x_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c b/...x_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c → ...x_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c
diff --git a/...2F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c → ...2F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c b/...2F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c → ...2F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c
diff --git a/...xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c → ...xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c b/...xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c → ...xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c
diff --git a/...32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd.c → ...32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd.c b/...32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd.c → ...32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd.c
diff --git a/...1xx_HAL_Driver/Src/stm32f1xx_hal_pcd_ex.c → ...1xx_HAL_Driver/Src/stm32f1xx_hal_pcd_ex.c b/...1xx_HAL_Driver/Src/stm32f1xx_hal_pcd_ex.c → ...1xx_HAL_Driver/Src/stm32f1xx_hal_pcd_ex.c
diff --git a/...32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c → ...32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c b/...32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c → ...32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c
diff --git a/...32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c → ...32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c b/...32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c → ...32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c
diff --git a/...1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c → ...1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c b/...1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c → ...1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c
diff --git a/...2F1xx_HAL_Driver/Src/stm32f1xx_hal_sram.c → ...2F1xx_HAL_Driver/Src/stm32f1xx_hal_sram.c b/...2F1xx_HAL_Driver/Src/stm32f1xx_hal_sram.c → ...2F1xx_HAL_Driver/Src/stm32f1xx_hal_sram.c
diff --git a/...32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c → ...32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c b/...32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c → ...32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c
diff --git a/...1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c → ...1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c b/...1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c → ...1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c
diff --git a/...32F1xx_HAL_Driver/Src/stm32f1xx_ll_fsmc.c → ...32F1xx_HAL_Driver/Src/stm32f1xx_ll_fsmc.c b/...32F1xx_HAL_Driver/Src/stm32f1xx_ll_fsmc.c → ...32F1xx_HAL_Driver/Src/stm32f1xx_ll_fsmc.c
diff --git a/...M32F1xx_HAL_Driver/Src/stm32f1xx_ll_usb.c → ...M32F1xx_HAL_Driver/Src/stm32f1xx_ll_usb.c b/...M32F1xx_HAL_Driver/Src/stm32f1xx_ll_usb.c → ...M32F1xx_HAL_Driver/Src/stm32f1xx_ll_usb.c
diff --git a/STM32/FamicomDumper.ioc → FamicomDumper/FamicomDumper.ioc b/STM32/FamicomDumper.ioc → FamicomDumper/FamicomDumper.ioc
@@ -1,4 +1,7 @@
 #MicroXplorer Configuration settings - do not modify
+CAD.formats=
+CAD.pinconfig=
+CAD.provider=
 Dma.Request0=TIM5_CH3/UP
 Dma.RequestsNb=1
 Dma.TIM5_CH3/UP.0.Direction=DMA_MEMORY_TO_PERIPH
@@ -103,8 +106,8 @@ Mcu.PinsNb=57
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32F103ZETx
-MxCube.Version=6.6.1
-MxDb.Version=DB.6.0.60
+MxCube.Version=6.10.0
+MxDb.Version=DB.6.0.100
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 NVIC.DMA2_Channel2_IRQn=true\:0\:0\:false\:false\:true\:false\:true\:true
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
@@ -215,18 +218,21 @@ ProjectManager.FreePins=false
 ProjectManager.HalAssertFull=false
 ProjectManager.HeapSize=0x200
 ProjectManager.KeepUserCode=true
-ProjectManager.LastFirmware=true
+ProjectManager.LastFirmware=false
 ProjectManager.LibraryCopy=1
 ProjectManager.MainLocation=Core/Src
 ProjectManager.NoMain=false
 ProjectManager.PreviousToolchain=STM32CubeIDE
 ProjectManager.ProjectBuild=false
 ProjectManager.ProjectFileName=FamicomDumper.ioc
 ProjectManager.ProjectName=FamicomDumper
+ProjectManager.ProjectStructure=
 ProjectManager.RegisterCallBack=
 ProjectManager.StackSize=0x400
 ProjectManager.TargetToolchain=STM32CubeIDE
 ProjectManager.ToolChainLocation=
+ProjectManager.UAScriptAfterPath=
+ProjectManager.UAScriptBeforePath=
 ProjectManager.UnderRoot=true
 ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-MX_DMA_Init-DMA-false-HAL-true,3-SystemClock_Config-RCC-false-HAL-false,4-MX_FSMC_Init-FSMC-false-HAL-true,5-MX_USB_DEVICE_Init-USB_DEVICE-false-HAL-false,6-MX_TIM2_Init-TIM2-false-HAL-true,7-MX_TIM5_Init-TIM5-false-HAL-true,8-MX_TIM1_Init-TIM1-false-HAL-true,9-MX_TIM3_Init-TIM3-false-HAL-true,10-MX_TIM4_Init-TIM4-false-HAL-true
 RCC.ADCFreqValue=36000000

diff --git a/...B_Device_Library/Class/CDC/Inc/usbd_cdc.h → ...B_Device_Library/Class/CDC/Inc/usbd_cdc.h b/...B_Device_Library/Class/CDC/Inc/usbd_cdc.h → ...B_Device_Library/Class/CDC/Inc/usbd_cdc.h
diff --git a/...B_Device_Library/Class/CDC/Src/usbd_cdc.c → ...B_Device_Library/Class/CDC/Src/usbd_cdc.c b/...B_Device_Library/Class/CDC/Src/usbd_cdc.c → ...B_Device_Library/Class/CDC/Src/usbd_cdc.c
diff --git a/...2_USB_Device_Library/Core/Inc/usbd_core.h → ...2_USB_Device_Library/Core/Inc/usbd_core.h b/...2_USB_Device_Library/Core/Inc/usbd_core.h → ...2_USB_Device_Library/Core/Inc/usbd_core.h
diff --git a/...USB_Device_Library/Core/Inc/usbd_ctlreq.h → ...USB_Device_Library/Core/Inc/usbd_ctlreq.h b/...USB_Device_Library/Core/Inc/usbd_ctlreq.h → ...USB_Device_Library/Core/Inc/usbd_ctlreq.h
diff --git a/...32_USB_Device_Library/Core/Inc/usbd_def.h → ...32_USB_Device_Library/Core/Inc/usbd_def.h b/...32_USB_Device_Library/Core/Inc/usbd_def.h → ...32_USB_Device_Library/Core/Inc/usbd_def.h
diff --git a/..._USB_Device_Library/Core/Inc/usbd_ioreq.h → ..._USB_Device_Library/Core/Inc/usbd_ioreq.h b/..._USB_Device_Library/Core/Inc/usbd_ioreq.h → ..._USB_Device_Library/Core/Inc/usbd_ioreq.h
diff --git a/...2_USB_Device_Library/Core/Src/usbd_core.c → ...2_USB_Device_Library/Core/Src/usbd_core.c b/...2_USB_Device_Library/Core/Src/usbd_core.c → ...2_USB_Device_Library/Core/Src/usbd_core.c
diff --git a/...USB_Device_Library/Core/Src/usbd_ctlreq.c → ...USB_Device_Library/Core/Src/usbd_ctlreq.c b/...USB_Device_Library/Core/Src/usbd_ctlreq.c → ...USB_Device_Library/Core/Src/usbd_ctlreq.c
diff --git a/..._USB_Device_Library/Core/Src/usbd_ioreq.c → ..._USB_Device_Library/Core/Src/usbd_ioreq.c b/..._USB_Device_Library/Core/Src/usbd_ioreq.c → ..._USB_Device_Library/Core/Src/usbd_ioreq.c
diff --git a/STM32/STM32F103ZETX_FLASH.ld → FamicomDumper/STM32F103ZETX_FLASH.ld b/STM32/STM32F103ZETX_FLASH.ld → FamicomDumper/STM32F103ZETX_FLASH.ld
@@ -30,8 +30,8 @@ ENTRY(Reset_Handler)
 /* Highest address of the user mode stack */
 _estack = ORIGIN(RAM) + LENGTH(RAM);	/* end of "RAM" Ram type memory */
 
-_Min_Heap_Size = 0x200 ;	/* required amount of heap  */
-_Min_Stack_Size = 0x400 ;	/* required amount of stack */
+_Min_Heap_Size = 0x200;	/* required amount of heap  */
+_Min_Stack_Size = 0x400;	/* required amount of stack */
 
 /* Memories definition */
 MEMORY

diff --git a/STM32/STM32F103ZETX_FLASH_debug.ld → FamicomDumper/STM32F103ZETX_FLASH_debug.ld b/STM32/STM32F103ZETX_FLASH_debug.ld → FamicomDumper/STM32F103ZETX_FLASH_debug.ld
@@ -30,8 +30,8 @@ ENTRY(Reset_Handler)
 /* Highest address of the user mode stack */
 _estack = ORIGIN(RAM) + LENGTH(RAM);	/* end of "RAM" Ram type memory */
 
-_Min_Heap_Size = 0x200 ;	/* required amount of heap  */
-_Min_Stack_Size = 0x400 ;	/* required amount of stack */
+_Min_Heap_Size = 0x200;	/* required amount of heap  */
+_Min_Stack_Size = 0x400;	/* required amount of stack */
 
 /* Memories definition */
 MEMORY

diff --git a/STM32/USB_DEVICE/App/usb_device.c → FamicomDumper/USB_DEVICE/App/usb_device.c b/STM32/USB_DEVICE/App/usb_device.c → FamicomDumper/USB_DEVICE/App/usb_device.c
diff --git a/STM32/USB_DEVICE/App/usb_device.h → FamicomDumper/USB_DEVICE/App/usb_device.h b/STM32/USB_DEVICE/App/usb_device.h → FamicomDumper/USB_DEVICE/App/usb_device.h
diff --git a/STM32/USB_DEVICE/App/usbd_cdc_if.c → FamicomDumper/USB_DEVICE/App/usbd_cdc_if.c b/STM32/USB_DEVICE/App/usbd_cdc_if.c → FamicomDumper/USB_DEVICE/App/usbd_cdc_if.c
diff --git a/STM32/USB_DEVICE/App/usbd_cdc_if.h → FamicomDumper/USB_DEVICE/App/usbd_cdc_if.h b/STM32/USB_DEVICE/App/usbd_cdc_if.h → FamicomDumper/USB_DEVICE/App/usbd_cdc_if.h
@@ -49,8 +49,8 @@
   * @{
   */
 /* Define size for the receive and transmit buffer over CDC */
-#define APP_RX_DATA_SIZE  1000
-#define APP_TX_DATA_SIZE  1000
+#define APP_RX_DATA_SIZE  1024
+#define APP_TX_DATA_SIZE  1024
 /* USER CODE BEGIN EXPORTED_DEFINES */
 /* Define size for the receive and transmit buffer over CDC */
 /* It's up to user to redefine and/or remove those define */

diff --git a/STM32/USB_DEVICE/App/usbd_desc.c → FamicomDumper/USB_DEVICE/App/usbd_desc.c b/STM32/USB_DEVICE/App/usbd_desc.c → FamicomDumper/USB_DEVICE/App/usbd_desc.c
@@ -337,7 +337,9 @@ uint8_t * USBD_FS_InterfaceStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *leng
   */
 static void Get_SerialNum(void)
 {
-  uint32_t deviceserial0, deviceserial1, deviceserial2;
+  uint32_t deviceserial0;
+  uint32_t deviceserial1;
+  uint32_t deviceserial2;
 
   deviceserial0 = *(uint32_t *) DEVICE_ID1;
   deviceserial1 = *(uint32_t *) DEVICE_ID2;

diff --git a/STM32/USB_DEVICE/App/usbd_desc.h → FamicomDumper/USB_DEVICE/App/usbd_desc.h b/STM32/USB_DEVICE/App/usbd_desc.h → FamicomDumper/USB_DEVICE/App/usbd_desc.h
diff --git a/STM32/USB_DEVICE/Target/usbd_conf.c → FamicomDumper/USB_DEVICE/Target/usbd_conf.c b/STM32/USB_DEVICE/Target/usbd_conf.c → FamicomDumper/USB_DEVICE/Target/usbd_conf.c
diff --git a/STM32/USB_DEVICE/Target/usbd_conf.h → FamicomDumper/USB_DEVICE/Target/usbd_conf.h b/STM32/USB_DEVICE/Target/usbd_conf.h → FamicomDumper/USB_DEVICE/Target/usbd_conf.h