diff --git a/firmware/application/external/doom/Arial12x12.h b/firmware/application/external/doom/Arial12x12.h deleted file mode 100644 index 4dc451eeb..000000000 --- a/firmware/application/external/doom/Arial12x12.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2024 Mark Thompson - * - * This file is part of PortaPack. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -// dummy include file to avoid changing original source - -#ifndef __UI_Arial12x12_H__ -#define __UI_Arial12x12_H__ - -#define Arial12x12 (0) - -#endif /*__UI_Arial12x12_H__*/ diff --git a/firmware/application/external/doom/SPI_TFT_ILI9341.h b/firmware/application/external/doom/SPI_TFT_ILI9341.h deleted file mode 100644 index 8e1bbd59c..000000000 --- a/firmware/application/external/doom/SPI_TFT_ILI9341.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef __UI_SPI_TFT_ILI9341_H__ -#define __UI_SPI_TFT_ILI9341_H__ - -ui::Painter painter; - -enum { - White, - Blue, - Yellow, - Purple, - Green, - Red, - Maroon, - Orange, - Black, -}; - -static const Color pp_colors[] = { - Color::white(), - Color::blue(), - Color::yellow(), - Color::purple(), - Color::green(), - Color::red(), - Color::magenta(), - Color::orange(), - Color::black(), -}; - -#endif /*__UI_SPI_TFT_ILI9341_H__*/ \ No newline at end of file diff --git a/firmware/application/external/doom/mbed.h b/firmware/application/external/doom/mbed.h deleted file mode 100644 index f2ee47d63..000000000 --- a/firmware/application/external/doom/mbed.h +++ /dev/null @@ -1,81 +0,0 @@ -#ifndef __UI_mbed_H__ -#define __UI_mbed_H__ - -using Callback = void (*)(void); - -#define wait_us(x) (void)0 -#define wait(x) chThdSleepMilliseconds(x * 1000) -#define PullUp 1 - -#include "ui_navigation.hpp" - -enum { - dp0, - dp1, - dp2, - dp3, - dp4, - dp5, - dp6, - dp7, - dp8, - dp9, - dp10, - dp11, - dp12, - dp13, - dp14, - dp15, - dp16, - dp17, - dp18, - dp19, - dp20, - dp21, - dp22, - dp23, - dp24, - dp25, -}; - -class Timer { - public: - Timer() { (void)0; }; - void reset() { (void)0; }; - void start() { (void)0; } - uint32_t read_ms() { return 1000; }; - - private: -}; - -static Callback game_update_callback; -static uint32_t game_update_timeout; - -class Ticker { - public: - Ticker() { (void)0; }; - void attach(Callback func, double delay_sec) { - game_update_callback = func; - game_update_timeout = delay_sec * 60; - } - void detach() { - game_update_callback = nullptr; - } - - private: -}; - -static Callback button_callback; - -class InterruptIn { - public: - InterruptIn(int reg) { - (void)reg; - }; - void fall(Callback func) { button_callback = func; }; - void mode(int v) { (void)v; }; - - private: -}; - -#endif /*__UI_mbed_H__*/ \ No newline at end of file diff --git a/firmware/application/external/doom/ui_doom.cpp b/firmware/application/external/doom/ui_doom.cpp index 61af21d84..8416a8861 100644 --- a/firmware/application/external/doom/ui_doom.cpp +++ b/firmware/application/external/doom/ui_doom.cpp @@ -8,8 +8,6 @@ #include "ui_doom.hpp" #include "ui.hpp" -#include "SPI_TFT_ILI9341.h" -#include "mbed.h" #define SCREEN_WIDTH 240 #define SCREEN_HEIGHT 320 diff --git a/firmware/application/external/doom/ui_doom.hpp b/firmware/application/external/doom/ui_doom.hpp index 0515073cf..b07d96bfd 100644 --- a/firmware/application/external/doom/ui_doom.hpp +++ b/firmware/application/external/doom/ui_doom.hpp @@ -14,6 +14,49 @@ #include "message.hpp" namespace ui::external_app::doom { +using Callback = void (*)(); + +class Ticker { + public: + Ticker() {} + void attach(Callback func, double delay_sec) { + game_update_callback = func; + game_update_timeout = delay_sec * 60; + } + void detach() { + game_update_callback = nullptr; + } + + private: + Callback game_update_callback = nullptr; + uint32_t game_update_timeout = 0; +}; + +extern ui::Painter painter; + +enum { + White, + Blue, + Yellow, + Purple, + Green, + Red, + Maroon, + Orange, + Black, +}; + +static const Color pp_colors[] = { + Color::white(), + Color::blue(), + Color::yellow(), + Color::purple(), + Color::green(), + Color::red(), + Color::magenta(), + Color::orange(), + Color::black(), +}; class DoomView : public View { public: @@ -36,7 +79,6 @@ class DoomView : public View { this->frame_sync(); }}; }; - } // namespace ui::external_app::doom #endif /*__UI_DOOM_H__*/ \ No newline at end of file