Skip to content

Commit

Permalink
Add HD OSD mode
Browse files Browse the repository at this point in the history
  • Loading branch information
SteveCEvans committed Nov 13, 2022
1 parent 9f77e00 commit f34ddbf
Show file tree
Hide file tree
Showing 9 changed files with 241 additions and 70 deletions.
67 changes: 67 additions & 0 deletions locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -4760,6 +4760,10 @@
"message": "NTSC",
"description": "Option for the video format in the OSD"
},
"osdSetupVideoFormatOptionHd": {
"message": "HD",
"description": "Option for the video format in the OSD"
},
"osdSetupUnitsTitle": {
"message": "Units"
},
Expand Down Expand Up @@ -4990,6 +4994,69 @@
"message": "Aux value",
"description": "One of the elements of the OSD"
},
"osdTextElementSysGoggleVoltage": {
"message": "Goggle voltage",
"description": "One of the system elements of the OSD"
},
"osdDescElementSysGoggleVoltage": {
"message": "Goggle voltage rendered by the goggles"
},
"osdTextElementSysVtxVoltage": {
"message": "VTX voltage",
"description": "One of the system elements of the OSD"
},
"osdDescElementSysVtxVoltage": {
"message": "VTX voltage rendered by the goggles"
},
"osdTextElementSysBitrate": {
"message": "VTX bitrate",
"description": "One of the system elements of the OSD"
},
"osdDescElementSysBitrate": {
"message": "Video bitrate rendered by the goggles"
},
"osdTextElementSysDelay": {
"message": "VTX delay",
"description": "One of the system elements of the OSD"
},
"osdDescElementSysDelay": {
"message": "Video delay rendered by the goggles"
},
"osdTextElementSysDistance": {
"message": "VTX distance",
"description": "One of the system elements of the OSD"
},
"osdDescElementSysDistance": {
"message": "Video transmission distance rendered by the goggles"
},
"osdTextElementSysLQ": {
"message": "Goggle link quality",
"description": "One of the system elements of the OSD"
},
"osdDescElementSysLQ": {
"message": "Video link quality rendered by the goggles"
},
"osdTextElementSysGoggleDVR": {
"message": "Goggle DVR status",
"description": "One of the system elements of the OSD"
},
"osdDescElementSysGoggleDVR": {
"message": "Goggle DVR status rendered by the goggles"
},
"osdTextElementSysVtxDVR": {
"message": "VTX DVR status",
"description": "One of the system elements of the OSD"
},
"osdDescElementSysVtxDVR": {
"message": "VTX DVR status rendered by the goggles"
},
"osdTextElementSysWarnings": {
"message": "Goggle system warnings",
"description": "One of the system elements of the OSD"
},
"osdDescElementSysWarnings": {
"message": "Video system warnings rendered by the goggles"
},
"osdTextElementCraftName": {
"message": "Craft name",
"description": "One of the elements of the OSD"
Expand Down
4 changes: 0 additions & 4 deletions src/css/dark-theme.less
Original file line number Diff line number Diff line change
Expand Up @@ -512,10 +512,6 @@ progress[value] {
.preview {
background: linear-gradient(rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.2)), url(../images/osd-bg-1.jpg);
background-size: cover;
&:active {
background: linear-gradient(rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.2)), url(../../images/osd-bg-1-grid.png), url(../../images/osd-bg-1.jpg);
background-size: cover;
}
}
input[type='checkbox'] {
&:after {
Expand Down
26 changes: 8 additions & 18 deletions src/css/tabs/osd.less
Original file line number Diff line number Diff line change
Expand Up @@ -214,13 +214,20 @@
margin: 0;
flex: 1 1 auto;
flex-wrap: nowrap;
border: 1px solid transparent;
img {
flex: 1 1 auto;
}
}
.char[draggable="true"] {
cursor: move;
}

&:active {
.char {
border: 1px dashed rgba(55, 55, 55, 0.5) ;
}
}
}
.char.mouseover {
background: rgba(255,255,255,0.4);
Expand Down Expand Up @@ -307,24 +314,7 @@
select.osd-variant {
max-width: 100%;
}
.video-pal {
.preview {
&:active {
background: url(../../images/osd-bg-1-grid-pal.png), url(../../images/osd-bg-1.jpg);
background-size: 100% 100%, cover;
background-repeat: no-repeat;
}
}
}
.video-ntsc {
.preview {
&:active {
background: url(../../images/osd-bg-1-grid-ntsc.png), url(../../images/osd-bg-1.jpg);
background-size: 100% 100%, cover;
background-repeat: no-repeat;
}
}
}

.alarms {
label {
display: block;
Expand Down
Binary file removed src/images/osd-bg-1-grid-ntsc.png
Binary file not shown.
Binary file removed src/images/osd-bg-1-grid-pal.png
Binary file not shown.
1 change: 1 addition & 0 deletions src/js/data_storage.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const API_VERSION_1_42 = '1.42.0';
const API_VERSION_1_43 = '1.43.0';
const API_VERSION_1_44 = '1.44.0';
const API_VERSION_1_45 = '1.45.0';
const API_VERSION_1_46 = '1.46.0';

const CONFIGURATOR = {
// all versions are specified and compared using semantic versioning http://semver.org/
Expand Down
3 changes: 3 additions & 0 deletions src/js/msp/MSPCodes.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ const MSPCodes = {
MSP_BEEPER_CONFIG: 184,
MSP_SET_BEEPER_CONFIG: 185,

MSP_SET_OSD_CANVAS: 188,
MSP_OSD_CANVAS: 189,

MSP_SET_RAW_RC: 200,
MSP_SET_RAW_GPS: 201, // Not used
MSP_SET_PID: 202,
Expand Down
7 changes: 7 additions & 0 deletions src/js/msp/MSPHelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -1692,6 +1692,13 @@ MspHelper.prototype.process_data = function(dataHandler) {
break;
case MSPCodes.MSP_SET_FAILSAFE_CONFIG:
console.log('Failsafe config saved');
break;
case MSPCodes.MSP_OSD_CANVAS:
OSD.data.VIDEO_COLS['HD'] = data.readU8();
OSD.data.VIDEO_ROWS['HD'] = data.readU8();
OSD.data.VIDEO_BUFFER_CHARS['HD'] = OSD.data.VIDEO_COLS['HD'] * OSD.data.VIDEO_ROWS['HD'];
console.log(`Canvas ${OSD.data.VIDEO_COLS['HD']} x ${OSD.data.VIDEO_ROWS['HD']}`);

break;
case MSPCodes.MSP_OSD_CONFIG:
break;
Expand Down
Loading

0 comments on commit f34ddbf

Please sign in to comment.