Skip to content
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

Optimize Addresses.h generation and fix incorrect addresses for certain output types like DcsBios::LED #240

Merged
merged 13 commits into from
Oct 1, 2023
Merged

Optimize Addresses.h generation and fix incorrect addresses for certain output types like DcsBios::LED #240

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0ce6966
Recreate the Addresses.h from scratch every time DCS runs to avoid st…
maciekish Sep 23, 2023
c2f1917
Remove the extraneous address_only_identifier and derive it in javasc…
maciekish Sep 23, 2023
50f9d14
Use existing output.address_identifier if present
maciekish Sep 24, 2023
d43da00
Revert "Remove the extraneous address_only_identifier and derive it i…
maciekish Sep 24, 2023
b3252f3
Refactored saveAddresses() to make it selfcontained and run in init()
maciekish Sep 24, 2023
e4dad3d
saveAddresses() should probably only run in dev mode like saveDoc()
maciekish Sep 24, 2023
da92fb3
Fix incorrect address definitions and update Addresses.h and json files
maciekish Sep 25, 2023
4d0ea53
Removed the "float" output type as it doesn't seem to be used anywhere
maciekish Sep 28, 2023
2042302
Merge remote-tracking branch 'upstream/master'
maciekish Sep 30, 2023
651b2fc
Regenerated conflicting files in upstream
maciekish Sep 30, 2023
f1da1a8
Merge branch 'master' into master
maciekish Sep 30, 2023
c10ddf0
Update Protocol.lua
maciekish Sep 30, 2023
cd1d2b3
Merge branch 'master' into master
maciekish Sep 30, 2023
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
61,148 changes: 29,544 additions & 31,604 deletions Scripts/DCS-BIOS/doc/Addresses.h
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions Scripts/DCS-BIOS/doc/js/control-reference.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,17 +386,17 @@ $(function() {
code.append($("<br>"));
code.append($("<span>").text("}"));
code.append($("<br>"));
code.append($("<span>").text("DcsBios::IntegerBuffer "+idCamelCase(cid+"_BUFFER")+'('+io.address_identifier+', '+idCamelCase("ON_"+cid+"_CHANGE")+');'));
code.append($("<span>").text("DcsBios::IntegerBuffer "+idCamelCase(cid+"_BUFFER")+'('+io.address_mask_shift_identifier+', '+idCamelCase("ON_"+cid+"_CHANGE")+');'));
break;

case "LED":
code.append($("<span>").text('DcsBios::LED '+idCamelCase(cid)+'('+io.address_identifier+', '));
code.append($("<span>").text('DcsBios::LED '+idCamelCase(cid)+'('+io.address_mask_identifier+', '));
code.append($("<i>").attr("style", "color: red;").text("PIN"));
code.append($("<span>").text(");"));
break;

case "ServoOutput":
code.append($("<span>").text('DcsBios::ServoOutput '+idCamelCase(cid)+'('+io.address_only_identifier+', '));
code.append($("<span>").text('DcsBios::ServoOutput '+idCamelCase(cid)+'('+io.address_identifier+', '));
code.append($("<i>").attr("style", "color: red;").text("PIN"));
code.append($("<span>").text(", "));
code.append($("<i>").attr("style", "color: red;").text("544"));
Expand All @@ -418,8 +418,8 @@ $(function() {

case "FloatBuffer":
var ending = "";
if(io.max_value == 255) ending = ", true"
code.append($("<span>").text("DcsBios::FloatBuffer "+idCamelCase(cid+io.suffix+"_BUFFER")+'('+io.address_identifier+', '+io.value_range[0].toFixed()+', '+io.value_range[1]+ending+');'));
if (io.max_value == 255) ending = ", true"
code.append($("<span>").text("DcsBios::FloatBuffer "+idCamelCase(cid+io.suffix+"_BUFFER")+'('+io.address_mask_shift_identifier+', '+io.value_range[0].toFixed()+', '+io.value_range[1]+ending+');'));
break;

}
Expand Down
14,056 changes: 7,402 additions & 6,654 deletions Scripts/DCS-BIOS/doc/json/A-10C.json
View file
Open in desktop

Large diffs are not rendered by default.

14,056 changes: 7,402 additions & 6,654 deletions Scripts/DCS-BIOS/doc/json/A-10C.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

4,376 changes: 2,303 additions & 2,073 deletions Scripts/DCS-BIOS/doc/json/A-29B.json
View file
Open in desktop

Large diffs are not rendered by default.

4,376 changes: 2,303 additions & 2,073 deletions Scripts/DCS-BIOS/doc/json/A-29B.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

5,957 changes: 3,135 additions & 2,822 deletions Scripts/DCS-BIOS/doc/json/A-4E-C.json
View file
Open in desktop

Large diffs are not rendered by default.

5,957 changes: 3,135 additions & 2,822 deletions Scripts/DCS-BIOS/doc/json/A-4E-C.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

11,435 changes: 6,022 additions & 5,413 deletions Scripts/DCS-BIOS/doc/json/AH-64D.json
View file
Open in desktop

Large diffs are not rendered by default.

11,435 changes: 6,022 additions & 5,413 deletions Scripts/DCS-BIOS/doc/json/AH-64D.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

760 changes: 400 additions & 360 deletions Scripts/DCS-BIOS/doc/json/AH-6J.json
View file
Open in desktop

Large diffs are not rendered by default.

760 changes: 400 additions & 360 deletions Scripts/DCS-BIOS/doc/json/AH-6J.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

6,204 changes: 3,266 additions & 2,938 deletions Scripts/DCS-BIOS/doc/json/AJS37.json
View file
Open in desktop

Large diffs are not rendered by default.

6,204 changes: 3,266 additions & 2,938 deletions Scripts/DCS-BIOS/doc/json/AJS37.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

8,749 changes: 4,606 additions & 4,143 deletions Scripts/DCS-BIOS/doc/json/AV8BNA.json
View file
Open in desktop

Large diffs are not rendered by default.

8,749 changes: 4,606 additions & 4,143 deletions Scripts/DCS-BIOS/doc/json/AV8BNA.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion Scripts/DCS-BIOS/doc/json/AircraftAliases.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
"FlankerEx": [ "CommonData", "FC3" ],
"Flyer1": [ "CommonData", "FC3" ],
"Hawk": [ "CommonData" ],
"Hercules": [ "CommonData", "FC3" ],
"I-16": [ "CommonData", "I-16", "NS430" ],
"J-11A": [ "CommonData", "FC3" ],
"J-20A": [ "CommonData", "FC3" ],
Expand Down
1,900 changes: 1,000 additions & 900 deletions Scripts/DCS-BIOS/doc/json/Alphajet.json
View file
Open in desktop

Large diffs are not rendered by default.

1,900 changes: 1,000 additions & 900 deletions Scripts/DCS-BIOS/doc/json/Alphajet.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

3,439 changes: 1,810 additions & 1,629 deletions Scripts/DCS-BIOS/doc/json/Bf-109K-4.json
View file
Open in desktop

Large diffs are not rendered by default.

3,439 changes: 1,810 additions & 1,629 deletions Scripts/DCS-BIOS/doc/json/Bf-109K-4.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

12,542 changes: 6,598 additions & 5,944 deletions Scripts/DCS-BIOS/doc/json/C-101.json
View file
Open in desktop

Large diffs are not rendered by default.

12,542 changes: 6,598 additions & 5,944 deletions Scripts/DCS-BIOS/doc/json/C-101.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

1,159 changes: 610 additions & 549 deletions Scripts/DCS-BIOS/doc/json/Christen Eagle II.json
View file
Open in desktop

Large diffs are not rendered by default.

1,159 changes: 610 additions & 549 deletions Scripts/DCS-BIOS/doc/json/Christen Eagle II.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

420 changes: 222 additions & 198 deletions Scripts/DCS-BIOS/doc/json/CommonData.json
View file
Open in desktop

Large diffs are not rendered by default.

420 changes: 222 additions & 198 deletions Scripts/DCS-BIOS/doc/json/CommonData.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

722 changes: 380 additions & 342 deletions Scripts/DCS-BIOS/doc/json/Edge540.json
View file
Open in desktop

Large diffs are not rendered by default.

722 changes: 380 additions & 342 deletions Scripts/DCS-BIOS/doc/json/Edge540.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

19,277 changes: 10,146 additions & 9,131 deletions Scripts/DCS-BIOS/doc/json/F-14.json
View file
Open in desktop

Large diffs are not rendered by default.

19,277 changes: 10,146 additions & 9,131 deletions Scripts/DCS-BIOS/doc/json/F-14.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

13,556 changes: 7,132 additions & 6,424 deletions Scripts/DCS-BIOS/doc/json/F-15E.json
View file
Open in desktop

Large diffs are not rendered by default.

13,556 changes: 7,132 additions & 6,424 deletions Scripts/DCS-BIOS/doc/json/F-15E.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

9,421 changes: 4,959 additions & 4,462 deletions Scripts/DCS-BIOS/doc/json/F-16C_50.json
View file
Open in desktop

Large diffs are not rendered by default.

9,421 changes: 4,959 additions & 4,462 deletions Scripts/DCS-BIOS/doc/json/F-16C_50.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

3,002 changes: 1,580 additions & 1,422 deletions Scripts/DCS-BIOS/doc/json/F-22A.json
View file
Open in desktop

Large diffs are not rendered by default.

3,002 changes: 1,580 additions & 1,422 deletions Scripts/DCS-BIOS/doc/json/F-22A.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

5,945 changes: 3,129 additions & 2,816 deletions Scripts/DCS-BIOS/doc/json/F-5E-3.json
View file
Open in desktop

Large diffs are not rendered by default.

5,945 changes: 3,129 additions & 2,816 deletions Scripts/DCS-BIOS/doc/json/F-5E-3.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

5,476 changes: 2,882 additions & 2,594 deletions Scripts/DCS-BIOS/doc/json/F-86F Sabre.json
View file
Open in desktop

Large diffs are not rendered by default.

5,476 changes: 2,882 additions & 2,594 deletions Scripts/DCS-BIOS/doc/json/F-86F Sabre.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

9,222 changes: 4,872 additions & 4,350 deletions Scripts/DCS-BIOS/doc/json/FA-18C_hornet.json
View file
Open in desktop

Large diffs are not rendered by default.

9,222 changes: 4,872 additions & 4,350 deletions Scripts/DCS-BIOS/doc/json/FA-18C_hornet.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

658 changes: 348 additions & 310 deletions Scripts/DCS-BIOS/doc/json/FC3.json
View file
Open in desktop

Large diffs are not rendered by default.

658 changes: 348 additions & 310 deletions Scripts/DCS-BIOS/doc/json/FC3.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

3,895 changes: 2,050 additions & 1,845 deletions Scripts/DCS-BIOS/doc/json/FW-190A8.json
View file
Open in desktop

Large diffs are not rendered by default.

3,895 changes: 2,050 additions & 1,845 deletions Scripts/DCS-BIOS/doc/json/FW-190A8.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

3,154 changes: 1,660 additions & 1,494 deletions Scripts/DCS-BIOS/doc/json/FW-190D9.json
View file
Open in desktop

Large diffs are not rendered by default.

3,154 changes: 1,660 additions & 1,494 deletions Scripts/DCS-BIOS/doc/json/FW-190D9.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

1,748 changes: 920 additions & 828 deletions Scripts/DCS-BIOS/doc/json/I-16.json
View file
Open in desktop

Large diffs are not rendered by default.

1,748 changes: 920 additions & 828 deletions Scripts/DCS-BIOS/doc/json/I-16.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

8,386 changes: 4,414 additions & 3,972 deletions Scripts/DCS-BIOS/doc/json/JF-17.json
View file
Open in desktop

Large diffs are not rendered by default.

8,386 changes: 4,414 additions & 3,972 deletions Scripts/DCS-BIOS/doc/json/JF-17.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

10,653 changes: 5,651 additions & 5,002 deletions Scripts/DCS-BIOS/doc/json/Ka-50.json
View file
Open in desktop

Large diffs are not rendered by default.

10,653 changes: 5,651 additions & 5,002 deletions Scripts/DCS-BIOS/doc/json/Ka-50.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

10,730 changes: 5,647 additions & 5,083 deletions Scripts/DCS-BIOS/doc/json/L-39.json
View file
Open in desktop

Large diffs are not rendered by default.

10,730 changes: 5,647 additions & 5,083 deletions Scripts/DCS-BIOS/doc/json/L-39.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

11,233 changes: 5,893 additions & 5,340 deletions Scripts/DCS-BIOS/doc/json/M-2000C.json
View file
Open in desktop

Large diffs are not rendered by default.

11,233 changes: 5,893 additions & 5,340 deletions Scripts/DCS-BIOS/doc/json/M-2000C.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

12,660 changes: 6,660 additions & 6,000 deletions Scripts/DCS-BIOS/doc/json/MB-339.json
View file
Open in desktop

Large diffs are not rendered by default.

12,660 changes: 6,660 additions & 6,000 deletions Scripts/DCS-BIOS/doc/json/MB-339.jsonp
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 20 additions & 18 deletions Scripts/DCS-BIOS/doc/json/MetadataEnd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,16 @@
"identifier": "_UPDATE_COUNTER",
"inputs": [ ],
"outputs": [ {
"address": 65534,
"address_identifier": "MetadataEnd_UPDATE_COUNTER",
"address_only_identifier": "MetadataEnd_UPDATE_COUNTER_ADDR",
"description": "Update Counter",
"mask": 255,
"max_value": 255,
"shift_by": 0,
"suffix": "",
"type": "integer"
"address": 65534,
"address_identifier": "MetadataEnd_UPDATE_COUNTER_A",
"address_mask_identifier": "MetadataEnd_UPDATE_COUNTER_AM",
"address_mask_shift_identifier": "MetadataEnd_UPDATE_COUNTER",
"description": "Update Counter",
"mask": 255,
"max_value": 255,
"shift_by": 0,
"suffix": "",
"type": "integer"
} ]
},
"_UPDATE_SKIP_COUNTER": {
Expand All @@ -25,15 +26,16 @@
"identifier": "_UPDATE_SKIP_COUNTER",
"inputs": [ ],
"outputs": [ {
"address": 65534,
"address_identifier": "MetadataEnd_UPDATE_SKIP_COUNTER",
"address_only_identifier": "MetadataEnd_UPDATE_SKIP_COUNTER_ADDR",
"description": "Update Skip Counter",
"mask": 65280,
"max_value": 255,
"shift_by": 8,
"suffix": "",
"type": "integer"
"address": 65534,
"address_identifier": "MetadataEnd_UPDATE_SKIP_COUNTER_A",
"address_mask_identifier": "MetadataEnd_UPDATE_SKIP_COUNTER_AM",
"address_mask_shift_identifier": "MetadataEnd_UPDATE_SKIP_COUNTER",
"description": "Update Skip Counter",
"mask": 65280,
"max_value": 255,
"shift_by": 8,
"suffix": "",
"type": "integer"
} ]
}
}
Expand Down
38 changes: 20 additions & 18 deletions Scripts/DCS-BIOS/doc/json/MetadataEnd.jsonp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,16 @@ docdata["MetadataEnd"] =
"identifier": "_UPDATE_COUNTER",
"inputs": [ ],
"outputs": [ {
"address": 65534,
"address_identifier": "MetadataEnd_UPDATE_COUNTER",
"address_only_identifier": "MetadataEnd_UPDATE_COUNTER_ADDR",
"description": "Update Counter",
"mask": 255,
"max_value": 255,
"shift_by": 0,
"suffix": "",
"type": "integer"
"address": 65534,
"address_identifier": "MetadataEnd_UPDATE_COUNTER_A",
"address_mask_identifier": "MetadataEnd_UPDATE_COUNTER_AM",
"address_mask_shift_identifier": "MetadataEnd_UPDATE_COUNTER",
"description": "Update Counter",
"mask": 255,
"max_value": 255,
"shift_by": 0,
"suffix": "",
"type": "integer"
} ]
},
"_UPDATE_SKIP_COUNTER": {
Expand All @@ -26,15 +27,16 @@ docdata["MetadataEnd"] =
"identifier": "_UPDATE_SKIP_COUNTER",
"inputs": [ ],
"outputs": [ {
"address": 65534,
"address_identifier": "MetadataEnd_UPDATE_SKIP_COUNTER",
"address_only_identifier": "MetadataEnd_UPDATE_SKIP_COUNTER_ADDR",
"description": "Update Skip Counter",
"mask": 65280,
"max_value": 255,
"shift_by": 8,
"suffix": "",
"type": "integer"
"address": 65534,
"address_identifier": "MetadataEnd_UPDATE_SKIP_COUNTER_A",
"address_mask_identifier": "MetadataEnd_UPDATE_SKIP_COUNTER_AM",
"address_mask_shift_identifier": "MetadataEnd_UPDATE_SKIP_COUNTER",
"description": "Update Skip Counter",
"mask": 65280,
"max_value": 255,
"shift_by": 8,
"suffix": "",
"type": "integer"
} ]
}
}
Expand Down
15 changes: 8 additions & 7 deletions Scripts/DCS-BIOS/doc/json/MetadataStart.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@
"identifier": "_ACFT_NAME",
"inputs": [ ],
"outputs": [ {
"address": 0,
"address_identifier": "MetadataStart_ACFT_NAME",
"address_only_identifier": "MetadataStart_ACFT_NAME_ADDR",
"description": "Aircraft Name (or NONE), null-terminated",
"max_length": 24,
"suffix": "",
"type": "string"
"address": 0,
"address_identifier": "MetadataStart_ACFT_NAME_A",
"address_mask_identifier": "MetadataStart_ACFT_NAME_AM",
"address_mask_shift_identifier": "MetadataStart_ACFT_NAME",
"description": "Aircraft Name (or NONE), null-terminated",
"max_length": 24,
"suffix": "",
"type": "string"
} ]
}
}
Expand Down
15 changes: 8 additions & 7 deletions Scripts/DCS-BIOS/doc/json/MetadataStart.jsonp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ docdata["MetadataStart"] =
"identifier": "_ACFT_NAME",
"inputs": [ ],
"outputs": [ {
"address": 0,
"address_identifier": "MetadataStart_ACFT_NAME",
"address_only_identifier": "MetadataStart_ACFT_NAME_ADDR",
"description": "Aircraft Name (or NONE), null-terminated",
"max_length": 24,
"suffix": "",
"type": "string"
"address": 0,
"address_identifier": "MetadataStart_ACFT_NAME_A",
"address_mask_identifier": "MetadataStart_ACFT_NAME_AM",
"address_mask_shift_identifier": "MetadataStart_ACFT_NAME",
"description": "Aircraft Name (or NONE), null-terminated",
"max_length": 24,
"suffix": "",
"type": "string"
} ]
}
}
Expand Down
Loading