Skip to content

Commit

Permalink
Update to latest MSPOSD with OSD VTX
Browse files Browse the repository at this point in the history
  • Loading branch information
MarioFPVdev authored and MarioFPVdev committed Oct 17, 2024
1 parent deb6015 commit dfc7509
Show file tree
Hide file tree
Showing 5 changed files with 79 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Configurator.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions Configurator.resx
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,19 @@
<metadata name="btnToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="btnToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="btnMSP.ToolTip" xml:space="preserve">
<value>Upload the latest MSPOSD of OpenIPC
Upload the fonts for Betaflight to the OpenIPC camera

To enter the menu move:
LEFT stick to bottom right and
RIGHT stick to bottom left

MSPVTX is partially working, do NOT use</value>
</data>
<data name="Label4.Text" xml:space="preserve">
<value>Step 1: Select which VRX to use
Step 2: Enter the VRX IP
Expand Down
8 changes: 4 additions & 4 deletions Extern.bat
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,8 @@ if "%1" == "offlinefw" (
if "%1" == "msp" (
plink -ssh root@%2 -pw %3 killall -q msposd
echo y | pscp -scp -pw %3 msposd root@%2:/usr/bin/
echo y | pscp -scp -pw %3 bf/font.png root@%2:/usr/bin/
echo y | pscp -scp -pw %3 bf/font_hd.png root@%2:/usr/bin/
echo y | pscp -scp -pw %3 bf/font.png root@%2:/usr/share/fonts/
echo y | pscp -scp -pw %3 bf/font_hd.png root@%2:/usr/share/fonts/
echo y | pscp -scp -pw %3 vtxmenu.ini root@%2:/etc/
plink -ssh root@%2 -pw %3 chmod +x /usr/bin/msposd
plink -ssh root@%2 -pw %3 reboot
Expand Down Expand Up @@ -256,8 +256,8 @@ if "%1" == "addbuttons" (
)

if "%1" == "fontsINAV" (
echo y | pscp -scp -pw %3 inav/font.png root@%2:/usr/bin/
echo y | pscp -scp -pw %3 inav/font_hd.png root@%2:/usr/bin/
echo y | pscp -scp -pw %3 inav/font.png root@%2:/usr/share/fonts/
echo y | pscp -scp -pw %3 inav/font_hd.png root@%2:/usr/share/fonts/
)

:end
Expand Down
Binary file modified msposd
Binary file not shown.
74 changes: 61 additions & 13 deletions vtxmenu.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
; VTXMenu Ini file format

; * Sections are pages
; * Sections can have Submenus or Options
; * Sections can have Submenus or Options or Commands
; * Submenus link to other Sections
; * Options have a special colon seperated format in this order
; Name
Expand All @@ -10,32 +10,80 @@
; Command to write the value

; Range: Specify a numeric allowed list of values
; List: Somma seperted list of option

; List: Somma seperated list of option
; * Command have colon separtedt list of lable and command to run

[VTX MENU]
Submenu1=CAMERA SETTINGS
Submenu2=WFB-NG SETTINGS

[CAMERA SETTINGS]
Submenu1=IMAGE
Submenu2=VIDEO
Submenu3=RECORDING
Submenu4=ISP
Submenu5=FPV
Command1=RESTART MAJESTIC:killall -1 majestic
Submenu6=VTX MENU


[IMAGE]
Option1=MIRROR:TRUE,FALSE:cli -g .image.mirror | tr a-z A-Z:cli -s .image.mirror $(echo {} | tr A-Z a-z)
Option2=FLIP:TRUE,FALSE:cli -g .image.flip | tr a-z A-Z:cli -s .image.flip $(echo {} | tr A-Z a-z)
Option3=CONTRAST:0-100:cli -g .image.contrast:cli -s .image.contrast {}
Option4=HUE:0-100:cli -g .image.hue:cli -s .image.hue {}
Option5=SATURATION:0-100:cli -g .image.saturation:cli -s .image.saturation {}
Option6=LUMINANCE:0-100:cli -g .image.luminance:cli -s .image.luminance {}
Option7=ROTATE:0-360:cli -g .image.rotate:cli -s .image.rotate {}
Submenu1=CAMERA SETTINGS
Submenu2=VTX MENU

[VIDEO]
Option1=SIZE:1280X720,1920X1080,2944X1656,3840X2160:cli -g .video0.size | tr x X:cli -s .video0.size $(echo {} | tr X x)
Option2=FPS:60,90,120:cli -g .video0.fps:cli -s .video0.fps {}
Option3=BITRATE:4096,8192,15360:cli -g .video0.bitrate:cli -s .video0.bitrate {}
Option3=BITRATE:4096,5120,6144,7168,8192:cli -g .video0.bitrate:cli -s .video0.bitrate {}
Option4=CODEC:H264,H265:cli -g .video0.codec | tr h H:cli -s .video0.codec $(echo {}| tr H h)
Option5=EXPOSURE:16,11,8:cli -g .isp.exposure:cli -s .isp.exposure {}
Submenu1=VTX MENU
Option5=GOPSIZE:0.1-20:cli -g .video0.gopSize:cli -s .video0.gopSize {}
Option6=RCMODE:VBR,AVBR,CBR:cli -g .video0.rcMode | tr a-z A-Z:cli -s .video0.rcMode $(echo {}| tr A-Z a-z)
;Option7=MINQP:0-20:cli -g .video0.minQp:cli -s .video0.minQp {}
;Option8=MAXQP:0-100:cli -g .video0.maxQp:cli -s .video0.maxQp {}
;Option9=IPPROP:0-10:cli -g .video0.ipProp:cli -s .video0.ipProp {}
;Option10=PROFILE:MAIN,:cli -g .video0.profile | tr a-z A-Z:cli -s .video0.profile $(echo {}| tr A-Z a-z)
;Option11=SLICEUNITS:4:cli -g .video0.sliceUnits:cli -s .video0.sliceUnits {}
;Option12=QPDELTA:-10-+10:cli -g .video0.qpDelta:cli -s .video0.qpDelta {} ; negative number currently unsupported
Submenu1=CAMERA SETTINGS
Submenu2=VTX MENU

[RECORDING]
Option1=ENABLED:TRUE,FALSE:cli -g .records.enabled | tr a-z A-Z:cli -s .records.enabled $(echo {} | tr A-Z a-z)
Option2=SPLIT:0-50:cli -g .records.split:cli -s .records.split {}
Option3=MAXUSAGE:0-99:cli -g .records.maxUsage:cli -s .records.maxUsage {}
Submenu1=CAMERA SETTINGS
Submenu2=VTX MENU

[ISP]
Option1=EXPOSURE:0-50:cli -g .isp.exposure:cli -s .isp.exposure {}
Option2=ANTIFLICKER:ENABLED,DISABLED:cli -g .isp.antiFlicker | tr a-z A-Z:cli -s .isp.antiFlicker $(echo {} | tr A-Z a-z)
Submenu1=CAMERA SETTINGS
Submenu2=VTX MENU

[FPV]
Option1=ENABLED:TRUE,FALSE:cli -g .fpv.enabled | tr a-z A-Z:cli -s .fpv.enabled $(echo {} | tr A-Z a-z)
Submenu1=CAMERA SETTINGS
Submenu2=VTX MENU

[WFB-NG SETTINGS]
Option1=REGION:BO,GY,00:grep region /etc/wfb.conf | cut -d= -f2:sed -i 's/region=.*/region={}/' /etc/wfb.conf
Option2=TXPOWER:1,20,25,30,35,40,45,50,55,58:grep txpower /etc/wfb.conf | cut -d= -f2:sed -i 's/txpower=.*/txpower={}/' /etc/wfb.conf
Option3=DRIVER_TXPOWER_OVERRIDE:1,20,25,30,35,40,45,50,55,58:grep driver_txpower_override /etc/wfb.conf | cut -d= -f2:sed -i 's/driver_txpower_override=.*/driver_txpower_override={}/' /etc/wfb.conf
Option4=BANDWIDTH:20:grep bandwidth /etc/wfb.conf | cut -d= -f2:sed -i 's/bandwidth=.*/bandwidth={}/' /etc/wfb.conf
Option5=STBC:0-1:grep stbc /etc/wfb.conf | cut -d= -f2:sed -i 's/stbc=.*/stbc={}/' /etc/wfb.conf
Option6=LDPC:0-1:grep ldpc /etc/wfb.conf | cut -d= -f2:sed -i 's/ldpc=.*/ldpc={}/' /etc/wfb.conf
Option2=TXPOWER:1,:grep ^txpower /etc/wfb.conf | cut -d= -f2:sed -i 's/txpower=.*/txpower={}/' /etc/wfb.conf
Option3=DRIVER_TXPOWER_OVERRIDE:1,20,25,30,35,40,45,50,55,58:grep ^driver_txpower_override /etc/wfb.conf | cut -d= -f2:sed -i 's/driver_txpower_override=.*/driver_txpower_override={}/' /etc/wfb.conf
Option4=BANDWIDTH:20,40,80,160:grep bandwidth /etc/wfb.conf | cut -d= -f2:sed -i 's/bandwidth=.*/bandwidth={}/' /etc/wfb.conf
Option5=STBC:0,1:grep stbc /etc/wfb.conf | cut -d= -f2:sed -i 's/stbc=.*/stbc={}/' /etc/wfb.conf
Option6=LDPC:0,1:grep ldpc /etc/wfb.conf | cut -d= -f2:sed -i 's/ldpc=.*/ldpc={}/' /etc/wfb.conf
Option7=MCS_INDEX:1-4:grep mcs_index /etc/wfb.conf | cut -d= -f2:sed -i 's/mcs_index=.*/mcs_index={}/' /etc/wfb.conf
Option8=RCV_BUF:456000,:grep rcv_buf /etc/wfb.conf | cut -d= -f2:sed -i 's/rcv_buf=.*/rcv_buf={}/' /etc/wfb.conf
Option9=FEC_K:1-20:grep fec_k /etc/wfb.conf | cut -d= -f2:sed -i 's/fec_k=.*/fec_k={}/' /etc/wfb.conf
Option10=FEC_N:1-20:grep fec_n /etc/wfb.conf | cut -d= -f2:sed -i 's/fec_n=.*/fec_n={}/' /etc/wfb.conf
Option11=POOL_TIMEOUT:0,:grep pool_timeout /etc/wfb.conf | cut -d= -f2:sed -i 's/pool_timeout=.*/pool_timeout={}/' /etc/wfb.conf
Option12=GUARD_INTERVAL:LONG,SHORT:grep guard_interval /etc/wfb.conf | cut -d= -f2:sed -i 's/guard_interval=.*/guard_interval={}/' /etc/wfb.conf
Submenu1=VTX MENU
Option12=GUARD_INTERVAL:LONG,SHORT:grep guard_interval /etc/wfb.conf | cut -d= -f2 | tr a-z A-Z:sed -i "s/guard_interval=.*/guard_interval=$(echo {} | tr A-Z a-z)/" /etc/wfb.conf
Option13=CHANNEL:36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140,144,149,153,157,161,165:grep ^channel /etc/wfb.conf | cut -d= -f2:sed -i 's/channel=.*/channel={}/' /etc/wfb.conf
Submenu1=VTX MENU

0 comments on commit dfc7509

Please sign in to comment.