From 2275e13091e4de50397794f379e8afbee213572e Mon Sep 17 00:00:00 2001
From: rhgndf <16336768+rhgndf@users.noreply.github.com>
Date: Mon, 30 Oct 2023 21:25:08 +0800
Subject: [PATCH] Fix upload and 26v12 bits

---
 afterburner.ino      | 6 +++---
 src_pc/afterburner.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/afterburner.ino b/afterburner.ino
index 2d2f9d8..9237dfb 100644
--- a/afterburner.ino
+++ b/afterburner.ino
@@ -343,7 +343,7 @@ galinfo[]=
     {GAL20XV10, 0x65, 0x66,  1671, 24, 40,  40, 44, 1631, 5, 61, 60, 58,  5, 16, CFG_BASE_20XV, cfgXV10  , sizeof(cfgXV10)  , CFG_SET_ROW   , PINOUT_20V8   },
     {GAL22V10,  0x48, 0x49,  5892, 24, 44, 132, 44, 5828, 8, 61, 62, 58, 10, 16, CFG_BASE_22  , cfgV10   , sizeof(cfgV10)   , CFG_SET_ROW   , PINOUT_22V10  },
     {GAL26CV12, 0x58, 0x59,  6432, 28, 52, 122, 52, 6368, 8, 61, 60, 58, 12, 16, CFG_BASE_26CV, cfg26CV12, sizeof(cfg26CV12), CFG_SET_ROW   , PINOUT_22V10  },
-    {GAL26V12,  0x5D, 0x5D,  7912, 28, 52, 120, 52, 7848, 8, 61, 60, 58, 12, 16, CFG_BASE_26V , cfg26V12 , sizeof(cfg26V12) , CFG_SET_ROW   , PINOUT_22V10  },
+    {GAL26V12,  0x5D, 0x5D,  7912, 28, 52, 150, 52, 7848, 8, 61, 60, 58, 12, 16, CFG_BASE_26V , cfg26V12 , sizeof(cfg26V12) , CFG_SET_ROW   , PINOUT_22V10  },
     {GAL6001,   0x40, 0x41,  8294, 24, 78,  75, 97, 8222, 9, 63, 62, 96,  8,  8, CFG_BASE_600 , cfg6001  , sizeof(cfg6001)  , CFG_SET_ROW   , PINOUT_600    },
     {GAL6002,   0x44, 0x44,  8330, 24, 78,  75, 97, 8258, 9, 63, 62, 96,  8,  8, CFG_BASE_600 , cfg6002  , sizeof(cfg6002)  , CFG_SET_ROW   , PINOUT_600    },
     {ATF16V8B,  0x00, 0x00,  2194, 20, 32,  64, 32, 2056, 8, 63, 62, 58,  8, 60, CFG_BASE_16  , cfgV8AB  , sizeof(cfgV8AB)  , CFG_STROBE_ROW, PINOUT_16V8   },
@@ -2097,11 +2097,11 @@ static void writeGal()
         break;
     
     case GAL26CV12:
-        writeGalFuseMapV10(cfg26CV12, 1, 0);
+        writeGalFuseMapV10(cfg26CV12, 0, 0);
         break;
     
     case GAL26V12:
-        writeGalFuseMapV10(cfg26V12, 1, 0);
+        writeGalFuseMapV10(cfg26V12, 0, 0);
         break;
 
     case GAL20XV10:
diff --git a/src_pc/afterburner.c b/src_pc/afterburner.c
index d6c884f..4cab008 100644
--- a/src_pc/afterburner.c
+++ b/src_pc/afterburner.c
@@ -97,7 +97,7 @@ galinfo[] = {
     {GAL20XV10, 0x65, 0x66, "GAL20XV10", 1671, 24, 40,  40, 44, 1631, 5, 61, 60, 58,  5, 16, 31},
     {GAL22V10,  0x48, 0x49, "GAL22V10", 5892, 24, 44, 132, 44, 5828, 8, 61, 60, 58, 10, 16, 20},
     {GAL26CV12, 0x58, 0x59, "GAL26CV12", 6432, 28, 52, 122, 52, 6368, 8, 61, 60, 58, 12, 16},
-    {GAL26V12,  0x5D, 0x5D, "GAL26V12",  7912, 28, 52, 120, 52, 7848, 8, 61, 60, 58, 12, 16},
+    {GAL26V12,  0x5D, 0x5D, "GAL26V12",  7912, 28, 52, 150, 52, 7848, 8, 61, 60, 58, 12, 16},
     {GAL6001,   0x40, 0x41, "GAL6001", 8294, 24, 78, 75, 97, 8222, 9, 63, 62, 96, 8, 8, 68},
     {GAL6002,   0x44, 0x44, "GAL6002", 8330, 24, 78, 75, 97, 8258, 9, 63, 62, 96, 8, 8, 104},
     {ATF16V8B,  0x00, 0x00, "ATF16V8B", 2194, 20, 32, 64, 32, 2056, 8, 63, 54, 58, 8, 60, 82},
@@ -825,7 +825,7 @@ static char upload() {
     printf("\e[?25h");
 
     // send last unfinished fuse line
-    if (i % 32 && fuseSet) {
+    if ((i % 32 != 1) && fuseSet) {
         strcat(buf, "\r");
 #ifdef DEBUG_UPLOAD
         printf("%s\n", buf);