diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index 8e452be55..eadafa0ea 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -136,7 +136,7 @@ add_definitions(-DFLAVOUR="${FLAVOUR}") include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -include_directories(${CMAKE_CURRENT_BINARY_DIR}/bitmaps/${GUI_DIR}) +include_directories(${CMAKE_CURRENT_BINARY_DIR}/bitmaps/${BITMAPS_DIR}) include(gui/CMakeLists.txt) diff --git a/radio/src/bitmaps/colorlcd/CMakeLists.txt b/radio/src/bitmaps/480x272/CMakeLists.txt similarity index 73% rename from radio/src/bitmaps/colorlcd/CMakeLists.txt rename to radio/src/bitmaps/480x272/CMakeLists.txt index cf4ce2259..1387e51a2 100644 --- a/radio/src/bitmaps/colorlcd/CMakeLists.txt +++ b/radio/src/bitmaps/480x272/CMakeLists.txt @@ -14,19 +14,19 @@ endif() set(BITMAP_RLE_ARGS ${BITMAP_ARGS} --rle) set(MASK_RLE_ARGS ${MASK_ARGS} --rle) -add_bitmaps_target(${BITMAP_TARGET_PREFIX}_bitmaps "${RADIO_SRC_DIR}/bitmaps/colorlcd/bmp_*.png" "5/6/5" "${BITMAP_ARGS}") -add_bitmaps_target(${BITMAP_TARGET_PREFIX}_calibration_bitmaps "${RADIO_SRC_DIR}/bitmaps/colorlcd/calibration/bmp_*.png" "5/6/5" "${BITMAP_ARGS}") -add_bitmaps_target(${BITMAP_TARGET_PREFIX}_button_bitmaps "${RADIO_SRC_DIR}/bitmaps/colorlcd/button/alpha_*.png" "4/4/4/4" "${BITMAP_ARGS}") -add_bitmaps_target(${BITMAP_TARGET_PREFIX}_alpha_bitmaps "${RADIO_SRC_DIR}/bitmaps/colorlcd/alpha_*.png" "4/4/4/4" "${BITMAP_ARGS}") -add_bitmaps_target(${BITMAP_TARGET_PREFIX}_alpha_calibration_bitmaps "${RADIO_SRC_DIR}/bitmaps/colorlcd/calibration/alpha_*.png" "4/4/4/4" "${BITMAP_ARGS}") -add_bitmaps_target(${BITMAP_TARGET_PREFIX}_masks ${RADIO_SRC_DIR}/bitmaps/colorlcd/mask_*.png 8bits "${MASK_ARGS}") -add_bitmaps_target(${BITMAP_TARGET_PREFIX}_slider_masks "${RADIO_SRC_DIR}/bitmaps/colorlcd/slider/*.png" 8bits "${MASK_ARGS}") +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_bitmaps "${RADIO_SRC_DIR}/bitmaps/480x272/bmp_*.png" "5/6/5" "${BITMAP_ARGS}") +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_calibration_bitmaps "${RADIO_SRC_DIR}/bitmaps/480x272/calibration/bmp_*.png" "5/6/5" "${BITMAP_ARGS}") +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_button_bitmaps "${RADIO_SRC_DIR}/bitmaps/480x272/button/alpha_*.png" "4/4/4/4" "${BITMAP_ARGS}") +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_alpha_bitmaps "${RADIO_SRC_DIR}/bitmaps/480x272/alpha_*.png" "4/4/4/4" "${BITMAP_ARGS}") +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_alpha_calibration_bitmaps "${RADIO_SRC_DIR}/bitmaps/480x272/calibration/alpha_*.png" "4/4/4/4" "${BITMAP_ARGS}") +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_masks ${RADIO_SRC_DIR}/bitmaps/480x272/mask_*.png 8bits "${MASK_ARGS}") +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_slider_masks "${RADIO_SRC_DIR}/bitmaps/480x272/slider/*.png" 8bits "${MASK_ARGS}") add_bitmaps_target(${BITMAP_TARGET_PREFIX}_layouts_masks "${RADIO_SRC_DIR}/gui/colorlcd/layouts/*.png" 8bits "${MASK_ARGS}") add_bitmaps_target(${BITMAP_TARGET_PREFIX}_themes_bitmaps "${RADIO_SRC_DIR}/gui/colorlcd/themes/*.png" "5/6/5" "${BITMAPS_ARGS}") add_bitmaps_target(${BITMAP_TARGET_PREFIX}_fonts ${RADIO_SRC_DIR}/fonts/truetype/*.png 8bits "${MASK_RLE_ARGS}") -add_bitmaps_target(${BITMAP_TARGET_PREFIX}_volume_masks ${RADIO_SRC_DIR}/bitmaps/colorlcd/volume/*.png 8bits "${MASK_ARGS}") -add_bitmaps_target(${BITMAP_TARGET_PREFIX}_bootloader_bitmaps ${RADIO_SRC_DIR}/bitmaps/colorlcd/bootloader/bmp_*.png "5/6/5" "${BITMAP_RLE_ARGS}") -add_bitmaps_target(${BITMAP_TARGET_PREFIX}_bootloader_icons ${RADIO_SRC_DIR}/bitmaps/colorlcd/bootloader/icon_*.png 8bits "${MASK_ARGS}") +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_volume_masks ${RADIO_SRC_DIR}/bitmaps/480x272/volume/*.png 8bits "${MASK_ARGS}") +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_bootloader_bitmaps ${RADIO_SRC_DIR}/bitmaps/480x272/bootloader/bmp_*.png "5/6/5" "${BITMAP_RLE_ARGS}") +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_bootloader_icons ${RADIO_SRC_DIR}/bitmaps/480x272/bootloader/icon_*.png 8bits "${MASK_ARGS}") add_dependencies(${BITMAP_TARGET_PREFIX}_bitmaps ${BITMAP_TARGET_PREFIX}_calibration_bitmaps ${BITMAP_TARGET_PREFIX}_button_bitmaps ${BITMAP_TARGET_PREFIX}_alpha_bitmaps ${BITMAP_TARGET_PREFIX}_alpha_calibration_bitmaps ${BITMAP_TARGET_PREFIX}_masks ${BITMAP_TARGET_PREFIX}_slider_masks ${BITMAP_TARGET_PREFIX}_layouts_masks diff --git a/radio/src/bitmaps/colorlcd/bmp_splash.png b/radio/src/bitmaps/480x272/bmp_splash.png similarity index 100% rename from radio/src/bitmaps/colorlcd/bmp_splash.png rename to radio/src/bitmaps/480x272/bmp_splash.png diff --git a/radio/src/bitmaps/colorlcd/bootloader/bmp_plug_usb.png b/radio/src/bitmaps/480x272/bootloader/bmp_plug_usb.png similarity index 100% rename from radio/src/bitmaps/colorlcd/bootloader/bmp_plug_usb.png rename to radio/src/bitmaps/480x272/bootloader/bmp_plug_usb.png diff --git a/radio/src/bitmaps/colorlcd/bootloader/bmp_usb_plugged.png b/radio/src/bitmaps/480x272/bootloader/bmp_usb_plugged.png similarity index 100% rename from radio/src/bitmaps/colorlcd/bootloader/bmp_usb_plugged.png rename to radio/src/bitmaps/480x272/bootloader/bmp_usb_plugged.png diff --git a/radio/src/bitmaps/colorlcd/bootloader/icon_error.png b/radio/src/bitmaps/480x272/bootloader/icon_error.png similarity index 100% rename from radio/src/bitmaps/colorlcd/bootloader/icon_error.png rename to radio/src/bitmaps/480x272/bootloader/icon_error.png diff --git a/radio/src/bitmaps/colorlcd/bootloader/icon_exit.png b/radio/src/bitmaps/480x272/bootloader/icon_exit.png similarity index 100% rename from radio/src/bitmaps/colorlcd/bootloader/icon_exit.png rename to radio/src/bitmaps/480x272/bootloader/icon_exit.png diff --git a/radio/src/bitmaps/colorlcd/bootloader/icon_file.png b/radio/src/bitmaps/480x272/bootloader/icon_file.png similarity index 100% rename from radio/src/bitmaps/colorlcd/bootloader/icon_file.png rename to radio/src/bitmaps/480x272/bootloader/icon_file.png diff --git a/radio/src/bitmaps/colorlcd/bootloader/icon_flash.png b/radio/src/bitmaps/480x272/bootloader/icon_flash.png similarity index 100% rename from radio/src/bitmaps/colorlcd/bootloader/icon_flash.png rename to radio/src/bitmaps/480x272/bootloader/icon_flash.png diff --git a/radio/src/bitmaps/colorlcd/bootloader/icon_ok.png b/radio/src/bitmaps/480x272/bootloader/icon_ok.png similarity index 100% rename from radio/src/bitmaps/colorlcd/bootloader/icon_ok.png rename to radio/src/bitmaps/480x272/bootloader/icon_ok.png diff --git a/radio/src/bitmaps/colorlcd/bootloader/icon_sd.png b/radio/src/bitmaps/480x272/bootloader/icon_sd.png similarity index 100% rename from radio/src/bitmaps/colorlcd/bootloader/icon_sd.png rename to radio/src/bitmaps/480x272/bootloader/icon_sd.png diff --git a/radio/src/bitmaps/colorlcd/button/alpha_button_off.png b/radio/src/bitmaps/480x272/button/alpha_button_off.png similarity index 100% rename from radio/src/bitmaps/colorlcd/button/alpha_button_off.png rename to radio/src/bitmaps/480x272/button/alpha_button_off.png diff --git a/radio/src/bitmaps/colorlcd/button/alpha_button_on.png b/radio/src/bitmaps/480x272/button/alpha_button_on.png similarity index 100% rename from radio/src/bitmaps/colorlcd/button/alpha_button_on.png rename to radio/src/bitmaps/480x272/button/alpha_button_on.png diff --git a/radio/src/bitmaps/colorlcd/mask_about_headico.png b/radio/src/bitmaps/480x272/mask_about_headico.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_about_headico.png rename to radio/src/bitmaps/480x272/mask_about_headico.png diff --git a/radio/src/bitmaps/colorlcd/mask_antenna.png b/radio/src/bitmaps/480x272/mask_antenna.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_antenna.png rename to radio/src/bitmaps/480x272/mask_antenna.png diff --git a/radio/src/bitmaps/colorlcd/mask_carroussel_left.png b/radio/src/bitmaps/480x272/mask_carroussel_left.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_carroussel_left.png rename to radio/src/bitmaps/480x272/mask_carroussel_left.png diff --git a/radio/src/bitmaps/colorlcd/mask_carroussel_right.png b/radio/src/bitmaps/480x272/mask_carroussel_right.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_carroussel_right.png rename to radio/src/bitmaps/480x272/mask_carroussel_right.png diff --git a/radio/src/bitmaps/colorlcd/mask_coord_shadow.png b/radio/src/bitmaps/480x272/mask_coord_shadow.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_coord_shadow.png rename to radio/src/bitmaps/480x272/mask_coord_shadow.png diff --git a/radio/src/bitmaps/colorlcd/mask_cvpoint.png b/radio/src/bitmaps/480x272/mask_cvpoint.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_cvpoint.png rename to radio/src/bitmaps/480x272/mask_cvpoint.png diff --git a/radio/src/bitmaps/colorlcd/mask_cvpoint_center.png b/radio/src/bitmaps/480x272/mask_cvpoint_center.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_cvpoint_center.png rename to radio/src/bitmaps/480x272/mask_cvpoint_center.png diff --git a/radio/src/bitmaps/colorlcd/mask_dot.png b/radio/src/bitmaps/480x272/mask_dot.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_dot.png rename to radio/src/bitmaps/480x272/mask_dot.png diff --git a/radio/src/bitmaps/colorlcd/mask_dropdown.png b/radio/src/bitmaps/480x272/mask_dropdown.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_dropdown.png rename to radio/src/bitmaps/480x272/mask_dropdown.png diff --git a/radio/src/bitmaps/colorlcd/mask_folder.png b/radio/src/bitmaps/480x272/mask_folder.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_folder.png rename to radio/src/bitmaps/480x272/mask_folder.png diff --git a/radio/src/bitmaps/colorlcd/mask_htrim_frame.png b/radio/src/bitmaps/480x272/mask_htrim_frame.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_htrim_frame.png rename to radio/src/bitmaps/480x272/mask_htrim_frame.png diff --git a/radio/src/bitmaps/colorlcd/mask_key_backspace.png b/radio/src/bitmaps/480x272/mask_key_backspace.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_key_backspace.png rename to radio/src/bitmaps/480x272/mask_key_backspace.png diff --git a/radio/src/bitmaps/colorlcd/mask_key_letters.png b/radio/src/bitmaps/480x272/mask_key_letters.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_key_letters.png rename to radio/src/bitmaps/480x272/mask_key_letters.png diff --git a/radio/src/bitmaps/colorlcd/mask_key_lowercase.png b/radio/src/bitmaps/480x272/mask_key_lowercase.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_key_lowercase.png rename to radio/src/bitmaps/480x272/mask_key_lowercase.png diff --git a/radio/src/bitmaps/colorlcd/mask_key_numbers.png b/radio/src/bitmaps/480x272/mask_key_numbers.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_key_numbers.png rename to radio/src/bitmaps/480x272/mask_key_numbers.png diff --git a/radio/src/bitmaps/colorlcd/mask_key_spacebar.png b/radio/src/bitmaps/480x272/mask_key_spacebar.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_key_spacebar.png rename to radio/src/bitmaps/480x272/mask_key_spacebar.png diff --git a/radio/src/bitmaps/colorlcd/mask_key_uppercase.png b/radio/src/bitmaps/480x272/mask_key_uppercase.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_key_uppercase.png rename to radio/src/bitmaps/480x272/mask_key_uppercase.png diff --git a/radio/src/bitmaps/colorlcd/mask_library_active_model.png b/radio/src/bitmaps/480x272/mask_library_active_model.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_library_active_model.png rename to radio/src/bitmaps/480x272/mask_library_active_model.png diff --git a/radio/src/bitmaps/colorlcd/mask_library_score_0.png b/radio/src/bitmaps/480x272/mask_library_score_0.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_library_score_0.png rename to radio/src/bitmaps/480x272/mask_library_score_0.png diff --git a/radio/src/bitmaps/colorlcd/mask_library_score_1.png b/radio/src/bitmaps/480x272/mask_library_score_1.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_library_score_1.png rename to radio/src/bitmaps/480x272/mask_library_score_1.png diff --git a/radio/src/bitmaps/colorlcd/mask_library_slot.png b/radio/src/bitmaps/480x272/mask_library_slot.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_library_slot.png rename to radio/src/bitmaps/480x272/mask_library_slot.png diff --git a/radio/src/bitmaps/colorlcd/mask_library_star_0.png b/radio/src/bitmaps/480x272/mask_library_star_0.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_library_star_0.png rename to radio/src/bitmaps/480x272/mask_library_star_0.png diff --git a/radio/src/bitmaps/colorlcd/mask_library_star_1.png b/radio/src/bitmaps/480x272/mask_library_star_1.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_library_star_1.png rename to radio/src/bitmaps/480x272/mask_library_star_1.png diff --git a/radio/src/bitmaps/colorlcd/mask_mainviews_item_in.png b/radio/src/bitmaps/480x272/mask_mainviews_item_in.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_mainviews_item_in.png rename to radio/src/bitmaps/480x272/mask_mainviews_item_in.png diff --git a/radio/src/bitmaps/colorlcd/mask_mainviews_item_out.png b/radio/src/bitmaps/480x272/mask_mainviews_item_out.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_mainviews_item_out.png rename to radio/src/bitmaps/480x272/mask_mainviews_item_out.png diff --git a/radio/src/bitmaps/colorlcd/mask_point.png b/radio/src/bitmaps/480x272/mask_point.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_point.png rename to radio/src/bitmaps/480x272/mask_point.png diff --git a/radio/src/bitmaps/colorlcd/mask_rscale.png b/radio/src/bitmaps/480x272/mask_rscale.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_rscale.png rename to radio/src/bitmaps/480x272/mask_rscale.png diff --git a/radio/src/bitmaps/colorlcd/mask_shutdown_circle.png b/radio/src/bitmaps/480x272/mask_shutdown_circle.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_shutdown_circle.png rename to radio/src/bitmaps/480x272/mask_shutdown_circle.png diff --git a/radio/src/bitmaps/colorlcd/mask_swipe_circle.png b/radio/src/bitmaps/480x272/mask_swipe_circle.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_swipe_circle.png rename to radio/src/bitmaps/480x272/mask_swipe_circle.png diff --git a/radio/src/bitmaps/colorlcd/mask_swipe_left.png b/radio/src/bitmaps/480x272/mask_swipe_left.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_swipe_left.png rename to radio/src/bitmaps/480x272/mask_swipe_left.png diff --git a/radio/src/bitmaps/colorlcd/mask_swipe_right.png b/radio/src/bitmaps/480x272/mask_swipe_right.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_swipe_right.png rename to radio/src/bitmaps/480x272/mask_swipe_right.png diff --git a/radio/src/bitmaps/colorlcd/mask_timer.png b/radio/src/bitmaps/480x272/mask_timer.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_timer.png rename to radio/src/bitmaps/480x272/mask_timer.png diff --git a/radio/src/bitmaps/colorlcd/mask_timer_bg.png b/radio/src/bitmaps/480x272/mask_timer_bg.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_timer_bg.png rename to radio/src/bitmaps/480x272/mask_timer_bg.png diff --git a/radio/src/bitmaps/colorlcd/mask_topmenu_altitude_ico.png b/radio/src/bitmaps/480x272/mask_topmenu_altitude_ico.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_topmenu_altitude_ico.png rename to radio/src/bitmaps/480x272/mask_topmenu_altitude_ico.png diff --git a/radio/src/bitmaps/colorlcd/mask_topmenu_masterpart_ico.png b/radio/src/bitmaps/480x272/mask_topmenu_masterpart_ico.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_topmenu_masterpart_ico.png rename to radio/src/bitmaps/480x272/mask_topmenu_masterpart_ico.png diff --git a/radio/src/bitmaps/colorlcd/mask_topmenu_sdcard.png b/radio/src/bitmaps/480x272/mask_topmenu_sdcard.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_topmenu_sdcard.png rename to radio/src/bitmaps/480x272/mask_topmenu_sdcard.png diff --git a/radio/src/bitmaps/colorlcd/mask_topmenu_slavepart_ico.png b/radio/src/bitmaps/480x272/mask_topmenu_slavepart_ico.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_topmenu_slavepart_ico.png rename to radio/src/bitmaps/480x272/mask_topmenu_slavepart_ico.png diff --git a/radio/src/bitmaps/colorlcd/mask_topmenu_usb.png b/radio/src/bitmaps/480x272/mask_topmenu_usb.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_topmenu_usb.png rename to radio/src/bitmaps/480x272/mask_topmenu_usb.png diff --git a/radio/src/bitmaps/colorlcd/mask_topmenu_volume_ico.png b/radio/src/bitmaps/480x272/mask_topmenu_volume_ico.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_topmenu_volume_ico.png rename to radio/src/bitmaps/480x272/mask_topmenu_volume_ico.png diff --git a/radio/src/bitmaps/colorlcd/mask_trim_shadow.png b/radio/src/bitmaps/480x272/mask_trim_shadow.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_trim_shadow.png rename to radio/src/bitmaps/480x272/mask_trim_shadow.png diff --git a/radio/src/bitmaps/colorlcd/mask_txbat.png b/radio/src/bitmaps/480x272/mask_txbat.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_txbat.png rename to radio/src/bitmaps/480x272/mask_txbat.png diff --git a/radio/src/bitmaps/colorlcd/mask_vtrim_frame.png b/radio/src/bitmaps/480x272/mask_vtrim_frame.png similarity index 100% rename from radio/src/bitmaps/colorlcd/mask_vtrim_frame.png rename to radio/src/bitmaps/480x272/mask_vtrim_frame.png diff --git a/radio/src/bitmaps/colorlcd/slider/bar_left.png b/radio/src/bitmaps/480x272/slider/bar_left.png similarity index 100% rename from radio/src/bitmaps/colorlcd/slider/bar_left.png rename to radio/src/bitmaps/480x272/slider/bar_left.png diff --git a/radio/src/bitmaps/colorlcd/slider/bar_right.png b/radio/src/bitmaps/480x272/slider/bar_right.png similarity index 100% rename from radio/src/bitmaps/colorlcd/slider/bar_right.png rename to radio/src/bitmaps/480x272/slider/bar_right.png diff --git a/radio/src/bitmaps/colorlcd/slider/point_in.png b/radio/src/bitmaps/480x272/slider/point_in.png similarity index 100% rename from radio/src/bitmaps/colorlcd/slider/point_in.png rename to radio/src/bitmaps/480x272/slider/point_in.png diff --git a/radio/src/bitmaps/colorlcd/slider/point_mid.png b/radio/src/bitmaps/480x272/slider/point_mid.png similarity index 100% rename from radio/src/bitmaps/colorlcd/slider/point_mid.png rename to radio/src/bitmaps/480x272/slider/point_mid.png diff --git a/radio/src/bitmaps/colorlcd/slider/point_out.png b/radio/src/bitmaps/480x272/slider/point_out.png similarity index 100% rename from radio/src/bitmaps/colorlcd/slider/point_out.png rename to radio/src/bitmaps/480x272/slider/point_out.png diff --git a/radio/src/bitmaps/colorlcd/volume/mask_volume_0.png b/radio/src/bitmaps/480x272/volume/mask_volume_0.png similarity index 100% rename from radio/src/bitmaps/colorlcd/volume/mask_volume_0.png rename to radio/src/bitmaps/480x272/volume/mask_volume_0.png diff --git a/radio/src/bitmaps/colorlcd/volume/mask_volume_1.png b/radio/src/bitmaps/480x272/volume/mask_volume_1.png similarity index 100% rename from radio/src/bitmaps/colorlcd/volume/mask_volume_1.png rename to radio/src/bitmaps/480x272/volume/mask_volume_1.png diff --git a/radio/src/bitmaps/colorlcd/volume/mask_volume_2.png b/radio/src/bitmaps/480x272/volume/mask_volume_2.png similarity index 100% rename from radio/src/bitmaps/colorlcd/volume/mask_volume_2.png rename to radio/src/bitmaps/480x272/volume/mask_volume_2.png diff --git a/radio/src/bitmaps/colorlcd/volume/mask_volume_3.png b/radio/src/bitmaps/480x272/volume/mask_volume_3.png similarity index 100% rename from radio/src/bitmaps/colorlcd/volume/mask_volume_3.png rename to radio/src/bitmaps/480x272/volume/mask_volume_3.png diff --git a/radio/src/bitmaps/colorlcd/volume/mask_volume_4.png b/radio/src/bitmaps/480x272/volume/mask_volume_4.png similarity index 100% rename from radio/src/bitmaps/colorlcd/volume/mask_volume_4.png rename to radio/src/bitmaps/480x272/volume/mask_volume_4.png diff --git a/radio/src/bitmaps/colorlcd/volume/mask_volume_scale.png b/radio/src/bitmaps/480x272/volume/mask_volume_scale.png similarity index 100% rename from radio/src/bitmaps/colorlcd/volume/mask_volume_scale.png rename to radio/src/bitmaps/480x272/volume/mask_volume_scale.png diff --git a/radio/src/bitmaps/CMakeLists.txt b/radio/src/bitmaps/CMakeLists.txt index eba043f46..0bc46b5cf 100644 --- a/radio/src/bitmaps/CMakeLists.txt +++ b/radio/src/bitmaps/CMakeLists.txt @@ -1 +1 @@ -add_subdirectory(${GUI_DIR}) +add_subdirectory(${BITMAPS_DIR}) diff --git a/radio/src/gui/128x64/bmp.cpp b/radio/src/gui/128x64/bmp.cpp index 81f352e00..e03c3c825 100644 --- a/radio/src/gui/128x64/bmp.cpp +++ b/radio/src/gui/128x64/bmp.cpp @@ -28,28 +28,28 @@ uint8_t * lcdLoadBitmap(uint8_t * bmp, const char * filename, uint8_t width, uin uint8_t * buf = &bmpBuf[0]; if (width > LCD_W) { - return NULL; + return nullptr; } FRESULT result = f_open(&bmpFile, filename, FA_OPEN_EXISTING | FA_READ); if (result != FR_OK) { - return NULL; + return nullptr; } if (f_size(&bmpFile) < 14) { f_close(&bmpFile); - return NULL; + return nullptr; } result = f_read(&bmpFile, buf, 14, &read); if (result != FR_OK || read != 14) { f_close(&bmpFile); - return NULL; + return nullptr; } if (buf[0] != 'B' || buf[1] != 'M') { f_close(&bmpFile); - return NULL; + return nullptr; } uint32_t fsize = *((uint32_t *)&buf[2]); @@ -59,7 +59,7 @@ uint8_t * lcdLoadBitmap(uint8_t * bmp, const char * filename, uint8_t width, uin result = f_read(&bmpFile, buf, len, &read); if (result != FR_OK || read != len) { f_close(&bmpFile); - return NULL; + return nullptr; } uint32_t ihsize = *((uint32_t *)&buf[0]); /* more header size */ @@ -67,7 +67,7 @@ uint8_t * lcdLoadBitmap(uint8_t * bmp, const char * filename, uint8_t width, uin /* invalid header size */ if (ihsize + 14 > hsize) { f_close(&bmpFile); - return NULL; + return nullptr; } /* sometimes file size is set to some headers size, set a real size in that case */ @@ -78,7 +78,7 @@ uint8_t * lcdLoadBitmap(uint8_t * bmp, const char * filename, uint8_t width, uin /* declared file size less than header size */ if (fsize <= hsize) { f_close(&bmpFile); - return NULL; + return nullptr; } uint32_t w, h; @@ -100,17 +100,17 @@ uint8_t * lcdLoadBitmap(uint8_t * bmp, const char * filename, uint8_t width, uin break; default: f_close(&bmpFile); - return NULL; + return nullptr; } if (*((uint16_t *)&buf[0]) != 1) { /* planes */ f_close(&bmpFile); - return NULL; + return nullptr; } if (w > width || h > height) { f_close(&bmpFile); - return NULL; + return nullptr; } uint16_t depth = *((uint16_t *)&buf[2]); @@ -119,7 +119,7 @@ uint8_t * lcdLoadBitmap(uint8_t * bmp, const char * filename, uint8_t width, uin if (f_lseek(&bmpFile, hsize) != FR_OK) { f_close(&bmpFile); - return NULL; + return nullptr; } uint8_t * dest = bmp; @@ -138,7 +138,7 @@ uint8_t * lcdLoadBitmap(uint8_t * bmp, const char * filename, uint8_t width, uin result = f_read(&bmpFile, buf, rowSize, &read); if (result != FR_OK || read != rowSize) { f_close(&bmpFile); - return NULL; + return nullptr; } for (uint8_t j=0; jchn+1 == ch && EXPO_VALID(ed)) : (isrcRaw && md->destCh+1 == ch)) { if (menuVerticalOffset < cur && cur-menuVerticalOffset < LCD_LINES) { diff --git a/radio/src/gui/128x64/model_outputs.cpp b/radio/src/gui/128x64/model_outputs.cpp index 03bcb443d..fa8b3e394 100644 --- a/radio/src/gui/128x64/model_outputs.cpp +++ b/radio/src/gui/128x64/model_outputs.cpp @@ -134,7 +134,7 @@ void menuModelLimitsOne(event_t event) } lcdDrawNumber(LIMITS_ONE_2ND_COLUMN, y, MIN_MAX_DISPLAY(ld->min-LIMITS_MIN_MAX_OFFSET), attr|PREC1); if (active) { - ld->min = LIMITS_MIN_MAX_OFFSET + checkIncDec(event, ld->min-LIMITS_MIN_MAX_OFFSET, -limit, 0, EE_MODEL, NULL, stops1000); + ld->min = LIMITS_MIN_MAX_OFFSET + checkIncDec(event, ld->min-LIMITS_MIN_MAX_OFFSET, -limit, 0, EE_MODEL, nullptr, stops1000); } break; @@ -146,7 +146,7 @@ void menuModelLimitsOne(event_t event) } lcdDrawNumber(LIMITS_ONE_2ND_COLUMN, y, MIN_MAX_DISPLAY(ld->max+LIMITS_MIN_MAX_OFFSET), attr|PREC1); if (active) { - ld->max = -LIMITS_MIN_MAX_OFFSET + checkIncDec(event, ld->max+LIMITS_MIN_MAX_OFFSET, 0, +limit, EE_MODEL, NULL, stops1000); + ld->max = -LIMITS_MIN_MAX_OFFSET + checkIncDec(event, ld->max+LIMITS_MIN_MAX_OFFSET, 0, +limit, EE_MODEL, nullptr, stops1000); } break; diff --git a/radio/src/gui/128x64/widgets.cpp b/radio/src/gui/128x64/widgets.cpp index 89e82999a..d604578c7 100644 --- a/radio/src/gui/128x64/widgets.cpp +++ b/radio/src/gui/128x64/widgets.cpp @@ -84,7 +84,7 @@ uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const char *label, Lcd { #if defined(GRAPHICS) drawCheckBox(x, y, value, attr); - return editChoice(x, y, label, NULL, value, 0, 1, attr, event); + return editChoice(x, y, label, nullptr, value, 0, 1, attr, event); #else return editChoice(x, y, label, STR_OFFON, value, 0, 1, attr, event); #endif diff --git a/radio/src/gui/212x64/bmp.cpp b/radio/src/gui/212x64/bmp.cpp index 180567b59..f920b6d2e 100644 --- a/radio/src/gui/212x64/bmp.cpp +++ b/radio/src/gui/212x64/bmp.cpp @@ -29,28 +29,28 @@ uint8_t * lcdLoadBitmap(uint8_t * bmp, const char * filename, uint16_t width, ui uint8_t * buf = &bmpBuf[0]; if (width > LCD_W) { - return NULL; + return nullptr; } FRESULT result = f_open(&bmpFile, filename, FA_OPEN_EXISTING | FA_READ); if (result != FR_OK) { - return NULL; + return nullptr; } if (f_size(&bmpFile) < 14) { f_close(&bmpFile); - return NULL; + return nullptr; } result = f_read(&bmpFile, buf, 14, &read); if (result != FR_OK || read != 14) { f_close(&bmpFile); - return NULL; + return nullptr; } if (buf[0] != 'B' || buf[1] != 'M') { f_close(&bmpFile); - return NULL; + return nullptr; } uint32_t fsize = *((uint32_t *)&buf[2]); @@ -60,7 +60,7 @@ uint8_t * lcdLoadBitmap(uint8_t * bmp, const char * filename, uint16_t width, ui result = f_read(&bmpFile, buf, len, &read); if (result != FR_OK || read != len) { f_close(&bmpFile); - return NULL; + return nullptr; } uint32_t ihsize = *((uint32_t *)&buf[0]); /* more header size */ @@ -68,7 +68,7 @@ uint8_t * lcdLoadBitmap(uint8_t * bmp, const char * filename, uint16_t width, ui /* invalid header size */ if (ihsize + 14 > hsize) { f_close(&bmpFile); - return NULL; + return nullptr; } /* sometimes file size is set to some headers size, set a real size in that case */ @@ -78,7 +78,7 @@ uint8_t * lcdLoadBitmap(uint8_t * bmp, const char * filename, uint16_t width, ui /* declared file size less than header size */ if (fsize <= hsize) { f_close(&bmpFile); - return NULL; + return nullptr; } uint32_t w, h; @@ -100,17 +100,17 @@ uint8_t * lcdLoadBitmap(uint8_t * bmp, const char * filename, uint16_t width, ui break; default: f_close(&bmpFile); - return NULL; + return nullptr; } if (*((uint16_t *)&buf[0]) != 1) { /* planes */ f_close(&bmpFile); - return NULL; + return nullptr; } if (w > width || h > height) { f_close(&bmpFile); - return NULL; + return nullptr; } uint16_t depth = *((uint16_t *)&buf[2]); @@ -120,7 +120,7 @@ uint8_t * lcdLoadBitmap(uint8_t * bmp, const char * filename, uint16_t width, ui if (depth == 4) { if (f_lseek(&bmpFile, hsize-64) != FR_OK || f_read(&bmpFile, buf, 64, &read) != FR_OK || read != 64) { f_close(&bmpFile); - return NULL; + return nullptr; } for (uint8_t i=0; i<16; i++) { palette[i] = buf[4*i] >> 4; @@ -129,7 +129,7 @@ uint8_t * lcdLoadBitmap(uint8_t * bmp, const char * filename, uint16_t width, ui else { if (f_lseek(&bmpFile, hsize) != FR_OK) { f_close(&bmpFile); - return NULL; + return nullptr; } } @@ -149,7 +149,7 @@ uint8_t * lcdLoadBitmap(uint8_t * bmp, const char * filename, uint16_t width, ui result = f_read(&bmpFile, buf, rowSize*2, &read); if (result != FR_OK || read != rowSize*2) { f_close(&bmpFile); - return NULL; + return nullptr; } for (uint32_t j=0; jv1; @@ -167,7 +167,7 @@ void menuModelLogicalSwitches(event_t event) } else { INCDEC_SET_FLAG(EE_MODEL); - INCDEC_ENABLE_CHECK(NULL); + INCDEC_ENABLE_CHECK(nullptr); } LcdFlags lf = attr2 | LEFT; getMixSrcRange(v1_val, v2_min, v2_max, &lf); diff --git a/radio/src/gui/212x64/model_outputs.cpp b/radio/src/gui/212x64/model_outputs.cpp index c3e5337c6..f944c04c4 100644 --- a/radio/src/gui/212x64/model_outputs.cpp +++ b/radio/src/gui/212x64/model_outputs.cpp @@ -166,7 +166,7 @@ void menuModelLimits(event_t event) lcdDrawNumber(LIMITS_OFFSET_POS, y, ld->offset, attr|PREC1|RIGHT); #endif if (active) { - ld->offset = checkIncDec(event, ld->offset, -1000, 1000, EE_MODEL, NULL, stops1000); + ld->offset = checkIncDec(event, ld->offset, -1000, 1000, EE_MODEL, nullptr, stops1000); } else if (attr && event==EVT_KEY_LONG(KEY_MENU)) { copySticksToOffset(k); @@ -180,7 +180,7 @@ void menuModelLimits(event_t event) break; } lcdDrawNumber(LIMITS_MIN_POS, y, MIN_MAX_DISPLAY(ld->min-LIMITS_MIN_MAX_OFFSET), attr|PREC1|RIGHT); - if (active) ld->min = LIMITS_MIN_MAX_OFFSET + checkIncDec(event, ld->min-LIMITS_MIN_MAX_OFFSET, -limit, 0, EE_MODEL, NULL, stops1000); + if (active) ld->min = LIMITS_MIN_MAX_OFFSET + checkIncDec(event, ld->min-LIMITS_MIN_MAX_OFFSET, -limit, 0, EE_MODEL, nullptr, stops1000); break; case ITEM_LIMITS_MAX: @@ -189,7 +189,7 @@ void menuModelLimits(event_t event) break; } lcdDrawNumber(LIMITS_MAX_POS, y, MIN_MAX_DISPLAY(ld->max+LIMITS_MIN_MAX_OFFSET), attr|PREC1|RIGHT); - if (active) ld->max = -LIMITS_MIN_MAX_OFFSET + checkIncDec(event, ld->max+LIMITS_MIN_MAX_OFFSET, 0, +limit, EE_MODEL, NULL, stops1000); + if (active) ld->max = -LIMITS_MIN_MAX_OFFSET + checkIncDec(event, ld->max+LIMITS_MIN_MAX_OFFSET, 0, +limit, EE_MODEL, nullptr, stops1000); break; case ITEM_LIMITS_DIRECTION: diff --git a/radio/src/gui/colorlcd/layouts/layout1x1.cpp b/radio/src/gui/colorlcd/layouts/layout1x1.cpp index bbbbcd5c2..2dcd44a7a 100644 --- a/radio/src/gui/colorlcd/layouts/layout1x1.cpp +++ b/radio/src/gui/colorlcd/layouts/layout1x1.cpp @@ -27,7 +27,7 @@ const uint8_t LBM_LAYOUT_1x1[] = { const ZoneOption OPTIONS_LAYOUT_1x1[] = { { "Top bar", ZoneOption::Bool }, { "Sliders+Trims", ZoneOption::Bool }, - { NULL, ZoneOption::Bool } + { nullptr, ZoneOption::Bool } }; class Layout1x1: public Layout diff --git a/radio/src/gui/colorlcd/layouts/layout2x1.cpp b/radio/src/gui/colorlcd/layouts/layout2x1.cpp index 9a7ce49fe..6344ada45 100644 --- a/radio/src/gui/colorlcd/layouts/layout2x1.cpp +++ b/radio/src/gui/colorlcd/layouts/layout2x1.cpp @@ -26,7 +26,7 @@ const uint8_t LBM_LAYOUT_2x1[] = { const ZoneOption OPTIONS_LAYOUT_2x1[] = { { "Top bar", ZoneOption::Bool }, - { NULL, ZoneOption::Bool } + { nullptr, ZoneOption::Bool } }; class Layout2x1: public Layout diff --git a/radio/src/gui/colorlcd/layouts/layout2x4.cpp b/radio/src/gui/colorlcd/layouts/layout2x4.cpp index d982c4ddb..035e84119 100644 --- a/radio/src/gui/colorlcd/layouts/layout2x4.cpp +++ b/radio/src/gui/colorlcd/layouts/layout2x4.cpp @@ -33,7 +33,7 @@ const ZoneOption OPTIONS_LAYOUT_2x4[] = { { " Color", ZoneOption::Color }, { "Panel2 background", ZoneOption::Bool }, { " Color", ZoneOption::Color }, - { NULL, ZoneOption::Bool } + { nullptr, ZoneOption::Bool } }; class Layout2x4: public Layout diff --git a/radio/src/gui/colorlcd/model_custom_scripts.cpp b/radio/src/gui/colorlcd/model_custom_scripts.cpp index d2c813058..5385ddb6e 100644 --- a/radio/src/gui/colorlcd/model_custom_scripts.cpp +++ b/radio/src/gui/colorlcd/model_custom_scripts.cpp @@ -25,7 +25,7 @@ void onModelCustomScriptMenu(const char *result) ScriptData &sd = g_model.scriptsData[s_currIdx]; if (result == STR_UPDATE_LIST) { - if (!sdListFiles(SCRIPTS_MIXES_PATH, SCRIPTS_EXT, sizeof(sd.file), NULL)) { + if (!sdListFiles(SCRIPTS_MIXES_PATH, SCRIPTS_EXT, sizeof(sd.file), nullptr)) { POPUP_WARNING(STR_NO_SCRIPTS_ON_SD); } } @@ -157,7 +157,7 @@ bool menuModelCustomScripts(event_t event) lcdDrawText(SCRIPTS_COLUMN_STATE, y, "(killed)"); break; default: - lcdDrawNumber(SCRIPTS_COLUMN_STATE, y, luaGetCpuUsed(scriptIndex), LEFT|DEFAULT_COLOR, 0, NULL, "%"); + lcdDrawNumber(SCRIPTS_COLUMN_STATE, y, luaGetCpuUsed(scriptIndex), LEFT|DEFAULT_COLOR, 0, nullptr, "%"); break; } scriptIndex++; diff --git a/radio/src/gui/colorlcd/model_select.cpp b/radio/src/gui/colorlcd/model_select.cpp index aefc68865..a567561a5 100644 --- a/radio/src/gui/colorlcd/model_select.cpp +++ b/radio/src/gui/colorlcd/model_select.cpp @@ -99,7 +99,7 @@ void setCurrentCategory(unsigned int index) /*if (currentCategory->size() > 0) setCurrentModel(0); else - currentModel = NULL;*/ + currentModel = nullptr;*/ } #endif diff --git a/radio/src/gui/colorlcd/model_select_old.cpp b/radio/src/gui/colorlcd/model_select_old.cpp index 975908c9f..a405bdc35 100644 --- a/radio/src/gui/colorlcd/model_select_old.cpp +++ b/radio/src/gui/colorlcd/model_select_old.cpp @@ -95,7 +95,7 @@ void setCurrentCategory(unsigned int index) if (currentCategory->size() > 0) setCurrentModel(0); else - currentModel = NULL; + currentModel = nullptr; } #if defined(LUA) @@ -511,7 +511,7 @@ bool menuModelSelect(event_t event) // Footer lcd->drawBitmap(5, LCD_H-FH-20, modelselSdFreeBitmap); uint32_t size = sdGetSize() / 100; - lcdDrawNumber(22, LCD_H-FH-21, size, PREC1|FONT(XS), 0, NULL, "GB"); + lcdDrawNumber(22, LCD_H-FH-21, size, PREC1|FONT(XS), 0, nullptr, "GB"); lcd->drawBitmap(70, LCD_H-FH-20, modelselModelQtyBitmap); lcdDrawNumber(92, LCD_H-FH-21, modelslist.getModelsCount(),FONT(XS)); diff --git a/radio/src/gui/colorlcd/model_telemetry.cpp b/radio/src/gui/colorlcd/model_telemetry.cpp index 0929bdd62..dd05e212e 100644 --- a/radio/src/gui/colorlcd/model_telemetry.cpp +++ b/radio/src/gui/colorlcd/model_telemetry.cpp @@ -77,7 +77,7 @@ class SensorButton : public Button { dc->drawSolidFilledRect(2, 2, rect.w - 4, rect.h - 4, HIGHLIGHT_COLOR); } - dc->drawNumber(2, 1, number, LEFT, 0, NULL, ":"); + dc->drawNumber(2, 1, number, LEFT, 0, nullptr, ":"); dc->drawSizedText(SENSOR_COL1, line1, g_model.telemetrySensors[index].label, TELEM_LABEL_LEN); diff --git a/radio/src/gui/colorlcd/radio_sdmanager.cpp b/radio/src/gui/colorlcd/radio_sdmanager.cpp index 23a546fc5..1ce840186 100644 --- a/radio/src/gui/colorlcd/radio_sdmanager.cpp +++ b/radio/src/gui/colorlcd/radio_sdmanager.cpp @@ -244,11 +244,11 @@ bool menuRadioSdManagerInfo(event_t event) lcdDrawText(100, 2*FH, SD_IS_HC() ? STR_SDHC_CARD : STR_SD_CARD); lcdDrawText(MENUS_MARGIN_LEFT, 3*FH, STR_SD_SIZE); - lcdDrawNumber(100, 3*FH, sdGetSize(), LEFT, 0, NULL, "M"); + lcdDrawNumber(100, 3*FH, sdGetSize(), LEFT, 0, nullptr, "M"); lcdDrawText(MENUS_MARGIN_LEFT, 4*FH, STR_SD_SECTORS); #if defined(SD_GET_FREE_BLOCKNR) - lcdDrawNumber(100, 4*FH, SD_GET_FREE_BLOCKNR()/1000, LEFT, 0, NULL, "/"); + lcdDrawNumber(100, 4*FH, SD_GET_FREE_BLOCKNR()/1000, LEFT, 0, nullptr, "/"); lcdDrawNumber(150, 4*FH, sdGetNoSectors()/1000, LEFT); #else lcdDrawNumber(100, 4*FH, sdGetNoSectors()/1000, LEFT, 0, NULL, "k"); diff --git a/radio/src/gui/colorlcd/screens_setup_old.cpp b/radio/src/gui/colorlcd/screens_setup_old.cpp index 21fe29e6f..cf9671c8c 100644 --- a/radio/src/gui/colorlcd/screens_setup_old.cpp +++ b/radio/src/gui/colorlcd/screens_setup_old.cpp @@ -49,7 +49,7 @@ void onScreenSetupMenu(const char * result); void onZoneOptionFileSelectionMenu(const char * result) { if (result == STR_UPDATE_LIST) { - if (!sdListFiles(BITMAPS_PATH, BITMAPS_EXT, LEN_ZONE_OPTION_STRING, NULL)) { + if (!sdListFiles(BITMAPS_PATH, BITMAPS_EXT, LEN_ZONE_OPTION_STRING, nullptr)) { POPUP_WARNING(STR_NO_BITMAPS_ON_SD); } } @@ -163,7 +163,7 @@ bool editZoneOption(coord_t y, const ZoneOption * option, ZoneOptionValue * valu int getOptionsCount(const ZoneOption * options) { - if (options == NULL) { + if (options == nullptr) { return 0; } else { @@ -228,8 +228,8 @@ bool menuWidgetSettings(event_t event) bool menuWidgetChoice(event_t event) { - static Widget * previousWidget = NULL; - static Widget * currentWidget = NULL; + static Widget * previousWidget = nullptr; + static Widget * currentWidget = nullptr; static std::list::const_iterator iterator; static Widget::PersistentData tempData; @@ -237,7 +237,7 @@ bool menuWidgetChoice(event_t event) case EVT_ENTRY: { previousWidget = currentContainer->getWidget(currentZone); - currentContainer->setWidget(currentZone, NULL); + currentContainer->setWidget(currentZone, nullptr); iterator = getRegisteredWidgets().cbegin(); if (previousWidget) { const WidgetFactory * factory = previousWidget->getFactory(); @@ -327,7 +327,7 @@ void onZoneMenu(const char * result) pushMenu(menuWidgetSettings); } else if (result == STR_REMOVE_WIDGET) { - currentContainer->createWidget(currentZone, NULL); + currentContainer->createWidget(currentZone, nullptr); storageDirty(EE_MODEL); } } @@ -403,7 +403,7 @@ T * editThemeChoice(coord_t x, coord_t y, std::list & elList, T * current, typename std::list::const_iterator elItr = elList.cbegin(); if (!elCount) - return NULL; + return nullptr; for (; elItr != elList.cend(); ++elItr, ++currentIndex) { if ((*elItr) == current) @@ -461,10 +461,10 @@ T * editThemeChoice(coord_t x, coord_t y, std::list & elList, T * current, if (elItr != elList.cend()) return (*elItr); else - return NULL; + return nullptr; } } - return NULL; + return nullptr; } enum menuScreensThemeItems { @@ -550,7 +550,7 @@ enum MenuScreenSetupItems { bool menuScreenSetup(int index, event_t event) { - if (customScreens[index] == NULL) { + if (customScreens[index] == nullptr) { return menuScreenAdd(event); } @@ -625,7 +625,7 @@ bool menuScreenSetup(int index, event_t event) memmove(&customScreens[index], &customScreens[index + 1], sizeof(Layout *) * (MAX_CUSTOM_SCREENS - index - 1)); } memset(&g_model.screenData[MAX_CUSTOM_SCREENS-1], 0, sizeof(CustomScreenData)); - customScreens[MAX_CUSTOM_SCREENS-1] = NULL; + customScreens[MAX_CUSTOM_SCREENS-1] = nullptr; loadCustomScreens(); killEvents(KEY_ENTER); chainMenu(menuTabScreensSetup[index > 0 ? index : 1]); diff --git a/radio/src/gui/colorlcd/theme.cpp b/radio/src/gui/colorlcd/theme.cpp index ae5cf0403..647d127ec 100644 --- a/radio/src/gui/colorlcd/theme.cpp +++ b/radio/src/gui/colorlcd/theme.cpp @@ -23,9 +23,9 @@ //#include "modal_window.h" extern ThemeBase * defaultTheme; -const BitmapBuffer * ThemeBase::asterisk = NULL; -const BitmapBuffer * ThemeBase::question = NULL; -const BitmapBuffer * ThemeBase::busy = NULL; +const BitmapBuffer * ThemeBase::asterisk = nullptr; +const BitmapBuffer * ThemeBase::question = nullptr; +const BitmapBuffer * ThemeBase::busy = nullptr; const uint8_t LBM_FOLDER[] = { #include "mask_folder.lbm" diff --git a/radio/src/gui/colorlcd/view_channels.cpp b/radio/src/gui/colorlcd/view_channels.cpp index 019433b5e..b504b2b04 100644 --- a/radio/src/gui/colorlcd/view_channels.cpp +++ b/radio/src/gui/colorlcd/view_channels.cpp @@ -79,13 +79,13 @@ void drawSingleMixerBar(coord_t x, coord_t y, coord_t w, coord_t h, uint8_t chan lcdDrawSolidFilledRect(x, y, w, h, BARGRAPH_BGCOLOR); if (chanVal > 0) { lcdDrawSolidFilledRect(x + w / 2, y, divRoundClosest(chanVal * w, VIEW_CHANNELS_LIMIT_PCT * 2), h, BARGRAPH2_COLOR); - lcdDrawNumber(x - 10 + w / 2, y - 2, displayVal, FONT(XS) | DEFAULT_COLOR | RIGHT, 0, NULL, "%"); + lcdDrawNumber(x - 10 + w / 2, y - 2, displayVal, FONT(XS) | DEFAULT_COLOR | RIGHT, 0, nullptr, "%"); } else if (chanVal < 0) { const uint16_t endpoint = x + w / 2; const uint16_t size = divRoundClosest(-chanVal * w, VIEW_CHANNELS_LIMIT_PCT * 2); lcdDrawSolidFilledRect(endpoint - size, y, size, h, BARGRAPH2_COLOR); - lcdDrawNumber(x + 10 + w / 2, y - 2, displayVal, FONT(XS) | DEFAULT_COLOR, 0, NULL, "%"); + lcdDrawNumber(x + 10 + w / 2, y - 2, displayVal, FONT(XS) | DEFAULT_COLOR, 0, nullptr, "%"); } lcd->drawSolidVerticalLine(x + w / 2, y, h, DEFAULT_COLOR); @@ -101,13 +101,13 @@ void drawSingleOutputBar(coord_t x, coord_t y, coord_t w, coord_t h, uint8_t cha lcdDrawSolidFilledRect(x, y, w, h, BARGRAPH_BGCOLOR); if (chanVal > 0) { lcdDrawSolidFilledRect(x + w / 2, y, divRoundClosest(chanVal * w, VIEW_CHANNELS_LIMIT_PCT * 2), h, BARGRAPH1_COLOR); - lcdDrawNumber(x - 10 + w / 2, y - 2, displayVal, FONT(XS) | DEFAULT_COLOR | RIGHT, 0, NULL, "%"); + lcdDrawNumber(x - 10 + w / 2, y - 2, displayVal, FONT(XS) | DEFAULT_COLOR | RIGHT, 0, nullptr, "%"); } else if (chanVal < 0) { uint16_t endpoint = x + w / 2; uint16_t size = divRoundClosest(-chanVal * w, VIEW_CHANNELS_LIMIT_PCT * 2); lcdDrawSolidFilledRect(endpoint - size, y, size, h, BARGRAPH1_COLOR); - lcdDrawNumber(x + 10 + w / 2, y - 2, displayVal, FONT(XS) | DEFAULT_COLOR, 0, NULL, "%"); + lcdDrawNumber(x + 10 + w / 2, y - 2, displayVal, FONT(XS) | DEFAULT_COLOR, 0, nullptr, "%"); } lcd->drawSolidVerticalLine(x + w / 2, y, h, DEFAULT_COLOR); @@ -126,7 +126,7 @@ void drawComboOutputBar(coord_t x, coord_t y, coord_t w, coord_t h, uint8_t chan lcdDrawText(x, y, chanString, FONT(XS) | DEFAULT_COLOR | LEFT); lcdDrawSizedText(x + 45, y, g_model.limitData[channel].name, sizeof(g_model.limitData[channel].name), FONT(XS) | DEFAULT_COLOR | LEFT | ZCHAR); - lcdDrawNumber(x + w, y, usValue, FONT(XS) | DEFAULT_COLOR | RIGHT, 0, NULL, STR_US); + lcdDrawNumber(x + w, y, usValue, FONT(XS) | DEFAULT_COLOR | RIGHT, 0, nullptr, STR_US); lcdDrawSolidFilledRect(x, y + Y_OUTBAR, w, h, BARGRAPH_BGCOLOR); lcd->drawSolidVerticalLine(x + limPos, y + Y_OUTBAR, h, MAINVIEW_GRAPHICS_COLOR); @@ -156,9 +156,9 @@ void drawComboOutputBar(coord_t x, coord_t y, coord_t w, coord_t h, uint8_t chan #endif lcd->drawSolidVerticalLine(x + w / 2, y + Y_OUTBAR, h, DEFAULT_COLOR); if (chanVal > calcRESXto100((ld && ld->revert) ? -ld->offset : ld->offset)) - lcdDrawNumber(x + limPos, y + h, chanVal, FONT(XS) | DEFAULT_COLOR | RIGHT, 0, NULL, "%"); + lcdDrawNumber(x + limPos, y + h, chanVal, FONT(XS) | DEFAULT_COLOR | RIGHT, 0, nullptr, "%"); else - lcdDrawNumber(x + limPos, y + h, chanVal, FONT(XS) | DEFAULT_COLOR, 0, NULL, "%"); + lcdDrawNumber(x + limPos, y + h, chanVal, FONT(XS) | DEFAULT_COLOR, 0, nullptr, "%"); } coord_t drawChannelsMonitorLegend(coord_t x, const char * s, int color) diff --git a/radio/src/gui/colorlcd/view_statistics.cpp b/radio/src/gui/colorlcd/view_statistics.cpp index 378e95223..4bbfee34e 100644 --- a/radio/src/gui/colorlcd/view_statistics.cpp +++ b/radio/src/gui/colorlcd/view_statistics.cpp @@ -119,15 +119,15 @@ bool menuStatsDebug(event_t event) coord_t y = MENU_CONTENT_TOP; lcdDrawText(MENUS_MARGIN_LEFT, y, "Free Mem"); - lcdDrawNumber(MENU_STATS_COLUMN1, y, availableMemory(), LEFT, 0, NULL, "b"); + lcdDrawNumber(MENU_STATS_COLUMN1, y, availableMemory(), LEFT, 0, nullptr, "b"); y += FH; #if defined(LUA) lcdDrawText(MENUS_MARGIN_LEFT, y, "Lua scripts"); lcdDrawText(MENU_STATS_COLUMN1, y+1, "[Duration]", HEADER_COLOR|FONT(XS)); - lcdDrawNumber(lcdNextPos+5, y, 10*maxLuaDuration, LEFT, 0, NULL, "ms"); + lcdDrawNumber(lcdNextPos+5, y, 10*maxLuaDuration, LEFT, 0, nullptr, "ms"); lcdDrawText(lcdNextPos+20, y+1, "[Interval]", HEADER_COLOR|FONT(XS)); - lcdDrawNumber(lcdNextPos+5, y, 10*maxLuaDuration, LEFT, 0, NULL, "ms"); + lcdDrawNumber(lcdNextPos+5, y, 10*maxLuaDuration, LEFT, 0, nullptr, "ms"); y += FH; // lcdDrawText(MENUS_MARGIN_LEFT, MENU_CONTENT_TOP+line*FH, "Lua memory"); @@ -141,7 +141,7 @@ bool menuStatsDebug(event_t event) #endif lcdDrawText(MENUS_MARGIN_LEFT, y, STR_TMIXMAXMS); - lcdDrawNumber(MENU_STATS_COLUMN1, y, DURATION_MS_PREC2(maxMixerDuration), PREC2|LEFT, 0, NULL, "ms"); + lcdDrawNumber(MENU_STATS_COLUMN1, y, DURATION_MS_PREC2(maxMixerDuration), PREC2|LEFT, 0, nullptr, "ms"); y += FH; lcdDrawText(MENUS_MARGIN_LEFT, y, STR_FREE_STACK); @@ -155,7 +155,7 @@ bool menuStatsDebug(event_t event) #if defined(DISK_CACHE) && defined(DEBUG) lcdDrawText(MENUS_MARGIN_LEFT, y, "SD cache hits"); - lcdDrawNumber(MENU_STATS_COLUMN1, y, diskCache.getHitRate(), PREC1|LEFT, 0, NULL, "%"); + lcdDrawNumber(MENU_STATS_COLUMN1, y, diskCache.getHitRate(), PREC1|LEFT, 0, nullptr, "%"); y += FH; #endif @@ -195,7 +195,7 @@ bool menuStatsAnalogs(event_t event) for (uint8_t i=0; icreate(zone, persistentData, false); } - return NULL; + return nullptr; } diff --git a/radio/src/gui/colorlcd/widgets/gauge.cpp b/radio/src/gui/colorlcd/widgets/gauge.cpp index 9ebe42243..0e03a5438 100644 --- a/radio/src/gui/colorlcd/widgets/gauge.cpp +++ b/radio/src/gui/colorlcd/widgets/gauge.cpp @@ -38,7 +38,7 @@ const ZoneOption GaugeWidget::options[] = { { "Min", ZoneOption::Integer, OPTION_VALUE_SIGNED(-RESX), OPTION_VALUE_SIGNED(-RESX), OPTION_VALUE_SIGNED(RESX) }, { "Max", ZoneOption::Integer, OPTION_VALUE_SIGNED(RESX), OPTION_VALUE_SIGNED(-RESX), OPTION_VALUE_SIGNED(RESX) }, { "Color", ZoneOption::Color, OPTION_VALUE_UNSIGNED(RED) }, - { NULL, ZoneOption::Bool } + { nullptr, ZoneOption::Bool } }; void GaugeWidget::refresh() @@ -64,7 +64,7 @@ void GaugeWidget::refresh() // Gauge lcdSetColor(color); lcdDrawSolidFilledRect(zone.x, zone.y + 16, zone.w, 16, FOCUS_COLOR); - lcdDrawNumber(zone.x+zone.w/2, zone.y + 17, percent, FONT(XS) | CUSTOM_COLOR | CENTERED, 0, NULL, "%"); + lcdDrawNumber(zone.x+zone.w/2, zone.y + 17, percent, FONT(XS) | CUSTOM_COLOR | CENTERED, 0, nullptr, "%"); lcd->invertRect(zone.x + w, zone.y + 16, zone.w - w, 16, CUSTOM_COLOR); } diff --git a/radio/src/gui/colorlcd/widgets/modelbmp.cpp b/radio/src/gui/colorlcd/widgets/modelbmp.cpp index 37c0e5928..e685b3ba9 100644 --- a/radio/src/gui/colorlcd/widgets/modelbmp.cpp +++ b/radio/src/gui/colorlcd/widgets/modelbmp.cpp @@ -25,7 +25,7 @@ class ModelBitmapWidget: public Widget public: ModelBitmapWidget(const WidgetFactory * factory, const Zone & zone, Widget::PersistentData * persistentData): Widget(factory, zone, persistentData), - buffer(NULL), + buffer(nullptr), deps_hash(0) { } @@ -83,5 +83,5 @@ class ModelBitmapWidget: public Widget uint32_t deps_hash; }; -BaseWidgetFactory modelBitmapWidget("ModelBmp", NULL); +BaseWidgetFactory modelBitmapWidget("ModelBmp", nullptr); const WidgetFactory * defaultWidget = &modelBitmapWidget; diff --git a/radio/src/gui/colorlcd/widgets/outputs.cpp b/radio/src/gui/colorlcd/widgets/outputs.cpp index 1f9fa721a..1f51db61f 100644 --- a/radio/src/gui/colorlcd/widgets/outputs.cpp +++ b/radio/src/gui/colorlcd/widgets/outputs.cpp @@ -59,7 +59,7 @@ class OutputsWidget: public Widget lcdDrawSolidFilledRect((chanVal > 0 ? barMid : barMid - fillW), barTop, fillW, barH, MAINVIEW_GRAPHICS_COLOR); lcd->drawSolidVerticalLine(barMid, barTop, barH, MAINVIEW_GRAPHICS_COLOR); lcdDrawRect(x, rowTop, w, rowH + 1); - lcdDrawNumber(x + barW - 10, barTop, chanVal, FONT(XS) | DEFAULT_COLOR | RIGHT, 0, NULL, "%"); + lcdDrawNumber(x + barW - 10, barTop, chanVal, FONT(XS) | DEFAULT_COLOR | RIGHT, 0, nullptr, "%"); if (g_model.limitData[curChan - 1].name[0] != 0) { lcdDrawNumber(barLft + 1, barTop, curChan, FONT(XS) | DEFAULT_COLOR | LEFT | LEADING0, 2); lcdDrawSizedText(barLft + 23, barTop, g_model.limitData[curChan - 1].name, sizeof(g_model.limitData[curChan - 1].name), FONT(XS) | DEFAULT_COLOR | LEFT | ZCHAR); @@ -98,7 +98,7 @@ const ZoneOption OutputsWidget::options[] = { { "First channel", ZoneOption::Integer, OPTION_VALUE_UNSIGNED(1), OPTION_VALUE_UNSIGNED(1), OPTION_VALUE_UNSIGNED(32) }, { "Fill Background?", ZoneOption::Bool, OPTION_VALUE_BOOL(false) }, { "BG Color", ZoneOption::Color, OPTION_VALUE_UNSIGNED(LIGHTGREY) }, - { NULL, ZoneOption::Bool } + { nullptr, ZoneOption::Bool } }; diff --git a/radio/src/gui/colorlcd/widgets/text.cpp b/radio/src/gui/colorlcd/widgets/text.cpp index 2ae647bd6..2c2b4d143 100644 --- a/radio/src/gui/colorlcd/widgets/text.cpp +++ b/radio/src/gui/colorlcd/widgets/text.cpp @@ -40,7 +40,7 @@ const ZoneOption TextWidget::options[] = { { "Color", ZoneOption::Color, OPTION_VALUE_UNSIGNED(RED) }, { "Size", ZoneOption::TextSize, OPTION_VALUE_UNSIGNED(0) }, { "Shadow", ZoneOption::Bool, OPTION_VALUE_BOOL(false) }, - { NULL, ZoneOption::Bool } + { nullptr, ZoneOption::Bool } }; void TextWidget::refresh() diff --git a/radio/src/gui/colorlcd/widgets/timer.cpp b/radio/src/gui/colorlcd/widgets/timer.cpp index c150ab936..e1b3d840e 100644 --- a/radio/src/gui/colorlcd/widgets/timer.cpp +++ b/radio/src/gui/colorlcd/widgets/timer.cpp @@ -35,7 +35,7 @@ class TimerWidget: public Widget const ZoneOption TimerWidget::options[] = { { "Timer source", ZoneOption::Timer, OPTION_VALUE_UNSIGNED(0) }, - { NULL, ZoneOption::Bool } + { nullptr, ZoneOption::Bool } }; void TimerWidget::refresh() diff --git a/radio/src/gui/colorlcd/widgets/value.cpp b/radio/src/gui/colorlcd/widgets/value.cpp index 7587531cc..af1f9931b 100644 --- a/radio/src/gui/colorlcd/widgets/value.cpp +++ b/radio/src/gui/colorlcd/widgets/value.cpp @@ -37,7 +37,7 @@ const ZoneOption ValueWidget::options[] = { { "Source", ZoneOption::Source, OPTION_VALUE_UNSIGNED(MIXSRC_Rud) }, { "Color", ZoneOption::Color, OPTION_VALUE_UNSIGNED(WHITE) }, { "Shadow", ZoneOption::Bool, OPTION_VALUE_BOOL(false) }, - { NULL, ZoneOption::Bool } + { nullptr, ZoneOption::Bool } }; void ValueWidget::refresh() diff --git a/radio/src/gui/colorlcd/widgets_container.h b/radio/src/gui/colorlcd/widgets_container.h index 37291018a..af7dda379 100644 --- a/radio/src/gui/colorlcd/widgets_container.h +++ b/radio/src/gui/colorlcd/widgets_container.h @@ -89,7 +89,7 @@ class WidgetsContainer: public WidgetsContainerInterface widgets[index] = factory->create(getZone(index), &persistentData->zones[index].widgetData); } else { - widgets[index] = NULL; + widgets[index] = nullptr; } } } diff --git a/radio/src/gui/common/stdlcd/popups.cpp b/radio/src/gui/common/stdlcd/popups.cpp index 918312017..37707b560 100644 --- a/radio/src/gui/common/stdlcd/popups.cpp +++ b/radio/src/gui/common/stdlcd/popups.cpp @@ -20,7 +20,7 @@ #include "opentx.h" -const char * warningText = NULL; +const char * warningText = nullptr; const char * warningInfoText; uint8_t warningInfoLength; uint8_t warningType; @@ -28,7 +28,7 @@ uint8_t warningResult = 0; uint8_t warningInfoFlags = ZCHAR; uint8_t popupMenuOffsetType = MENU_OFFSET_INTERNAL; -void (* popupFunc)(event_t event) = NULL; +void (* popupFunc)(event_t event) = nullptr; const char * popupMenuItems[POPUP_MENU_MAX_LINES]; uint8_t popupMenuSelectedItem = 0; diff --git a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp index 2e72af936..605f81635 100644 --- a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp +++ b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp @@ -541,7 +541,7 @@ void menuRadioSdManager(event_t _event) } if (s_editMode == EDIT_MODIFY_STRING && attr) { uint8_t extlen, efflen; - const char * ext = getFileExtension(reusableBuffer.sdManager.originalName, 0, 0, NULL, &extlen); + const char * ext = getFileExtension(reusableBuffer.sdManager.originalName, 0, 0, nullptr, &extlen); editName(lcdNextPos, y, reusableBuffer.sdManager.lines[i], SD_SCREEN_FILE_LENGTH - extlen, _event, attr, 0); efflen = effectiveLen(reusableBuffer.sdManager.lines[i], SD_SCREEN_FILE_LENGTH - extlen); if (s_editMode == 0) { diff --git a/radio/src/gui/navigation/common.cpp b/radio/src/gui/navigation/common.cpp index 00add48a6..612b34183 100644 --- a/radio/src/gui/navigation/common.cpp +++ b/radio/src/gui/navigation/common.cpp @@ -102,12 +102,12 @@ void onSourceLongEnterPress(const char * result) #if defined(NAVIGATION_HORUS) bool check_simple(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t menuTabSize, int rowcount) { - return check(event, curr, menuTab, menuTabSize, NULL, 0, rowcount); + return check(event, curr, menuTab, menuTabSize, nullptr, 0, rowcount); } bool check_submenu_simple(event_t event, uint8_t rowcount) { - return check_simple(event, 0, NULL, 0, rowcount); + return check_simple(event, 0, nullptr, 0, rowcount); } #else void check_submenu_simple(event_t event, uint8_t rowcount) diff --git a/radio/src/targets/horus/CMakeLists.txt b/radio/src/targets/horus/CMakeLists.txt index 5eac31bda..dc02d5c53 100644 --- a/radio/src/targets/horus/CMakeLists.txt +++ b/radio/src/targets/horus/CMakeLists.txt @@ -12,6 +12,7 @@ set(STORAGE SDCARD) set(STORAGE_FORMAT BIN) set(HAPTIC YES) set(GUI_DIR colorlcd) +set(BITMAPS_DIR 480x272) set(NAVIGATION_TYPE horus) set(TARGET_DIR horus) set(LINKER_SCRIPT targets/horus/stm32f4_flash.ld) diff --git a/radio/src/targets/nv14/CMakeLists.txt b/radio/src/targets/nv14/CMakeLists.txt index f51862eda..b44b21de0 100644 --- a/radio/src/targets/nv14/CMakeLists.txt +++ b/radio/src/targets/nv14/CMakeLists.txt @@ -12,6 +12,7 @@ set(STORAGE SDCARD) set(STORAGE_FORMAT BIN) set(HAPTIC YES) set(GUI_DIR colorlcd) +set(BITMAPS_DIR 480x272) # set(NAVIGATION_TYPE touch) set(TARGET_DIR nv14) diff --git a/radio/src/targets/sky9x/CMakeLists.txt b/radio/src/targets/sky9x/CMakeLists.txt index a5d839fa1..193c99df5 100644 --- a/radio/src/targets/sky9x/CMakeLists.txt +++ b/radio/src/targets/sky9x/CMakeLists.txt @@ -6,6 +6,7 @@ set(HAPTIC YES) set(STORAGE EEPROM) set(STORAGE_FORMAT RAW) set(GUI_DIR 128x64) +set(BITMAPS_DIR 128x64) set(NAVIGATION_TYPE 9x) set(BITMAPS_TARGET 9x_bitmaps) set(TARGET_DIR sky9x) diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt index 6e8b580da..748e770c0 100644 --- a/radio/src/targets/taranis/CMakeLists.txt +++ b/radio/src/targets/taranis/CMakeLists.txt @@ -32,6 +32,7 @@ if(PCB STREQUAL X9E) add_definitions(-DHORUS_STICKS) endif() set(GUI_DIR 212x64) + set(BITMAPS_DIR 212x64) set(NAVIGATION_TYPE x9d) set(BITMAPS_TARGET taranis_bitmaps) set(FONTS_TARGET taranis_fonts) @@ -46,6 +47,7 @@ elseif(PCB STREQUAL X9D+) add_definitions(-DPCBX9DP -DPCBX9) add_definitions(-DEEPROM_VARIANT=0) set(GUI_DIR 212x64) + set(BITMAPS_DIR 212x64) set(NAVIGATION_TYPE x9d) set(BITMAPS_TARGET taranis_bitmaps) set(FONTS_TARGET taranis_fonts) @@ -96,6 +98,7 @@ elseif(PCB STREQUAL X9D) add_definitions(-DPCBX9D -DPCBX9) add_definitions(-DEEPROM_VARIANT=0) set(GUI_DIR 212x64) + set(BITMAPS_DIR 212x64) set(NAVIGATION_TYPE x9d) set(BITMAPS_TARGET taranis_bitmaps) set(FONTS_TARGET taranis_fonts) @@ -107,6 +110,7 @@ elseif(PCB STREQUAL X7) set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)") set(HAPTIC YES) set(GUI_DIR 128x64) + set(BITMAPS_DIR 128x64) set(BITMAPS_TARGET 9x_bitmaps) set(FONTS_TARGET 9x_fonts_1bit) set(LCD_DRIVER lcd_driver_spi.cpp) @@ -188,6 +192,7 @@ elseif(PCB STREQUAL X9LITE) add_definitions(-DPWR_BUTTON_${PWR_BUTTON}) set(PXX2 ON) set(GUI_DIR 128x64) + set(BITMAPS_DIR 128x64) set(NAVIGATION_TYPE x7) set(BITMAPS_TARGET 9x_bitmaps) set(FONTS_TARGET 9x_fonts_1bit) @@ -213,6 +218,7 @@ elseif(PCB STREQUAL X9LITES) add_definitions(-DPWR_BUTTON_${PWR_BUTTON}) set(PXX2 ON) set(GUI_DIR 128x64) + set(BITMAPS_DIR 128x64) set(NAVIGATION_TYPE x7) set(BITMAPS_TARGET 9x_bitmaps) set(FONTS_TARGET 9x_fonts_1bit) @@ -238,6 +244,7 @@ elseif(PCB STREQUAL XLITE) add_definitions(-DPWR_BUTTON_${PWR_BUTTON}) set(PXX2 ON) set(GUI_DIR 128x64) + set(BITMAPS_DIR 128x64) set(NAVIGATION_TYPE xlite) set(BITMAPS_TARGET 9x_bitmaps) set(FONTS_TARGET 9x_fonts_1bit) @@ -261,6 +268,7 @@ elseif(PCB STREQUAL XLITES) add_definitions(-DEEPROM_VARIANT=0x1000) add_definitions(-DPWR_BUTTON_${PWR_BUTTON}) set(GUI_DIR 128x64) + set(BITMAPS_DIR 128x64) set(NAVIGATION_TYPE xlite) set(BITMAPS_TARGET 9x_bitmaps) set(FONTS_TARGET 9x_fonts_1bit)