Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,156 @@
|
||||
var express = require("express");
|
||||
|
||||
var app = express();
|
||||
|
||||
//app.set("view engine", "ejs");
|
||||
//app.set("views", __dirname + "/views");
|
||||
|
||||
//app.use("/public", express.static("public"));
|
||||
|
||||
|
||||
const jsonContent = {
|
||||
currentConfigNumber: 1,
|
||||
diversityMode: 5,
|
||||
unitMode: 1,
|
||||
licenseMask: "8667",
|
||||
configName: "Config 1",
|
||||
unitName: "PRO-RX",
|
||||
inputFrequency1: 4970,
|
||||
bandwidth1: 0,
|
||||
inputFrequency2: 4990,
|
||||
bandwidth2: 0,
|
||||
configName: "Config 1",
|
||||
diversity: 4,
|
||||
lockStatus1: 1,
|
||||
lockStatus2: 0,
|
||||
constellation1: 0,
|
||||
fec1: 0,
|
||||
guardInterval1: 0,
|
||||
polarity1: 0,
|
||||
constellation2: 0,
|
||||
fec2: 0,
|
||||
guardInterval2: 0,
|
||||
polarity2: 0,
|
||||
snrA: 0,
|
||||
snrB: 0,
|
||||
snrC: 0,
|
||||
snrD: 0,
|
||||
snrE: 0,
|
||||
snrF: 0,
|
||||
snrG: 0,
|
||||
snrH: 0,
|
||||
powerLevelA: -83.2049,
|
||||
powerLevelB: -82.7038,
|
||||
powerLevelC: -86.3877,
|
||||
powerLevelD: -86.0873,
|
||||
powerLevelE: -82.6675,
|
||||
powerLevelF: -80.7239,
|
||||
powerLevelG: -85.3105,
|
||||
powerLevelH: -83.7851,
|
||||
preViterbiErrors1: 0,
|
||||
postViterbiErrors1: 0,
|
||||
packetErrors1: 0,
|
||||
preViterbiErrors2: 0,
|
||||
postViterbiErrors2: 0,
|
||||
packetErrors2: 0,
|
||||
decoderInputSelect1: 0,
|
||||
decoderInputSelect2: 1,
|
||||
asiOutputSelect: 6,
|
||||
remuxInputMask: 7,
|
||||
remuxBitrate: 100,
|
||||
asiInLockStatus: 0,
|
||||
genlockInStatus: 0,
|
||||
genlockInFormat: "Unknown",
|
||||
genlockInSupported: 0,
|
||||
genlockDec1InUse: 0,
|
||||
genlockDec2InUse: 0,
|
||||
serviceName1: "",
|
||||
serviceName2: "",
|
||||
videoLock1: 1,
|
||||
videoLock2: 1,
|
||||
serviceScrambled1: 1,
|
||||
serviceScrambled2: 1,
|
||||
inLineStandard1: 0,
|
||||
inLineStandard2: 0,
|
||||
videoResolution1: 704,
|
||||
videoResolution2: 704,
|
||||
audioType1: 2,
|
||||
audioType2: 2,
|
||||
audioMode1: 1,
|
||||
audioMode2: 1,
|
||||
audioBitrate1: 128,
|
||||
audioBitrate2: 128,
|
||||
audioSamplingRate1: 1,
|
||||
audioSamplingRate2: 1,
|
||||
videoPid1: 0,
|
||||
videoPid2: 0,
|
||||
audioPid1: 0,
|
||||
audioPid2: 0,
|
||||
pcrPid1: 0,
|
||||
pcrPid2: 0,
|
||||
dataBaudRate1: 5,
|
||||
dataBaudRate2: 5,
|
||||
dataPid1: 0,
|
||||
dataPid2: 0,
|
||||
dataType1: 0,
|
||||
dataType2: 0,
|
||||
dataParity1: 0,
|
||||
dataParity2: 0,
|
||||
dataWidth1: 0,
|
||||
dataWidth2: 0,
|
||||
h264VideoStd: 0,
|
||||
videoType: 0,
|
||||
loFrequency1: 4200,
|
||||
loSide1: 0,
|
||||
loFrequency2: 4200,
|
||||
loSide2: 0,
|
||||
individualLoEnable: 0,
|
||||
h264softwareVersion: "h264swv",
|
||||
h264serialNumber: "12345678",
|
||||
disableLogo: 0,
|
||||
cpuTemperature: 46.75,
|
||||
boardTemperature: 35,
|
||||
fpgaTemperature: 59.3419,
|
||||
fpgaCoreVoltage: 0.930542,
|
||||
fpgaAuxVoltage: 2.53793,
|
||||
unitDate: "04\/05\/2001",
|
||||
unitTime: "19:52:06"
|
||||
};
|
||||
|
||||
|
||||
app.get("/", function(req, res) {
|
||||
res.render("pages/landing");
|
||||
});
|
||||
|
||||
app.get("/set_param", function(req, res) {
|
||||
|
||||
console.log("got set_param");
|
||||
var remuxInputMask = (parseInt(req.query.remuxInputMask));
|
||||
var remuxBitrate = (parseFloat(req.query.remuxBitrate));
|
||||
|
||||
console.log(remuxInputMask, remuxBitrate);
|
||||
if(remuxInputMask)
|
||||
jsonContent.remuxInputMask = remuxInputMask;
|
||||
if(remuxBitrate)
|
||||
{
|
||||
remuxBitrate = parseInt(remuxBitrate*10000);
|
||||
remuxBitrate =remuxBitrate/10000;
|
||||
jsonContent.remuxBitrate = remuxBitrate;
|
||||
}
|
||||
|
||||
res.end();
|
||||
});
|
||||
|
||||
app.get("/status.json", function(req, res) {
|
||||
|
||||
console.log("got status");
|
||||
res.setHeader("Content-Type", "application/json");
|
||||
res.writeHead(200);
|
||||
|
||||
res.end(JSON.stringify(jsonContent));
|
||||
|
||||
|
||||
});
|
||||
|
||||
|
||||
app.listen(8080);
|
||||
Reference in new issue
Block a user