diff options
| author | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2022-12-01 13:23:26 +0300 |
|---|---|---|
| committer | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2022-12-01 13:23:26 +0300 |
| commit | af1fb758d3f0d69d9941969d4803619903676bb7 (patch) | |
| tree | 61792c95970ce3ae5d0f90d5b8b31101fe01c5fd | |
| parent | 1a9222505383c553aba0846574cf55c7af425be1 (diff) | |
Files renamed
| -rw-r--r-- | CPLD/FamicomDumper.v | 4 | ||||
| -rw-r--r-- | STM32_bootloader/.cproject | 10 | ||||
| -rw-r--r-- | board/FamicomDumper_board.dip (renamed from board/FamicomDumper.dip) | bin | 2282129 -> 2282129 bytes | |||
| -rw-r--r-- | schematic/FamicomDumper_bom.png (renamed from schematic/bom.png) | bin | 213348 -> 213348 bytes | |||
| -rw-r--r-- | schematic/FamicomDumper_schematic.dch (renamed from schematic/schematic.dch) | bin | 560085 -> 560085 bytes |
5 files changed, 11 insertions, 3 deletions
diff --git a/CPLD/FamicomDumper.v b/CPLD/FamicomDumper.v index fbb98fe..78cf3fe 100644 --- a/CPLD/FamicomDumper.v +++ b/CPLD/FamicomDumper.v @@ -43,8 +43,8 @@ assign ppu_oe = !(!ne2 && ne1); assign ppu_dir = !(!ne2 && !noe);
assign na13 = !a13;
assign nwait = !waiting;
-assign coolboy_oe = !(ne1_active && m2 && a15 && reg_cpu_rw);
-assign coolboy_we = !(ne1_active && m2 && a15 && !reg_cpu_rw);
+assign coolboy_oe = !(m2 && a15 && ne1_active && reg_cpu_rw);
+assign coolboy_we = !(m2 && a15 && ne1_active && !reg_cpu_rw);
reg [2:0] stage = 0;
reg [5:0] wait_timer = 0;
diff --git a/STM32_bootloader/.cproject b/STM32_bootloader/.cproject index d8d57da..8d962dd 100644 --- a/STM32_bootloader/.cproject +++ b/STM32_bootloader/.cproject @@ -109,6 +109,7 @@ <option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1611901550" 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.216387807" 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.1500792999" 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.option.toolchain.value.workspace || STM32F103ZETx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../FATFS/App | ../USB_DEVICE/Target | ../Drivers/CMSIS/Device/ST/STM32F1xx/Include | ../Drivers/CMSIS/Include | ../Core/Inc | ../USB_DEVICE/App | ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy | ../Drivers/STM32F1xx_HAL_Driver/Inc | ../Middlewares/ST/STM32_USB_Device_Library/Class/MSC/Inc | ../FATFS/Target | ../Middlewares/ST/STM32_USB_Device_Library/Core/Inc | ../Middlewares/Third_Party/FatFs/src || || || STM32F103xE | USE_HAL_DRIVER || || Drivers | Core/Startup | Middlewares | Core | FATFS | 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.1840373438" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.convertbinary" value="true" valueType="boolean"/>
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.668397026" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
<builder buildPath="${workspace_loc:/FamicomDumperBootloader}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1511456956" 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.1694103336" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
@@ -187,5 +188,12 @@ <autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
</storageModule>
- <storageModule moduleId="refreshScope"/>
+ <storageModule moduleId="refreshScope" versionNumber="2">
+ <configuration configurationName="Debug">
+ <resource resourceType="PROJECT" workspacePath="/FamicomDumperBootloader"/>
+ </configuration>
+ <configuration configurationName="Release">
+ <resource resourceType="PROJECT" workspacePath="/FamicomDumperBootloader"/>
+ </configuration>
+ </storageModule>
</cproject>
\ No newline at end of file diff --git a/board/FamicomDumper.dip b/board/FamicomDumper_board.dip Binary files differindex 1eb705e..1eb705e 100644 --- a/board/FamicomDumper.dip +++ b/board/FamicomDumper_board.dip diff --git a/schematic/bom.png b/schematic/FamicomDumper_bom.png Binary files differindex 77a1eac..77a1eac 100644 --- a/schematic/bom.png +++ b/schematic/FamicomDumper_bom.png diff --git a/schematic/schematic.dch b/schematic/FamicomDumper_schematic.dch Binary files differindex 12bc423..12bc423 100644 --- a/schematic/schematic.dch +++ b/schematic/FamicomDumper_schematic.dch |
