From 0ccd00694971a36c4caf98d9f14d5dbbd415e7d6 Mon Sep 17 00:00:00 2001 From: Boris Popov Date: Sun, 29 Oct 2023 11:44:44 +0300 Subject: [PATCH] fix for 2.1.0 --- .../4164-41256-tester/4164-41256-tester.ino | 3 - arduino/4164-41256-tester/Config.hpp | 2 +- arduino/4164-41256-tester/Congratulation.hpp | 83 ------------------- 3 files changed, 1 insertion(+), 87 deletions(-) delete mode 100644 arduino/4164-41256-tester/Congratulation.hpp diff --git a/arduino/4164-41256-tester/4164-41256-tester.ino b/arduino/4164-41256-tester/4164-41256-tester.ino index 2cf8740..c5b6dfc 100644 --- a/arduino/4164-41256-tester/4164-41256-tester.ino +++ b/arduino/4164-41256-tester/4164-41256-tester.ino @@ -3,7 +3,6 @@ // #include "Out.hpp" -#include "Congratulation.hpp" #include "Types.hpp" #include "Buttons.hpp" #include "Menu.hpp" @@ -11,7 +10,6 @@ #include "Executor.hpp" Out out; -Congratulation cong(out); Buttons btns; Menu menu; MenuDrawer menu_drawer(out); @@ -20,7 +18,6 @@ Executor executor(out, btns); void setup() { out.init(); executor.init(); - cong.display(); out.clear(); out.display(); menu_drawer.draw(menu.get()); diff --git a/arduino/4164-41256-tester/Config.hpp b/arduino/4164-41256-tester/Config.hpp index bf94ad6..7e0ec1b 100644 --- a/arduino/4164-41256-tester/Config.hpp +++ b/arduino/4164-41256-tester/Config.hpp @@ -2,7 +2,7 @@ #define __CONFIG_HPP__ #define NAME "4164-256 test" -#define VERSION "2.1.0 ProtoDed Edition" +#define VERSION "2.1.0" #define DI 15 // PC1 #define DO 8 // PB0 diff --git a/arduino/4164-41256-tester/Congratulation.hpp b/arduino/4164-41256-tester/Congratulation.hpp deleted file mode 100644 index 77824a6..0000000 --- a/arduino/4164-41256-tester/Congratulation.hpp +++ /dev/null @@ -1,83 +0,0 @@ -// -// Copyright (c) 2023 Boris Popov -// - -#ifndef _CONGRATULATION_HPP_ -#define _CONGRATULATION_HPP_ - -/////////////////////////////////////////////////////////////////// -template -class Congratulation { - -public: - Congratulation(O&); - - void display(); - -private: - O& o; - -private: - void _display(); -}; -/////////////////////////////////////////////////////////////////// - -/////////////////////////////////////////////////////////////////// -template -Congratulation::Congratulation(O& _o): - o(_o) -{ - return; -} - -template -void Congratulation::display() { - for (u8 i = 0; i < 3; i++) { - _display(); - } - o.clear(); - o.display(); -} - -template -void Congratulation::_display() { - o.clear(); - o.font(Regular); - - o.cursor(20); - o.print("Поздравляю"); - o.display(); - delay(750); - - o.clear(); - o.cursor(20); - o.print("Протодеда"); - o.display(); - delay(750); - - o.clear(); - o.cursor(20); - o.print("@Mikkaa_A!"); - o.display(); - delay(750); - - o.clear(); - o.cursor(20); - o.print("Желаю"); - o.display(); - delay(750); - - o.clear(); - o.cursor(20); - o.print("здоровья и"); - o.display(); - delay(750); - - o.clear(); - o.cursor(20); - o.print("долгих лет!"); - o.display(); - delay(750); -} -/////////////////////////////////////////////////////////////////// -#endif // _CONGRATULATION_HPP_