salfter/GWRAM.SYSTEM
1
0
Fork 0
mirror of https://github.com/garrettsworkshop/GWRAM.SYSTEM.git synced 2025-10-24 11:50:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'RC' into release

Browse Source
This commit is contained in:
Zane Kaminski
2024-08-04 02:57:35 -04:00
parent ba6a9cf09b 4994bc0459
commit 459d71483e
4 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -66,5 +66,7 @@ clean:
rm -fr bin obj rm -fr bin obj
copy: bin/GWRAM.po copy: bin/GWRAM.po
cp bin/GWRAM.po /Volumes/FLOPPYEMU/GWRAM.po cp bin/GWRAM.po /Volumes/FLOPPYEMU/GWRAM.po || true
diskutil unmount /Volumes/FLOPPYEMU/ diskutil unmount /Volumes/FLOPPYEMU/ || true
cp bin/GWRAM.po /Volumes/A2/GWRAM.po || true
diskutil unmount /Volumes/A2/ || true

BIN
bin/GWRAM.dbg.po
View File

Binary file not shown.

BIN
bin/GWRAM.po
View File

Binary file not shown.

16
ram2e.c
View File

@@ -61,6 +61,7 @@ int ram2e_main(void)
char nvm = false; char nvm = false;
int reset_count = 0; int reset_count = 0;
int version_count = 0;
ramworks_save(); // Save what will be clobbered ramworks_save(); // Save what will be clobbered
if (auxram_detect()) { if (auxram_detect()) {
@@ -71,7 +72,7 @@ int ram2e_main(void)
} else if (ram2e_detect(0xFD)) { // MachXO2 } else if (ram2e_detect(0xFD)) { // MachXO2
type = 0xFD; type = 0xFD;
} else { type = 0; } } else { type = 0; }
} } else { type = 0; }
if (type == 0) { if (type == 0) {
#ifndef SKIP_RAM2E_DETECT #ifndef SKIP_RAM2E_DETECT
@@ -151,6 +152,19 @@ int ram2e_main(void)
ram2e_flashled(10); ram2e_flashled(10);
} }
} }
reset_count = 0;
continue;
} case 'V': {
version_count++;
if (version_count >= 5) {
if (ram2e_detect(0xF1)) { gwcputsxy(34, 2, "revC"); }
else { gwcputsxy(34, 2, "revB"); }
if (type==0xFF) { gwcputsxy(28, 2, "typeA"); }
else if (type==0xFE) { gwcputsxy(28, 2, "typeB"); }
else if (type==0xFD) { gwcputsxy(28, 2, "typeC"); }
else { gwcputsxy(28, 2, "type?"); }
}
reset_count = 0;
continue; continue;
} case 'R': { } case 'R': {
reset_count++; reset_count++;