diff --git a/libraries/AP_OSD/fonts/HDFonts/WS/font_update.ini b/libraries/AP_OSD/fonts/HDFonts/WS/font_update.ini deleted file mode 100644 index 23d28317ad..0000000000 --- a/libraries/AP_OSD/fonts/HDFonts/WS/font_update.ini +++ /dev/null @@ -1,13 +0,0 @@ -[config] -count=1 -1=ARDU_Europa - -[ARDU_Europa] -imgname_720=WS_APN_Europa_24.png -imgname_1080=WS_APN_Europa_36.png -font_width_720=24 -font_height_720=36 -font_width_1080=36 -font_height_1080=54 -x_offset=0 -y_offset=0 diff --git a/libraries/AP_OSD/fonts/HDFonts/AllWhite/font.bin b/libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Pre-Ver0.12/AllWhite/font.bin similarity index 100% rename from libraries/AP_OSD/fonts/HDFonts/AllWhite/font.bin rename to libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Pre-Ver0.12/AllWhite/font.bin diff --git a/libraries/AP_OSD/fonts/HDFonts/AllWhite/font_2.bin b/libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Pre-Ver0.12/AllWhite/font_2.bin similarity index 100% rename from libraries/AP_OSD/fonts/HDFonts/AllWhite/font_2.bin rename to libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Pre-Ver0.12/AllWhite/font_2.bin diff --git a/libraries/AP_OSD/fonts/HDFonts/AllWhite/font_hd.bin b/libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Pre-Ver0.12/AllWhite/font_hd.bin similarity index 100% rename from libraries/AP_OSD/fonts/HDFonts/AllWhite/font_hd.bin rename to libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Pre-Ver0.12/AllWhite/font_hd.bin diff --git a/libraries/AP_OSD/fonts/HDFonts/AllWhite/font_hd_2.bin b/libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Pre-Ver0.12/AllWhite/font_hd_2.bin similarity index 100% rename from libraries/AP_OSD/fonts/HDFonts/AllWhite/font_hd_2.bin rename to libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Pre-Ver0.12/AllWhite/font_hd_2.bin diff --git a/libraries/AP_OSD/fonts/HDFonts/Color/font.bin b/libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Pre-Ver0.12/Color/font.bin similarity index 100% rename from libraries/AP_OSD/fonts/HDFonts/Color/font.bin rename to libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Pre-Ver0.12/Color/font.bin diff --git a/libraries/AP_OSD/fonts/HDFonts/Color/font_2.bin b/libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Pre-Ver0.12/Color/font_2.bin similarity index 100% rename from libraries/AP_OSD/fonts/HDFonts/Color/font_2.bin rename to libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Pre-Ver0.12/Color/font_2.bin diff --git a/libraries/AP_OSD/fonts/HDFonts/Color/font_hd.bin b/libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Pre-Ver0.12/Color/font_hd.bin similarity index 100% rename from libraries/AP_OSD/fonts/HDFonts/Color/font_hd.bin rename to libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Pre-Ver0.12/Color/font_hd.bin diff --git a/libraries/AP_OSD/fonts/HDFonts/Color/font_hd_2.bin b/libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Pre-Ver0.12/Color/font_hd_2.bin similarity index 100% rename from libraries/AP_OSD/fonts/HDFonts/Color/font_hd_2.bin rename to libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Pre-Ver0.12/Color/font_hd_2.bin diff --git a/libraries/AP_OSD/fonts/HDFonts/AllWhite/hd_flat_map.png b/libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Pre-Ver0.12/hd_allwhite_map.png similarity index 100% rename from libraries/AP_OSD/fonts/HDFonts/AllWhite/hd_flat_map.png rename to libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Pre-Ver0.12/hd_allwhite_map.png diff --git a/libraries/AP_OSD/fonts/HDFonts/Color/hd_colour_map.png b/libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Pre-Ver0.12/hd_colour_map.png similarity index 100% rename from libraries/AP_OSD/fonts/HDFonts/Color/hd_colour_map.png rename to libraries/AP_OSD/fonts/HDFonts/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 new file mode 100644 index 0000000000..6e56cecf77 --- /dev/null +++ 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 new file mode 100755 index 0000000000..e4e84cb54a Binary files /dev/null and b/libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Ver0.12_or_later/WS_ardu_24.png differ 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 new file mode 100755 index 0000000000..d6e40f024b Binary files /dev/null and b/libraries/AP_OSD/fonts/HDFonts/WTFOS-DJI/Ver0.12_or_later/WS_ardu_36.png differ 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 new file mode 100755 index 0000000000..9172570c03 --- /dev/null +++ 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 new file mode 100644 index 0000000000..616d98b0c1 --- /dev/null +++ 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 \ No newline at end of file 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 new file mode 100644 index 0000000000..46048e67f2 Binary files /dev/null and b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Blinder_24.png differ 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 new file mode 100644 index 0000000000..85f512bbd1 Binary files /dev/null and b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Blinder_36.png differ 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 new file mode 100644 index 0000000000..fb38fbcb62 Binary files /dev/null and b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Conthrax_24.png differ 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 new file mode 100644 index 0000000000..cb7691348f Binary files /dev/null and b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Conthrax_36.png differ diff --git a/libraries/AP_OSD/fonts/HDFonts/WS/WS_APN_Europa_24.png b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Europa_24.png similarity index 100% rename from libraries/AP_OSD/fonts/HDFonts/WS/WS_APN_Europa_24.png rename to libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Europa_24.png diff --git a/libraries/AP_OSD/fonts/HDFonts/WS/WS_APN_Europa_36.png b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Europa_36.png similarity index 100% rename from libraries/AP_OSD/fonts/HDFonts/WS/WS_APN_Europa_36.png rename to libraries/AP_OSD/fonts/HDFonts/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 new file mode 100644 index 0000000000..6f52c4c26e Binary files /dev/null and b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Hemi_24.png differ 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 new file mode 100644 index 0000000000..ca745d476f Binary files /dev/null and b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Hemi_36.png differ 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 new file mode 100644 index 0000000000..fe3db15f81 Binary files /dev/null and b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Nexus_24.png differ 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 new file mode 100644 index 0000000000..f52b76bfb2 Binary files /dev/null and b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Nexus_36.png differ 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 new file mode 100644 index 0000000000..6b81a461bf Binary files /dev/null and b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Sphere_24.png differ 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 new file mode 100644 index 0000000000..ecd2cf2c90 Binary files /dev/null and b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_APC_Sphere_36.png differ 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 new file mode 100644 index 0000000000..bc2ac790fd Binary files /dev/null and b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_ARDU_Night_24.png differ 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 new file mode 100644 index 0000000000..4a350bf409 Binary files /dev/null and b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/WS_ARDU_Night_36.png differ diff --git a/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/font_update.ini b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/font_update.ini new file mode 100644 index 0000000000..6e0db21e5f --- /dev/null +++ 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 new file mode 100644 index 0000000000..fff43a5488 Binary files /dev/null and b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/user_ardu_24.png differ 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 new file mode 100644 index 0000000000..2b8f33a212 Binary files /dev/null and b/libraries/AP_OSD/fonts/HDFonts/WalkSnail/userfont/user_ardu_36.png differ