Skip to content

Commit 952c1fe

Browse files
Add missing CS serials (#25)
Also add a simple CI builder
1 parent 1583720 commit 952c1fe

File tree

5 files changed

+36
-4
lines changed

5 files changed

+36
-4
lines changed

.github/workflows/CI.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
pull_request:
6+
workflow_dispatch:
7+
8+
jobs:
9+
CI:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v4
13+
- name: Compile KindleTool
14+
run: |
15+
sudo apt-get install -y zlib1g-dev libarchive-dev nettle-dev
16+
make
17+
- uses: actions/upload-artifact@v4
18+
with:
19+
name: kindletool
20+
path: KindleTool/Release/kindletool

KindleTool/create.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1685,7 +1685,7 @@ int
16851685
info.devices[info.num_devices++] = KindlePaperWhite6Unknown_3J5;
16861686
info.devices[info.num_devices++] = KindlePaperWhite6Unknown_3JS;
16871687
}
1688-
} else if (strcasecmp(optarg, "scribe2") == 0) {
1688+
} else if (strcasecmp(optarg, "scribe2") == 0) {
16891689
memcpy(info.magic_number, "FD04", MAGIC_NUMBER_LENGTH);
16901690
const unsigned int num_aliased_devices = 0 + (kt_with_unknown_devcodes * 8);
16911691
info.devices = realloc(info.devices,
@@ -1702,7 +1702,7 @@ int
17021702
}
17031703
} else if (strcasecmp(optarg, "colorsoft") == 0) {
17041704
memcpy(info.magic_number, "FD04", MAGIC_NUMBER_LENGTH);
1705-
const unsigned int num_aliased_devices = 0 + (kt_with_unknown_devcodes * 10);
1705+
const unsigned int num_aliased_devices = 0 + (kt_with_unknown_devcodes * 12);
17061706
info.devices = realloc(info.devices,
17071707
(info.num_devices + num_aliased_devices) * sizeof(Device));
17081708
if (kt_with_unknown_devcodes) {
@@ -1716,6 +1716,8 @@ int
17161716
info.devices[info.num_devices++] = KindleColorSoftUnknown_3JT;
17171717
info.devices[info.num_devices++] = KindleColorSoftUnknown_3J6;
17181718
info.devices[info.num_devices++] = KindleColorSoftUnknown_456;
1719+
info.devices[info.num_devices++] = KindleColorSoftUnknown_455;
1720+
info.devices[info.num_devices++] = KindleColorSoftUnknown_4EP;
17191721
}
17201722
} else if (strcasecmp(optarg, "kindle5") == 0) {
17211723
memcpy(info.magic_number, "FD04", MAGIC_NUMBER_LENGTH);
@@ -1737,8 +1739,8 @@ int
17371739
3 + (kt_with_unknown_devcodes * 5) + // Scribe
17381740
0 + (kt_with_unknown_devcodes * 7) + // KT6
17391741
0 + (kt_with_unknown_devcodes * 10) + // PW6
1740-
0 + (kt_with_unknown_devcodes * 8) + // Scribe 2
1741-
0 + (kt_with_unknown_devcodes * 10); // CS
1742+
0 + (kt_with_unknown_devcodes * 8) + // Scribe 2
1743+
0 + (kt_with_unknown_devcodes * 12); // CS
17421744
info.devices = realloc(info.devices,
17431745
(info.num_devices + num_aliased_devices) * sizeof(Device));
17441746
// K5
@@ -1952,6 +1954,8 @@ int
19521954
info.devices[info.num_devices++] = KindleColorSoftUnknown_3JT;
19531955
info.devices[info.num_devices++] = KindleColorSoftUnknown_3J6;
19541956
info.devices[info.num_devices++] = KindleColorSoftUnknown_456;
1957+
info.devices[info.num_devices++] = KindleColorSoftUnknown_455;
1958+
info.devices[info.num_devices++] = KindleColorSoftUnknown_4EP;
19551959
}
19561960
} else if (kt_with_unknown_devcodes &&
19571961
(strcasecmp(optarg, "unknown") == 0 || strcasecmp(optarg, "datamined") == 0)) {

KindleTool/kindle_tool.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,10 @@ const char*
552552
return "Kindle ColorSoft (2024) (Unknown Variant 3J6)";
553553
case KindleColorSoftUnknown_456:
554554
return "Kindle ColorSoft (2024) (Unknown Variant 456)";
555+
case KindleColorSoftUnknown_455:
556+
return "Kindle ColorSoft (2024) (Unknown Variant 455)";
557+
case KindleColorSoftUnknown_4EP:
558+
return "Kindle ColorSoft (2024) (Unknown Variant 4EP)";
555559
case KindleUnknown:
556560
default:
557561
return "Unknown";

KindleTool/kindle_tool.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,8 @@ typedef enum
391391
KindleColorSoftUnknown_3JT = 0xE5B, // 3JT?
392392
KindleColorSoftUnknown_3J6 = 0xE46, // 3J6?
393393
KindleColorSoftUnknown_456 = 0x10A6, // 456?
394+
KindleColorSoftUnknown_455 = 0x10A5, // 455?
395+
KindleColorSoftUnknown_4EP = 0x11D7, // 4EP?
394396
KindleUnknown = 0x00
395397
} Device;
396398

tools/kindle_model_sort.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,8 @@ def devCode(string):
222222
('KindleColorSoftUnknown_3JT', 0xE5B, 'A2CU9ZQDNZFID4'), # 3JT?
223223
('KindleColorSoftUnknown_3J6', 0xE46, 'A2CU9ZQDNZFID4'), # 3J6?
224224
('KindleColorSoftUnknown_456', 0x10A6, 'A2CU9ZQDNZFID4'), # 456?
225+
('KindleColorSoftUnknown_455', 0x10A5, 'A2CU9ZQDNZFID4'), # 455?
226+
('KindleColorSoftUnknown_4EP', 0x11D7, 'A2CU9ZQDNZFID4'), # 4EP?
225227
('KindleUnknown', 0x00)
226228
]
227229

0 commit comments

Comments
 (0)