Skip to content

Fix HID Prox 32-B dropdown handling #815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vidonnus wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix HID Prox 32-B dropdown handling #815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion chameleonultragui/lib/gui/menu/dialogs/card/create.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ class CardCreateMenuState extends State<CardCreateMenu> {
const SizedBox(height: 20),
DropdownButton<int>(
value: int.tryParse(hidTypeController.text) ?? 1,
items: List.generate(30, (index) => index + 1)
items: getHidProxTypeOptions()
.map<DropdownMenuItem<int>>((int type) {
return DropdownMenuItem<int>(
value: type,
Expand Down
2 changes: 1 addition & 1 deletion chameleonultragui/lib/gui/menu/dialogs/card/edit.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ class CardEditMenuState extends State<CardEditMenu> {
const SizedBox(height: 20),
DropdownButton<int>(
value: int.tryParse(hidTypeController.text) ?? 1,
items: List.generate(30, (index) => index + 1)
items: getHidProxTypeOptions()
.map<DropdownMenuItem<int>>((int type) {
return DropdownMenuItem<int>(
value: type,
Expand Down
2 changes: 1 addition & 1 deletion chameleonultragui/lib/gui/menu/dialogs/slot/edit.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@ class SlotEditMenuState extends State<SlotEditMenu> {
DropdownButton<int>(
value:
int.tryParse(hidTypeController.text) ?? 1,
items: List.generate(30, (index) => index + 1)
items: getHidProxTypeOptions()
.map<DropdownMenuItem<int>>((int type) {
return DropdownMenuItem<int>(
value: type,
Expand Down
90 changes: 58 additions & 32 deletions chameleonultragui/lib/helpers/general.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,39 +492,65 @@ TagType getTagTypeByDumpSize(int size) {
return TagType.unknown;
}

const _hidProxTypeNames = <int, String>{
1: "HID H10301 26-bit",
2: "Indala 26-bit",
3: "Indala 27-bit",
4: "Indala ASC 27-bit",
5: "Tecom 27-bit",
6: "2804 Wiegand 28-bit",
7: "Indala 29-bit",
8: "ATS Wiegand 30-bit",
9: "HID ADT 31-bit",
10: "HID Check Point 32-bit",
11: "HID Hewlett-Packard 32-bit",
12: "Kastle 32-bit",
13: "Indala/Kantech KFS 32-bit",
14: "Wiegand 32-bit",
15: "HID D10202 33-bit",
16: "HID H10306 34-bit",
17: "Honeywell/Northern N10002 34-bit",
18: "Indala Optus 34-bit",
19: "Cardkey Smartpass 34-bit",
20: "BQT 34-bit",
21: "HID Corporate 1000 35-bit Std",
22: "HID KeyScan 36-bit",
23: "HID Simplex 36-bit",
24: "HID 36-bit Siemens",
25: "HID H10320 37-bit BCD",
26: "HID H10302 37-bit huge ID",
27: "HID H10304 37-bit",
28: "HID P10004 37-bit PCSC",
29: "HID Generic 37-bit",
30: "PointGuard MDI 37-bit",
43: "HID 32-B 32-bit",
};

String getNameForHIDProxType(int type) {
return [
"HID H10301 26-bit",
"Indala 26-bit",
"Indala 27-bit",
"Indala ASC 27-bit",
"Tecom 27-bit",
"2804 Wiegand 28-bit",
"Indala 29-bit",
"ATS Wiegand 30-bit",
"HID ADT 31-bit",
"HID Check Point 32-bit",
"HID Hewlett-Packard 32-bit",
"Kastle 32-bit",
"Indala/Kantech KFS 32-bit",
"Wiegand 32-bit",
"HID D10202 33-bit",
"HID H10306 34-bit",
"Honeywell/Northern N10002 34-bit",
"Indala Optus 34-bit",
"Cardkey Smartpass 34-bit",
"BQT 34-bit",
"HID Corporate 1000 35-bit Std",
"HID KeyScan 36-bit",
"HID Simplex 36-bit",
"HID 36-bit Siemens",
"HID H10320 37-bit BCD",
"HID H10302 37-bit huge ID",
"HID H10304 37-bit",
"HID P10004 37-bit PCSC",
"HID Generic 37-bit",
"PointGuard MDI 37-bit",
][type - 1];
return _hidProxTypeNames[type] ?? "HID format($type)";
}

List<int> getHidProxTypeOptions() {
final options = _hidProxTypeNames.keys.toList();
options.sort((a, b) {
final nameA = _hidProxTypeNames[a] ?? "";
final nameB = _hidProxTypeNames[b] ?? "";
final bitsA = _hidProxBitLength(nameA);
final bitsB = _hidProxBitLength(nameB);
if (bitsA != bitsB) {
return bitsA.compareTo(bitsB);
}
return nameA.compareTo(nameB);
});
return options;
}

int _hidProxBitLength(String name) {
final match = RegExp(r'(\d+)-bit').firstMatch(name);
if (match == null) {
return 0;
}
return int.tryParse(match.group(1) ?? '') ?? 0;
}

LFCard getLFCardFromUID(TagType type, String uid) {
Expand Down