Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	firmware/application/bitmap.hpp
#	firmware/application/receiver_model.cpp
#	firmware/application/receiver_model.hpp
#	firmware/application/touch.hpp
#	firmware/application/ui_setup.cpp
#	firmware/baseband/proc_ais.hpp
#	firmware/baseband/proc_ert.hpp
#	firmware/bootstrap/CMakeLists.txt
#	firmware/common/portapack_persistent_memory.cpp
#	firmware/common/portapack_persistent_memory.hpp
This commit is contained in:
furrtek 2016-08-17 02:55:34 +02:00
commit 45a754645e
43 changed files with 1089 additions and 543 deletions

View file

@ -244,6 +244,98 @@ static constexpr Bitmap bitmap_sd_card_error {
{ 16, 16 }, bitmap_sd_card_error_data
};
static constexpr uint8_t bitmap_target_calibrate_data[] = {
0x02, 0x00, 0x00, 0x40,
0x07, 0x00, 0x00, 0xe0,
0x0e, 0x00, 0x00, 0x70,
0x1c, 0x00, 0x00, 0x38,
0x38, 0x00, 0x00, 0x1c,
0x70, 0x00, 0x00, 0x0e,
0xe0, 0x00, 0x00, 0x07,
0xc0, 0x01, 0x80, 0x03,
0x80, 0x03, 0xc0, 0x01,
0x00, 0x07, 0xe0, 0x00,
0x00, 0x0e, 0x70, 0x00,
0x00, 0x1c, 0x38, 0x00,
0x00, 0x38, 0x1c, 0x00,
0x00, 0x30, 0x0c, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x30, 0x0c, 0x00,
0x00, 0x38, 0x1c, 0x00,
0x00, 0x1c, 0x38, 0x00,
0x00, 0x0e, 0x70, 0x00,
0x00, 0x07, 0xe0, 0x00,
0x80, 0x03, 0xc0, 0x01,
0xc0, 0x01, 0x80, 0x03,
0xe0, 0x00, 0x00, 0x07,
0x70, 0x00, 0x00, 0x0e,
0x38, 0x00, 0x00, 0x1c,
0x1c, 0x00, 0x00, 0x38,
0x0e, 0x00, 0x00, 0x70,
0x07, 0x00, 0x00, 0xe0,
0x02, 0x00, 0x00, 0x40,
};
static constexpr Bitmap bitmap_target_calibrate {
{ 32, 32 }, bitmap_target_calibrate_data
};
static constexpr uint8_t bitmap_target_verify_data[] = {
0x00, 0xe0, 0x07, 0x00,
0x00, 0xfc, 0x3f, 0x00,
0x00, 0x1f, 0xf8, 0x00,
0xc0, 0x03, 0xc0, 0x03,
0xe0, 0x00, 0x00, 0x07,
0x70, 0x00, 0x00, 0x0e,
0x38, 0x00, 0x00, 0x1c,
0x18, 0x00, 0x00, 0x18,
0x0c, 0x00, 0x00, 0x30,
0x0c, 0x00, 0x00, 0x30,
0x06, 0x00, 0x00, 0x60,
0x06, 0x00, 0x00, 0x60,
0x06, 0x00, 0x00, 0x60,
0x03, 0x80, 0x01, 0xc0,
0x03, 0x80, 0x01, 0xc0,
0x03, 0xe0, 0x07, 0xc0,
0x03, 0xe0, 0x07, 0xc0,
0x03, 0x80, 0x01, 0xc0,
0x03, 0x80, 0x01, 0xc0,
0x06, 0x00, 0x00, 0x60,
0x06, 0x00, 0x00, 0x60,
0x06, 0x00, 0x00, 0x60,
0x0c, 0x00, 0x00, 0x30,
0x0c, 0x00, 0x00, 0x30,
0x18, 0x00, 0x00, 0x18,
0x38, 0x00, 0x00, 0x1c,
0x70, 0x00, 0x00, 0x0e,
0xe0, 0x00, 0x00, 0x07,
0xc0, 0x03, 0xc0, 0x03,
0x00, 0x1f, 0xf8, 0x00,
0x00, 0xfc, 0x3f, 0x00,
0x00, 0xe0, 0x07, 0x00,
};
static constexpr Bitmap bitmap_target_verify {
{ 32, 32 }, bitmap_target_verify_data
};
} /* namespace ui */
#endif/*__BITMAP_HPP__*/