2.4

lesserkuma · Jun 20, 2021 · 8435112 · 8435112
1 parent 00019e6
commit 8435112
Show file tree

Hide file tree

Showing 18 changed files with 168 additions and 295 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,10 @@
 # Release notes
+### v2.4 (released 2021-06-20)
+- Added support for 4050_4400_4000_4350_36L0R_6108 with M36L0R7050B *(thanks Jayro)*
+- Added support for AGB-E05-02 with JS28F128 *(thanks marv17)*
+- Confirmed support for SD007_TSOP_48BALL_V9 with 29LV320CBTC-70G *(thanks AcoVanConis)*
+- Fixed a bug when running FlashGBX without GUI support, the command line interface mode will now launch without extra parameters again *(thanks howie0210)*
+
 ### v2.3 (released 2021-06-08)
 - Added support for AGB-E05-06L with 29LV128DBT2C-90Q *(thanks marv17)*
 - Nintendo Power GB Memory Cartridges will now be unlocked properly even if they’re stuck in erase mode *(thanks Grender for testing)*

diff --git a/FlashGBX/FlashGBX.py b/FlashGBX/FlashGBX.py
@@ -33,7 +33,7 @@ def LoadConfig(args):
 	(config_version, fc_files) = ReadConfigFiles(args=args)
 	if config_version != Util.VERSION:
 		# Rename old files that have since been replaced/renamed/merged
-		deprecated_files = [ "fc_AGB_M36L0R705.txt", "fc_AGB_TEST.txt", "fc_DMG_TEST.txt", "fc_AGB_Nintendo_E201850.txt", "fc_AGB_Nintendo_E201868.txt", "config.ini", "fc_DMG_MX29LV320ABTC.txt", "fc_DMG_iG_4MB_MBC3_RTC.txt", "fc_AGB_Flash2Advance.txt", "fc_AGB_MX29LV640_AUDIO.txt" ]
+		deprecated_files = [ "fc_AGB_TEST.txt", "fc_DMG_TEST.txt", "fc_AGB_Nintendo_E201850.txt", "fc_AGB_Nintendo_E201868.txt", "config.ini", "fc_DMG_MX29LV320ABTC.txt", "fc_DMG_iG_4MB_MBC3_RTC.txt", "fc_AGB_Flash2Advance.txt", "fc_AGB_MX29LV640_AUDIO.txt", "fc_AGB_M36L0R7050T.txt", "fc_AGB_M36L0R8060B.txt", "fc_AGB_M36L0R8060T.txt", "fc_AGB_iG_32MB_S29GL512N.txt" ]
 		for file in deprecated_files:
 			if os.path.exists(config_path + "/" + file):
 				os.rename(config_path + "/" + file, config_path + "/" + file + "_" + datetime.datetime.now().strftime("%Y%m%d%H%M%S") + ".bak")

diff --git a/FlashGBX/Util.py b/FlashGBX/Util.py
@@ -7,7 +7,7 @@
 
 # Common constants
 APPNAME = "FlashGBX"
-VERSION_PEP440 = "2.3"
+VERSION_PEP440 = "2.4"
 VERSION = "v{:s}".format(VERSION_PEP440)
 DEBUG = False
 

diff --git a/FlashGBX/config/db_AGB.json b/FlashGBX/config/db_AGB.json
@@ -10394,13 +10394,6 @@
   "st": 3,
   "gc": "AKWE"
  },
- "2fbd24919908ab60cf3ff60a9d62430b2beaca87": {
-  "rs": 1048576,
-  "rc": 3363418944,
-  "ss": 0,
-  "st": 0,
-  "gc": "PASS"
- },
  "28ff9cc06162a4b205f13f6cd44829aa226fbb61": {
   "rs": 16777216,
   "rc": 3508024577,

diff --git a/FlashGBX/config/fc_AGB_M36L0R7050T.txt → FlashGBX/config/fc_AGB_M36L0R705.txt b/FlashGBX/config/fc_AGB_M36L0R7050T.txt → FlashGBX/config/fc_AGB_M36L0R705.txt
@@ -1,64 +1,63 @@
-{
-	"type":"AGB",
-	"names":[
-		"4455_4400_4000_4350_36L0R_V3 with M36L0R7050T",
-		"4050_4400_4000_4350_36L0R_V5 with M36L0R7050T"
-	],
-	"flash_ids":[
-		[ 0x20, 0x00, 0xC4, 0x88 ],
-		[ 0x20, 0x00, 0xC4, 0x88 ]
-	],
-	"voltage":3.3,
-	"flash_size":0x1000000,
-	"sector_size":[
-		[0x20000, 127],
-		[0x08000, 4]
-	],
-	"reset_every":0x100000,
-	"command_set":"INTEL",
-	"commands":{
-		"reset":[
-			[ 0, 0x50 ],
-			[ 0, 0xFF ]
-		],
-		"read_identifier":[
-			[ 0, 0x90 ]
-		],
-		"sector_erase":[
-			[ "SA", 0x60 ],
-			[ "SA", 0xD0 ],
-			[ "SA", 0x20 ],
-			[ "SA", 0xD0 ]
-		],
-		"sector_erase_wait_for":[
-			[ null, null, null ],
-			[ null, null, null ],
-			[ null, null, null ],
-			[ "SA", 0x80, 0xFFFF ]
-		],
-		"buffer_write":[
-			[ "SA", 0xE8 ],
-			[ "SA", "BS" ],
-			[ "PA", "PD" ],
-			[ "SA", 0xD0 ],
-			[ "SA", 0xFF ]
-		],
-		"buffer_write_wait_for":[
-			[ "SA", 0x80, 0xFFFF ],
-			[ null, null, null ],
-			[ null, null, null ],
-			[ "SA", 0x80, 0xFFFF ],
-			[ null, null, null ]
-		],
-		"single_write":[
-			[ 0, 0x70 ],
-			[ 0, 0x10 ],
-			[ "PA", "PD" ]
-		],
-		"single_write_wait_for":[
-			[ 0, 0x80, 0x80 ],
-			[ null, null, null ],
-			[ null, null, null ]
-		]
-	}
-}
+{
+	"type":"AGB",
+	"names":[
+		"4455_4400_4000_4350_36L0R_V3 with M36L0R7050T",
+		"4050_4400_4000_4350_36L0R_V5 with M36L0R7050T",
+		"4050_4400_4000_4350_36L0R_6108 with M36L0R7050B"
+	],
+	"flash_ids":[
+		[ 0x20, 0x00, 0xC4, 0x88 ],
+		[ 0x20, 0x00, 0xC4, 0x88 ],
+		[ 0x20, 0x00, 0xC6, 0x88 ]
+	],
+	"voltage":3.3,
+	"flash_size":0x1000000,
+	"sector_size_from_cfi":true,
+	"reset_every":0x100000,
+	"command_set":"INTEL",
+	"commands":{
+		"reset":[
+			[ 0, 0x50 ],
+			[ 0, 0xFF ]
+		],
+		"read_identifier":[
+			[ 0, 0x90 ]
+		],
+		"sector_erase":[
+			[ "SA", 0x60 ],
+			[ "SA", 0xD0 ],
+			[ "SA", 0x20 ],
+			[ "SA", 0xD0 ]
+		],
+		"sector_erase_wait_for":[
+			[ null, null, null ],
+			[ null, null, null ],
+			[ null, null, null ],
+			[ "SA", 0x80, 0xFFFF ]
+		],
+		"buffer_write":[
+			[ "SA", 0xE8 ],
+			[ "SA", "BS" ],
+			[ "PA", "PD" ],
+			[ "SA", 0xD0 ],
+			[ "SA", 0xFF ]
+		],
+		"buffer_write_wait_for":[
+			[ "SA", 0x80, 0xFFFF ],
+			[ null, null, null ],
+			[ null, null, null ],
+			[ "SA", 0x80, 0xFFFF ],
+			[ null, null, null ]
+		],
+		"single_write":[
+			[ 0, 0x70 ],
+			[ 0, 0x10 ],
+			[ "PA", "PD" ]
+		],
+		"single_write_wait_for":[
+			[ 0, 0x80, 0x80 ],
+			[ null, null, null ],
+			[ null, null, null ]
+		]
+	}
+}
diff --git a/FlashGBX/config/fc_AGB_M36L0R8060T.txt → FlashGBX/config/fc_AGB_M36L0R806.txt b/FlashGBX/config/fc_AGB_M36L0R8060T.txt → FlashGBX/config/fc_AGB_M36L0R806.txt
@@ -1,66 +1,67 @@
-{
-	"type":"AGB",
-	"names":[
-		"4050_4400_4000_4350_36L0R_V5 with M36L0R8060T",
-		"36L0R8-39VF512 with M36L0R8060T",
-		"4050_4400_4000_4350_36L0R_V5 with 4050L0YTQ2"
-	],
-	"flash_ids":[
-		[ 0x20, 0x00, 0x0E, 0x88 ],
-		[ 0x20, 0x00, 0x0E, 0x88 ],
-		[ 0x8A, 0x00, 0x0E, 0x88 ]
-	],
-	"voltage":3.3,
-	"flash_size":0x2000000,
-	"sector_size":[
-		[0x20000, 255],
-		[0x08000, 4]
-	],
-	"reset_every":0x100000,
-	"command_set":"INTEL",
-	"commands":{
-		"reset":[
-			[ 0, 0x50 ],
-			[ 0, 0xFF ]
-		],
-		"read_identifier":[
-			[ 0, 0x90 ]
-		],
-		"sector_erase":[
-			[ "SA", 0x60 ],
-			[ "SA", 0xD0 ],
-			[ "SA", 0x20 ],
-			[ "SA", 0xD0 ]
-		],
-		"sector_erase_wait_for":[
-			[ null, null, null ],
-			[ null, null, null ],
-			[ null, null, null ],
-			[ "SA", 0x80, 0xFFFF ]
-		],
-		"buffer_write":[
-			[ "SA", 0xE8 ],
-			[ "SA", "BS" ],
-			[ "PA", "PD" ],
-			[ "SA", 0xD0 ],
-			[ "SA", 0xFF ]
-		],
-		"buffer_write_wait_for":[
-			[ "SA", 0x80, 0xFFFF ],
-			[ null, null, null ],
-			[ null, null, null ],
-			[ "SA", 0x80, 0xFFFF ],
-			[ null, null, null ]
-		],
-		"single_write":[
-			[ 0, 0x70 ],
-			[ 0, 0x10 ],
-			[ "PA", "PD" ]
-		],
-		"single_write_wait_for":[
-			[ 0, 0x80, 0x80 ],
-			[ null, null, null ],
-			[ null, null, null ]
-		]
-	}
-}
+{
+	"type":"AGB",
+	"names":[
+		"36L0R8-39VF512 with M36L0R8060B",
+		"4350Q2 with 4350LLYBQ2",
+		"4050_4400_4000_4350_36L0R_V5 with M36L0R8060T",
+		"36L0R8-39VF512 with M36L0R8060T",
+		"4050_4400_4000_4350_36L0R_V5 with 4050L0YTQ2"
+	],
+	"flash_ids":[
+		[ 0x20, 0x00, 0x0D, 0x88 ],
+		[ 0x8A, 0x00, 0x10, 0x88 ],
+		[ 0x20, 0x00, 0x0E, 0x88 ],
+		[ 0x20, 0x00, 0x0E, 0x88 ],
+		[ 0x8A, 0x00, 0x0E, 0x88 ]
+	],
+	"voltage":3.3,
+	"flash_size":0x2000000,
+	"sector_size_from_cfi":true,
+	"reset_every":0x100000,
+	"command_set":"INTEL",
+	"commands":{
+		"reset":[
+			[ 0, 0x50 ],
+			[ 0, 0xFF ]
+		],
+		"read_identifier":[
+			[ 0, 0x90 ]
+		],
+		"sector_erase":[
+			[ "SA", 0x60 ],
+			[ "SA", 0xD0 ],
+			[ "SA", 0x20 ],
+			[ "SA", 0xD0 ]
+		],
+		"sector_erase_wait_for":[
+			[ null, null, null ],
+			[ null, null, null ],
+			[ null, null, null ],
+			[ "SA", 0x80, 0xFFFF ]
+		],
+		"buffer_write":[
+			[ "SA", 0xE8 ],
+			[ "SA", "BS" ],
+			[ "PA", "PD" ],
+			[ "SA", 0xD0 ],
+			[ "SA", 0xFF ]
+		],
+		"buffer_write_wait_for":[
+			[ "SA", 0x80, 0xFFFF ],
+			[ null, null, null ],
+			[ null, null, null ],
+			[ "SA", 0x80, 0xFFFF ],
+			[ null, null, null ]
+		],
+		"single_write":[
+			[ 0, 0x70 ],
+			[ 0, 0x10 ],
+			[ "PA", "PD" ]
+		],
+		"single_write_wait_for":[
+			[ 0, 0x80, 0x80 ],
+			[ null, null, null ],
+			[ null, null, null ]
+		]
+	}
+}
diff --git a/FlashGBX/config/fc_AGB_M36L0R8060B.txt b/FlashGBX/config/fc_AGB_M36L0R8060B.txt
diff --git a/FlashGBX/config/fc_AGB_MSP55LV128M.txt b/FlashGBX/config/fc_AGB_MSP55LV128M.txt
@@ -8,7 +8,8 @@
 		"BX2006_TSOPBGA_0106 with M29W640GB6AZA6",
 		"AGB-E05-02 with M29W128GH",
 		"AGB-E05-02 with M29W128FH",
-		"2006_TSOP_64BALL_6106 with W29GL128SH9B"
+		"2006_TSOP_64BALL_6106 with W29GL128SH9B",
+		"AGB-E05-02 with JS28F128"
 	],
 	"flash_ids":[
 		[ 0x02, 0x00, 0x7D, 0x22 ],
@@ -18,7 +19,8 @@
 		[ 0x20, 0x00, 0x7D, 0x22 ],
 		[ 0x20, 0x00, 0x7D, 0x22 ],
 		[ 0x20, 0x00, 0x7D, 0x22 ],
-		[ 0xEF, 0x00, 0x7D, 0x22 ]
+		[ 0xEF, 0x00, 0x7D, 0x22 ],
+		[ 0x8A, 0x00, 0x7D, 0x22 ]
 	],
 	"voltage":3.3,
 	"flash_size":0x1000000,