TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-03-16 23:00:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'splash-titlebar-rename'

Browse Source
This commit is contained in:
Erwin Ried 2020-05-12 16:16:58 +02:00
commit 14c17bce8f
5 changed files with 327 additions and 995 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/CMakeLists.txt
View File

@ -29,7 +29,7 @@ set(EXTRACT_CPLD_DATA ${PROJECT_SOURCE_DIR}/tools/extract_cpld_data.py)
set(MAKE_SPI_IMAGE ${PROJECT_SOURCE_DIR}/tools/make_spi_image.py) set(MAKE_SPI_IMAGE ${PROJECT_SOURCE_DIR}/tools/make_spi_image.py)
set(MAKE_IMAGE_CHUNK ${PROJECT_SOURCE_DIR}/tools/make_image_chunk.py) set(MAKE_IMAGE_CHUNK ${PROJECT_SOURCE_DIR}/tools/make_image_chunk.py)
set(FIRMWARE_NAME portapack-h1-havoc) set(FIRMWARE_NAME portapack-h1_h2-mayhem)
set(FIRMWARE_FILENAME ${FIRMWARE_NAME}.bin) set(FIRMWARE_FILENAME ${FIRMWARE_NAME}.bin)
add_subdirectory(application) add_subdirectory(application)

3
firmware/application/apps/ui_about.hpp
View File

@ -72,10 +72,11 @@ private:
int32_t delay; int32_t delay;
} credits_t; } credits_t;
// TODO: Make this dinamically centered and parse \n as the delay value so it is easy to maintain
const credits_t credits[26] = { const credits_t credits[26] = {
// 012345678901234567890123456789 // 012345678901234567890123456789
{ 60, "PortaPack Mayhem", 0 },
{ 60, "PortaPack|HAVOC", 0 }, { 60, "PortaPack|HAVOC", 0 },
{ 4 * 8, "Version " VERSION_STRING, 16 },
{ 11 * 8, "Gurus J. Boone", 0 }, { 11 * 8, "Gurus J. Boone", 0 },
{ 18 * 8, "M. Ossmann", 16 }, { 18 * 8, "M. Ossmann", 16 },
{ 11 * 8, "HAVOC Furrtek", 16 }, { 11 * 8, "HAVOC Furrtek", 16 },

1310
firmware/application/bitmaps/bmp_splash.hpp
View File

File diff suppressed because it is too large Load Diff

3
firmware/application/ui_navigation.cpp
View File

@ -513,7 +513,6 @@ void BMPView::focus() {
BMPView::BMPView(NavigationView& nav) { BMPView::BMPView(NavigationView& nav) {
add_children({ add_children({
&text_info,
&button_done &button_done
}); });
@ -523,7 +522,7 @@ BMPView::BMPView(NavigationView& nav) {
} }
void BMPView::paint(Painter&) { void BMPView::paint(Painter&) {
portapack::display.drawBMP({(240 - 185) / 2, 0}, splash_bmp, false); portapack::display.drawBMP({(240 - 230) / 2, (320 - 50) / 2 - 10}, splash_bmp, false);
} }
/* NotImplementedView ****************************************************/ /* NotImplementedView ****************************************************/

4
firmware/application/ui_navigation.hpp
View File

@ -54,6 +54,8 @@ enum modal_t {
ABORT ABORT
}; };
//#define VERSION_STRING "v1.0.0"; // TODO: Move somewhere else
class NavigationView : public View { class NavigationView : public View {
public: public:
std::function<void(const View&)> on_view_changed { }; std::function<void(const View&)> on_view_changed { };
@ -109,7 +111,7 @@ public:
void set_title(const std::string new_value); void set_title(const std::string new_value);
private: private:
static constexpr auto default_title = "PortaPack|Havoc"; static constexpr auto default_title = "MAYHEM v1.0.0"; // TODO: Move the version somewhere
NavigationView& nav_; NavigationView& nav_;