Fix patch offsets for KS1 and KS1M

jbatonnet · jbatonnet · commit ff13cba010c0 · 2025-12-31T18:39:16.000-05:00
diff --git a/files/3-rinkhals/opt/rinkhals/patches/K3SysUi.KS1M_2.1.6.sh b/files/3-rinkhals/opt/rinkhals/patches/K3SysUi.KS1M_2.1.6.sh
@@ -2,12 +2,12 @@
 
 # This script was automatically generated, don't modify it directly
 # Before MD5: 92d9dd4d001dd0d5bcd7b6aa52b2c05b
-# After MD5: c4b2175991e188c3725a7507ba3226de
+# After MD5: 057c46168172ec492f201886c111aa98
 
 TARGET=$1
 
 MD5=$(md5sum $TARGET | awk '{print $1}')
-if [ "$MD5" = "c4b2175991e188c3725a7507ba3226de" ]; then
+if [ "$MD5" = "057c46168172ec492f201886c111aa98" ]; then
     echo $TARGET is already patched, skipping...
     exit 0
 fi
@@ -17,19 +17,19 @@ if [ "$MD5" != "92d9dd4d001dd0d5bcd7b6aa52b2c05b" ]; then
 fi
 
 PATCH_FILE=/tmp/patch-$RANDOM.bin
-echo 'azMA6g7woOEvdXNlcmVtYWluL3JpbmtoYWxzLy5jdXJyZW50L29wdC9yaW5raGFscy91aS9yaW5raGFscy11aS5zaCAmIGVjaG8gJCEgPiAvdG1wL3JpbmtoYWxzL3JpbmtoYWxzLXVpLnBpZAB0aW1lb3V0IC10IDIgc3RyYWNlIC1xcXEgLWV0cmFjZT1ub25lIC1wICQoY2F0IC90bXAvcmlua2hhbHMvcmlua2hhbHMtdWkucGlkKSAyPiAvZGV2L251bGxybSAtZiAvdG1wL3JpbmtoYWxzL3JpbmtoYWxzLXVpLnBpZAAEAKDhAwBT45DM/xoAAJ/lAADqhIgVAGVo++tkAGWb++sAAJ/lAAAA6uqIFQBfaA8AUOP3//8KAAAAAADqRokVAFlo++sQABvlAACQ5QQgoOMBEKDjVrb+6xAAG+UAkOUQoONDuP7rd8z/6lJpbmtoYWxzAA==' | base64 -d > $PATCH_FILE
+echo 'FDkA6g7woOEvdXNlcmVtYWluL3JpbmtoYWxzLy5jdXJyZW50L29wdC9yaW5raGFscy91aS9yaW5raGFscy11aS5zaCAmIGVjaG8gJCEgPiAvdG1wL3JpbmtoYWxzL3JpbmtoYWxzLXVpLnBpZAB0aW1lb3V0IC10IDIgc3RyYWNlIC1xcXEgLWV0cmFjZT1ub25lIC1wICQoY2F0IC90bXAvcmlua2hhbHMvcmlua2hhbHMtdWkucGlkKSAyPiAvZGV2L251bGxybSAtZiAvdG1wL3JpbmtoYWxzL3JpbmtoYWxzLXVpLnBpZAAEAKDhAwBT4+fG/xoAAJ/lAADqhIgVAGVo++tkAGWb++sAAJ/lAAAA6uqIFQBfaA8AUOP3//8KAAAAAADqRokVAFlo++swABvlAACQ5QQgoOMBEKDjVrb+6zAAG+UAkOUQoONDuP7rzsb/6lJpbmtoYWxzAA==' | base64 -d > $PATCH_FILE
 
-dd if=$PATCH_FILE skip=0 ibs=1 of=$TARGET seek=1293240 obs=1 count=4 conv=notrunc # 0x13bbb8 / 0x14bbb8 > 0x6b3300ea
+dd if=$PATCH_FILE skip=0 ibs=1 of=$TARGET seek=1287444 obs=1 count=4 conv=notrunc # 0x13a514 / 0x14a514 > 0x143900ea
 dd if=$PATCH_FILE skip=4 ibs=1 of=$TARGET seek=1345664 obs=1 count=133 conv=notrunc # 0x148880 / 0x158880 > 0x0ef0a0e12f75736572656d61696e2f72696e6b68616c732f2e63757272656e742f6f70742f72696e6b68616c732f75692f72696e6b68616c732d75692e73682026206563686f202421203e202f746d702f72696e6b68616c732f72696e6b68616c732d75692e7069640074696d656f7574202d74203220737472616365202d717171202d65
 dd if=$PATCH_FILE skip=137 ibs=1 of=$TARGET seek=1345798 obs=1 count=63 conv=notrunc # 0x148906 / 0x158906 > 0x74726163653d6e6f6e65202d70202428636174202f746d702f72696e6b68616c732f72696e6b68616c732d75692e7069642920323e202f6465762f6e756c6c
 dd if=$PATCH_FILE skip=200 ibs=1 of=$TARGET seek=1345862 obs=1 count=36 conv=notrunc # 0x148946 / 0x158946 > 0x726d202d66202f746d702f72696e6b68616c732f72696e6b68616c732d75692e70696400
-dd if=$PATCH_FILE skip=236 ibs=1 of=$TARGET seek=1345900 obs=1 count=17 conv=notrunc # 0x14896c / 0x15896c > 0x0400a0e1030053e390ccff1a00009fe500
+dd if=$PATCH_FILE skip=236 ibs=1 of=$TARGET seek=1345900 obs=1 count=17 conv=notrunc # 0x14896c / 0x15896c > 0x0400a0e1030053e3e7c6ff1a00009fe500
 dd if=$PATCH_FILE skip=253 ibs=1 of=$TARGET seek=1345918 obs=1 count=12 conv=notrunc # 0x14897e / 0x15897e > 0x00ea848815006568fbeb6400
 dd if=$PATCH_FILE skip=265 ibs=1 of=$TARGET seek=1345932 obs=1 count=18 conv=notrunc # 0x14898c / 0x15898c > 0x659bfbeb00009fe5000000eaea8815005f68
 dd if=$PATCH_FILE skip=283 ibs=1 of=$TARGET seek=1345952 obs=1 count=10 conv=notrunc # 0x1489a0 / 0x1589a0 > 0x0f0050e3f7ffff0a0000
-dd if=$PATCH_FILE skip=293 ibs=1 of=$TARGET seek=1345964 obs=1 count=37 conv=notrunc # 0x1489ac / 0x1589ac > 0x000000ea468915005968fbeb10001be5000090e50420a0e30110a0e356b6feeb10001be500
+dd if=$PATCH_FILE skip=293 ibs=1 of=$TARGET seek=1345964 obs=1 count=37 conv=notrunc # 0x1489ac / 0x1589ac > 0x000000ea468915005968fbeb30001be5000090e50420a0e30110a0e356b6feeb30001be500
 dd if=$PATCH_FILE skip=330 ibs=1 of=$TARGET seek=1346002 obs=1 count=2 conv=notrunc # 0x1489d2 / 0x1589d2 > 0x90e5
-dd if=$PATCH_FILE skip=332 ibs=1 of=$TARGET seek=1346005 obs=1 count=11 conv=notrunc # 0x1489d5 / 0x1589d5 > 0x10a0e343b8feeb77ccffea
+dd if=$PATCH_FILE skip=332 ibs=1 of=$TARGET seek=1346005 obs=1 count=11 conv=notrunc # 0x1489d5 / 0x1589d5 > 0x10a0e343b8feebcec6ffea
 dd if=$PATCH_FILE skip=343 ibs=1 of=$TARGET seek=3824456 obs=1 count=9 conv=notrunc # 0x3a5b48 / 0x3b5b48 > 0x52696e6b68616c7300
 
 rm $PATCH_FILE
diff --git a/files/3-rinkhals/opt/rinkhals/patches/K3SysUi.KS1_2.5.9.9.sh b/files/3-rinkhals/opt/rinkhals/patches/K3SysUi.KS1_2.5.9.9.sh
@@ -2,12 +2,12 @@
 
 # This script was automatically generated, don't modify it directly
 # Before MD5: eafc70a0ccee6233f4435c4d4e83a231
-# After MD5: 443d409460ca9ee4c2da534a6915e8fc
+# After MD5: 66f5b848fe6d74549bef20de957738a3
 
 TARGET=$1
 
 MD5=$(md5sum $TARGET | awk '{print $1}')
-if [ "$MD5" = "443d409460ca9ee4c2da534a6915e8fc" ]; then
+if [ "$MD5" = "66f5b848fe6d74549bef20de957738a3" ]; then
     echo $TARGET is already patched, skipping...
     exit 0
 fi
@@ -17,18 +17,18 @@ if [ "$MD5" != "eafc70a0ccee6233f4435c4d4e83a231" ]; then
 fi
 
 PATCH_FILE=/tmp/patch-$RANDOM.bin
-echo 'azMA6g7woOEvdXNlcmVtYWluL3JpbmtoYWxzLy5jdXJyZW50L29wdC9yaW5raGFscy91aS9yaW5raGFscy11aS5zaCAmIGVjaG8gJCEgPiAvdG1wL3JpbmtoYWxzL3JpbmtoYWxzLXVpLnBpZAB0aW1lb3V0IC10IDIgc3RyYWNlIC1xcXEgLWV0cmFjZT1ub25lIC1wICQoY2F0IC90bXAvcmlua2hhbHMvcmlua2hhbHMtdWkucGlkKSAyPiAvZGV2L251bGxybSAtZiAvdG1wL3JpbmtoYWxzL3JpbmtoYWxzLXVpLnBpZAAEAKDhAwBT45DM/xoAAJ/lAADqjIgVAGNo++tkAGOb++sAAJ/lAAAA6vKIFQBdaA8AUOP3//8KAAAAAADqTokVAFdo++sQABvlAACQ5QQgoOMBEKDjVrb+6xAAG+UAkOUEEKDjQ7j+63fM/+pSaW5raGFscwA=' | base64 -d > $PATCH_FILE
+echo 'FDkA6g7woOEvdXNlcmVtYWluL3JpbmtoYWxzLy5jdXJyZW50L29wdC9yaW5raGFscy91aS9yaW5raGFscy11aS5zaCAmIGVjaG8gJCEgPiAvdG1wL3JpbmtoYWxzL3JpbmtoYWxzLXVpLnBpZAB0aW1lb3V0IC10IDIgc3RyYWNlIC1xcXEgLWV0cmFjZT1ub25lIC1wICQoY2F0IC90bXAvcmlua2hhbHMvcmlua2hhbHMtdWkucGlkKSAyPiAvZGV2L251bGxybSAtZiAvdG1wL3JpbmtoYWxzL3JpbmtoYWxzLXVpLnBpZAAEAKDhAwBT4+fG/xoAAJ/lAADqjIgVAGNo++tkAGOb++sAAJ/lAAAA6vKIFQBdaA8AUOP3//8KAAAAAADqTokVAFdo++swABvlAACQ5QQgoOMBEKDjVrb+6zAAG+UAkOUEEKDjQ7j+687G/+pSaW5raGFscwA=' | base64 -d > $PATCH_FILE
 
-dd if=$PATCH_FILE skip=0 ibs=1 of=$TARGET seek=1293248 obs=1 count=4 conv=notrunc # 0x13bbc0 / 0x14bbc0 > 0x6b3300ea
+dd if=$PATCH_FILE skip=0 ibs=1 of=$TARGET seek=1287452 obs=1 count=4 conv=notrunc # 0x13a51c / 0x14a51c > 0x143900ea
 dd if=$PATCH_FILE skip=4 ibs=1 of=$TARGET seek=1345672 obs=1 count=133 conv=notrunc # 0x148888 / 0x158888 > 0x0ef0a0e12f75736572656d61696e2f72696e6b68616c732f2e63757272656e742f6f70742f72696e6b68616c732f75692f72696e6b68616c732d75692e73682026206563686f202421203e202f746d702f72696e6b68616c732f72696e6b68616c732d75692e7069640074696d656f7574202d74203220737472616365202d717171202d65
 dd if=$PATCH_FILE skip=137 ibs=1 of=$TARGET seek=1345806 obs=1 count=63 conv=notrunc # 0x14890e / 0x15890e > 0x74726163653d6e6f6e65202d70202428636174202f746d702f72696e6b68616c732f72696e6b68616c732d75692e7069642920323e202f6465762f6e756c6c
 dd if=$PATCH_FILE skip=200 ibs=1 of=$TARGET seek=1345870 obs=1 count=36 conv=notrunc # 0x14894e / 0x15894e > 0x726d202d66202f746d702f72696e6b68616c732f72696e6b68616c732d75692e70696400
-dd if=$PATCH_FILE skip=236 ibs=1 of=$TARGET seek=1345908 obs=1 count=17 conv=notrunc # 0x148974 / 0x158974 > 0x0400a0e1030053e390ccff1a00009fe500
+dd if=$PATCH_FILE skip=236 ibs=1 of=$TARGET seek=1345908 obs=1 count=17 conv=notrunc # 0x148974 / 0x158974 > 0x0400a0e1030053e3e7c6ff1a00009fe500
 dd if=$PATCH_FILE skip=253 ibs=1 of=$TARGET seek=1345926 obs=1 count=12 conv=notrunc # 0x148986 / 0x158986 > 0x00ea8c8815006368fbeb6400
 dd if=$PATCH_FILE skip=265 ibs=1 of=$TARGET seek=1345940 obs=1 count=18 conv=notrunc # 0x148994 / 0x158994 > 0x639bfbeb00009fe5000000eaf28815005d68
 dd if=$PATCH_FILE skip=283 ibs=1 of=$TARGET seek=1345960 obs=1 count=10 conv=notrunc # 0x1489a8 / 0x1589a8 > 0x0f0050e3f7ffff0a0000
-dd if=$PATCH_FILE skip=293 ibs=1 of=$TARGET seek=1345972 obs=1 count=37 conv=notrunc # 0x1489b4 / 0x1589b4 > 0x000000ea4e8915005768fbeb10001be5000090e50420a0e30110a0e356b6feeb10001be500
-dd if=$PATCH_FILE skip=330 ibs=1 of=$TARGET seek=1346010 obs=1 count=14 conv=notrunc # 0x1489da / 0x1589da > 0x90e50410a0e343b8feeb77ccffea
+dd if=$PATCH_FILE skip=293 ibs=1 of=$TARGET seek=1345972 obs=1 count=37 conv=notrunc # 0x1489b4 / 0x1589b4 > 0x000000ea4e8915005768fbeb30001be5000090e50420a0e30110a0e356b6feeb30001be500
+dd if=$PATCH_FILE skip=330 ibs=1 of=$TARGET seek=1346010 obs=1 count=14 conv=notrunc # 0x1489da / 0x1589da > 0x90e50410a0e343b8feebcec6ffea
 dd if=$PATCH_FILE skip=344 ibs=1 of=$TARGET seek=3824360 obs=1 count=9 conv=notrunc # 0x3a5ae8 / 0x3b5ae8 > 0x52696e6b68616c7300
 
 rm $PATCH_FILE
diff --git a/files/3-rinkhals/opt/rinkhals/scripts/create-patch.py b/files/3-rinkhals/opt/rinkhals/scripts/create-patch.py
@@ -178,14 +178,14 @@ def patch_K3SysUi(binaryPath, modelCode, version):
         patchJumpAddress = 0x12b04c
         patchReturnAddress = 0x12b054
     elif modelCode == 'KS1' and version == '2.5.9.9':
-        buttonCallback = k3sysui.symbols['_ZZN10MainWindow26AcSettingGeneralPageUiInitEvENKUlRK11QModelIndexE0_clES2_']
-        patchJumpAddress = 0x14bbc0
-        patchReturnAddress = 0x14bbc8
+        buttonCallback = k3sysui.symbols['_ZZN10MainWindow21AcSettingDeviceUiInitEvENKUlRK11QModelIndexE0_clES2_']
+        patchJumpAddress = 0x14a51c
+        patchReturnAddress = 0x14a524
         
     elif modelCode == 'KS1M' and version == '2.1.6':
-        buttonCallback = k3sysui.symbols['_ZZN10MainWindow26AcSettingGeneralPageUiInitEvENKUlRK11QModelIndexE0_clES2_']
-        patchJumpAddress = 0x14bbb8
-        patchReturnAddress = 0x14bbc0
+        buttonCallback = k3sysui.symbols['_ZZN10MainWindow21AcSettingDeviceUiInitEvENKUlRK11QModelIndexE0_clES2_']
+        patchJumpAddress = 0x14a514
+        patchReturnAddress = 0x14a51c
 
     else:
         raise Exception('Unsupported model and version')
