AP_OSD:Update HD fonts

ArduPilot · Jun 13, 2024 · 247f5e5 · 247f5e5
1 parent 1d945cc
commit 247f5e5
Show file tree

Hide file tree

Showing 33 changed files with 118 additions and 13 deletions.
diff --git a/libraries/AP_OSD/fonts/HDFonts/WS/font_update.ini b/libraries/AP_OSD/fonts/HDFonts/WS/font_update.ini
diff --git a/...es/AP_OSD/fonts/HDFonts/AllWhite/font.bin → ...s/WTFOS-DJI/Pre-Ver0.12/AllWhite/font.bin b/...es/AP_OSD/fonts/HDFonts/AllWhite/font.bin → ...s/WTFOS-DJI/Pre-Ver0.12/AllWhite/font.bin
diff --git a/.../AP_OSD/fonts/HDFonts/AllWhite/font_2.bin → ...WTFOS-DJI/Pre-Ver0.12/AllWhite/font_2.bin b/.../AP_OSD/fonts/HDFonts/AllWhite/font_2.bin → ...WTFOS-DJI/Pre-Ver0.12/AllWhite/font_2.bin
diff --git a/...AP_OSD/fonts/HDFonts/AllWhite/font_hd.bin → ...TFOS-DJI/Pre-Ver0.12/AllWhite/font_hd.bin b/...AP_OSD/fonts/HDFonts/AllWhite/font_hd.bin → ...TFOS-DJI/Pre-Ver0.12/AllWhite/font_hd.bin
diff --git a/..._OSD/fonts/HDFonts/AllWhite/font_hd_2.bin → ...OS-DJI/Pre-Ver0.12/AllWhite/font_hd_2.bin b/..._OSD/fonts/HDFonts/AllWhite/font_hd_2.bin → ...OS-DJI/Pre-Ver0.12/AllWhite/font_hd_2.bin
diff --git a/...aries/AP_OSD/fonts/HDFonts/Color/font.bin → ...onts/WTFOS-DJI/Pre-Ver0.12/Color/font.bin b/...aries/AP_OSD/fonts/HDFonts/Color/font.bin → ...onts/WTFOS-DJI/Pre-Ver0.12/Color/font.bin
diff --git a/...ies/AP_OSD/fonts/HDFonts/Color/font_2.bin → ...ts/WTFOS-DJI/Pre-Ver0.12/Color/font_2.bin b/...ies/AP_OSD/fonts/HDFonts/Color/font_2.bin → ...ts/WTFOS-DJI/Pre-Ver0.12/Color/font_2.bin
diff --git a/...es/AP_OSD/fonts/HDFonts/Color/font_hd.bin → ...s/WTFOS-DJI/Pre-Ver0.12/Color/font_hd.bin b/...es/AP_OSD/fonts/HDFonts/Color/font_hd.bin → ...s/WTFOS-DJI/Pre-Ver0.12/Color/font_hd.bin
diff --git a/.../AP_OSD/fonts/HDFonts/Color/font_hd_2.bin → ...WTFOS-DJI/Pre-Ver0.12/Color/font_hd_2.bin b/.../AP_OSD/fonts/HDFonts/Color/font_hd_2.bin → ...WTFOS-DJI/Pre-Ver0.12/Color/font_hd_2.bin
diff --git a/...SD/fonts/HDFonts/AllWhite/hd_flat_map.png → ...WTFOS-DJI/Pre-Ver0.12/hd_allwhite_map.png b/...SD/fonts/HDFonts/AllWhite/hd_flat_map.png → ...WTFOS-DJI/Pre-Ver0.12/hd_allwhite_map.png
diff --git a/...OSD/fonts/HDFonts/Color/hd_colour_map.png → ...s/WTFOS-DJI/Pre-Ver0.12/hd_colour_map.png b/...OSD/fonts/HDFonts/Color/hd_colour_map.png → ...s/WTFOS-DJI/Pre-Ver0.12/hd_colour_map.png
diff --git a/libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/README.md b/libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/README.md
@@ -0,0 +1 @@
+Depending on which version of WTFOS MSP-OSD module you are using, copy the files to the base directory of your goggless
diff --git a/libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Ver0.12_or_later/WS_ardu_24.png b/libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Ver0.12_or_later/WS_ardu_24.png
diff --git a/libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Ver0.12_or_later/WS_ardu_36.png b/libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Ver0.12_or_later/WS_ardu_36.png
diff --git a/libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Ver0.12_or_later/font_update.ini b/libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Ver0.12_or_later/font_update.ini
@@ -0,0 +1,11 @@
+[config]
+count=1
+1=ardu
+
+[ardu]
+imgname_720=WS_ardu_24.png
+imgname_1080=WS_ardu_36.png
+font_width_720=24
+font_height_720=36
+font_width_1080=36
+font_height_1080=54
diff --git a/libraries/AP_OSD/fonts/HDFonts/WalkSnail/Readme.txt b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/Readme.txt
@@ -0,0 +1,7 @@
+Extract this zip to your SD card root folder.
+As of Walksnail Avatar FW 34.40.15, user supplied fonts are to be in the userfont folder on the SD card.  If you are using a lower FW version, move the content of the userfont folder, into the root of the SD card.
+
+This is a font selection that includes:
+ - the latest unify font versions
+ - a night flying suited font
+ - the original 8-bit looking font similar to what is observed in analogue video OSD
diff --git a/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Blinder_24.png b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Blinder_24.png
diff --git a/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Blinder_36.png b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Blinder_36.png
diff --git a/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Conthrax_24.png b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Conthrax_24.png
diff --git a/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Conthrax_36.png b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Conthrax_36.png
diff --git a/...OSD/fonts/HDFonts/WS/WS_APN_Europa_24.png → ...s/WalkSnail/userfont/WS_APC_Europa_24.png b/...OSD/fonts/HDFonts/WS/WS_APN_Europa_24.png → ...s/WalkSnail/userfont/WS_APC_Europa_24.png
diff --git a/...OSD/fonts/HDFonts/WS/WS_APN_Europa_36.png → ...s/WalkSnail/userfont/WS_APC_Europa_36.png b/...OSD/fonts/HDFonts/WS/WS_APN_Europa_36.png → ...s/WalkSnail/userfont/WS_APC_Europa_36.png
diff --git a/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Hemi_24.png b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Hemi_24.png
diff --git a/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Hemi_36.png b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Hemi_36.png
diff --git a/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Nexus_24.png b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Nexus_24.png
diff --git a/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Nexus_36.png b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Nexus_36.png
diff --git a/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Sphere_24.png b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Sphere_24.png
diff --git a/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Sphere_36.png b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Sphere_36.png
diff --git a/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_ARDU_Night_24.png b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_ARDU_Night_24.png
diff --git a/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_ARDU_Night_36.png b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_ARDU_Night_36.png
diff --git a/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/font_update.ini b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/font_update.ini
@@ -0,0 +1,99 @@
+[config]
+count=8
+1=AP_Original
+2=AP_Blinder
+3=AP_Conthrax
+4=AP_Europa
+5=AP_Hemi
+6=AP_Nexus
+7=AP_Night
+8=AP_Sphere
+
+[AP_Original]
+fcid=
+font_width_720=24
+font_height_720=36
+font_width_1080=36
+font_height_1080=54
+imgname_720=user_ardu_24.png
+imgname_1080=user_ardu_36.png
+x_offset=0
+y_offset=0
+
+[AP_Blinder]
+fcid=
+font_width_720=24
+font_height_720=36
+font_width_1080=36
+font_height_1080=54
+imgname_720=WS_APC_Blinder_24.png
+imgname_1080=WS_APC_Blinder_36.png
+x_offset=0
+y_offset=0
+
+[AP_Conthrax]
+fcid=
+font_width_720=24
+font_height_720=36
+font_width_1080=36
+font_height_1080=54
+imgname_720=WS_APC_Conthrax_24.png
+imgname_1080=WS_APC_Conthrax_36.png
+x_offset=0
+y_offset=0
+
+[AP_Europa]
+fcid=
+font_width_720=24
+font_height_720=36
+font_width_1080=36
+font_height_1080=54
+imgname_720=WS_APC_Europa_24.png
+imgname_1080=WS_APC_Europa_36.png
+x_offset=0
+y_offset=0
+
+[AP_Hemi]
+fcid=
+font_width_720=24
+font_height_720=36
+font_width_1080=36
+font_height_1080=54
+imgname_720=WS_APC_Hemi_24.png
+imgname_1080=WS_APC_Hemi_36.png
+x_offset=0
+y_offset=0
+
+[AP_Nexus]
+fcid=
+font_width_720=24
+font_height_720=36
+font_width_1080=36
+font_height_1080=54
+imgname_720=WS_APC_Nexus_24.png
+imgname_1080=WS_APC_Nexus_36.png
+x_offset=0
+y_offset=0
+
+[AP_Night]
+fcid=
+font_width_720=24
+font_height_720=36
+font_width_1080=36
+font_height_1080=54
+imgname_720=WS_ARDU_Night_24.png
+imgname_1080=WS_ARDU_Night_36.png
+x_offset=0
+y_offset=0
+
+[AP_Sphere]
+fcid=
+font_width_720=24
+font_height_720=36
+font_width_1080=36
+font_height_1080=54
+imgname_720=WS_APC_Sphere_24.png
+imgname_1080=WS_APC_Sphere_36.png
+x_offset=0
+y_offset=0
+
diff --git a/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/user_ardu_24.png b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/user_ardu_24.png
diff --git a/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/user_ardu_36.png b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/user_ardu_36.png
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Depending on which version of WTFOS MSP-OSD module you are using, copy the files to the base directory of your goggless