Skip to content

Commit 3b32648

Browse files
committed
FDB: version 55 (see fdfdb commits)
1 parent 07150d1 commit 3b32648

File tree

8 files changed

+464
-227
lines changed

8 files changed

+464
-227
lines changed

FDBGen/sf.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
{
22
"name": "FDBGen",
33
"version": "1.0.0",
4-
"api": 6,
4+
"api": 7,
55
"description": "Flash Database Generator for FlashDetector",
66
"author": "iTX Technologies",
7-
"main": "iTXTech\\FlashDetector\\FDBGen\\Loader",
87
"website": "https://github.com/iTXTech/FlashDetector",
98
"dependencies": [
109
{
1110
"name": "iTXTech/FlashDetector",
12-
"version": "32"
11+
"version": "54"
1312
}
1413
]
1514
}

FDBGen/src/iTXTech/FlashDetector/FDBGen/Generator/Extra.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,11 @@
2626
class Extra{
2727
public static function merge(Fdb $fdb, string $data) : void{
2828
foreach(json_decode($data, true) as $vendor => $pns){
29-
foreach($pns as $pn => $data){
30-
$fdb->getPartNumber($vendor, $pn, true)->merge(new PartNumber($pn, $data));
29+
foreach($pns as $pn => $d){
30+
$pn = $fdb->getPartNumber($vendor, $pn, true)->merge(new PartNumber($pn, $d), true);
31+
if(isset($d["fid"])){
32+
$pn->setFlashIds($d["fid"]);
33+
}
3134
}
3235
}
3336
}

FDBGen/src/iTXTech/FlashDetector/FDBGen/Loader.php

Lines changed: 0 additions & 38 deletions
This file was deleted.

FDWebServer/WorkerManEE/sf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"dependencies": [
99
{
1010
"name": "iTXTech/FlashDetector",
11-
"version": "32"
11+
"version": "54"
1212
},
1313
{
1414
"name": "EaseCation/WorkerManEE",

FDWebServer/swoole/sf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"dependencies": [
99
{
1010
"name": "iTXTech/FlashDetector",
11-
"version": "32"
11+
"version": "54"
1212
}
1313
],
1414
"extensions": [

0 commit comments

Comments
 (0)