Merge branch 'master' into patch-1

This commit is contained in:
sanni 2018-10-14 10:16:07 +02:00 committed by GitHub
commit 4f6f79b3b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 12186 additions and 12187 deletions

View File

@ -2048,8 +2048,7 @@ void getFramType() {
display_Update(); display_Update();
} }
// 29L1100KC-15B0 compat MX29L1101 // 29L1100KC-15B0 compat MX29L1101
else if ((sdBuffer[7] == 0x8e ) || (sdBuffer[7] == 0x84 )) else if ((sdBuffer[7] == 0x8e ) || (sdBuffer[7] == 0x84 )) {
{
flashramType = 1; flashramType = 1;
MN63F81MPN = false; MN63F81MPN = false;
println_Msg(F("Type: 29L1100KC-15B0")); println_Msg(F("Type: 29L1100KC-15B0"));