From 0e49d23faab0a618f935c9591ede4918fe396342 Mon Sep 17 00:00:00 2001
From: devdl11 <54149885+devdl11@users.noreply.github.com>
Date: Tue, 26 Apr 2022 15:26:34 +0200
Subject: [PATCH] Apply suggestions from code review

Co-authored-by: Yaya-Cout <yaya.cout@free.fr>
---
 bootloader/boot.h                            | 2 +-
 bootloader/drivers/stm32_drivers.h           | 2 +-
 bootloader/interface/menus/about.cpp         | 2 +-
 bootloader/interface/menus/about.h           | 2 +-
 bootloader/interface/menus/crash.cpp         | 2 +-
 bootloader/interface/menus/crash.h           | 2 +-
 bootloader/interface/menus/dfu.cpp           | 2 +-
 bootloader/interface/menus/home.cpp          | 2 +-
 bootloader/interface/menus/installer.cpp     | 2 +-
 bootloader/interface/menus/installer.h       | 2 +-
 bootloader/interface/menus/slot_recovery.cpp | 2 +-
 bootloader/interface/menus/slot_recovery.h   | 2 +-
 bootloader/interface/menus/warning.cpp       | 2 +-
 bootloader/interface/menus/warning.h         | 2 +-
 bootloader/interface/src/menu.h              | 2 +-
 bootloader/interface/static/interface.cpp    | 1 -
 bootloader/interface/static/interface.h      | 2 +-
 bootloader/interface/static/messages.h       | 7 -------
 bootloader/main.cpp                          | 2 +-
 19 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/bootloader/boot.h b/bootloader/boot.h
index 2b7d66d47..50800f3d5 100644
--- a/bootloader/boot.h
+++ b/bootloader/boot.h
@@ -57,4 +57,4 @@ public:
 
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/bootloader/drivers/stm32_drivers.h b/bootloader/drivers/stm32_drivers.h
index bba55c74b..50f723ba6 100644
--- a/bootloader/drivers/stm32_drivers.h
+++ b/bootloader/drivers/stm32_drivers.h
@@ -150,4 +150,4 @@ namespace STM32 {
   extern void rcc_deinit();
   extern void hal_deinit();
   extern void systick_deinit();
-}
\ No newline at end of file
+}
diff --git a/bootloader/interface/menus/about.cpp b/bootloader/interface/menus/about.cpp
index 7e1d176bb..661c6a20f 100644
--- a/bootloader/interface/menus/about.cpp
+++ b/bootloader/interface/menus/about.cpp
@@ -17,4 +17,4 @@ void Bootloader::AboutMenu::setup() {
     m_columns[2] = ColumnBinder(&m_default_columns[2]);
     m_columns[3] = ColumnBinder(&m_default_columns[3]);
     m_columns[4] = ColumnBinder(&m_default_columns[4]);
-}
\ No newline at end of file
+}
diff --git a/bootloader/interface/menus/about.h b/bootloader/interface/menus/about.h
index 4f3df1c91..b4c43d57c 100644
--- a/bootloader/interface/menus/about.h
+++ b/bootloader/interface/menus/about.h
@@ -14,4 +14,4 @@ namespace Bootloader {
 }
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/bootloader/interface/menus/crash.cpp b/bootloader/interface/menus/crash.cpp
index d7ed3a19e..2124eafb3 100644
--- a/bootloader/interface/menus/crash.cpp
+++ b/bootloader/interface/menus/crash.cpp
@@ -19,4 +19,4 @@ void Bootloader::CrashMenu::post_open() {
   for (;;) {
     // Infinite loop
   }
-}
\ No newline at end of file
+}
diff --git a/bootloader/interface/menus/crash.h b/bootloader/interface/menus/crash.h
index c73c3dbd6..50a66d486 100644
--- a/bootloader/interface/menus/crash.h
+++ b/bootloader/interface/menus/crash.h
@@ -16,4 +16,4 @@ namespace Bootloader {
   };
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/bootloader/interface/menus/dfu.cpp b/bootloader/interface/menus/dfu.cpp
index 537108f3c..e09598cb6 100644
--- a/bootloader/interface/menus/dfu.cpp
+++ b/bootloader/interface/menus/dfu.cpp
@@ -34,4 +34,4 @@ void Bootloader::DfuMenu::post_open() {
     } while (!Ion::USB::isEnumerated());
     Ion::USB::DFU(true, (void *)m_data);
   }
-}
\ No newline at end of file
+}
diff --git a/bootloader/interface/menus/home.cpp b/bootloader/interface/menus/home.cpp
index 7805d7996..c5f9bbed2 100644
--- a/bootloader/interface/menus/home.cpp
+++ b/bootloader/interface/menus/home.cpp
@@ -141,4 +141,4 @@ void Bootloader::HomeMenu::setup() {
     m_columns[3] = ColumnBinder(&m_default_columns[0]);
     m_columns[4] = ColumnBinder(&m_default_columns[1]);
 
-}
\ No newline at end of file
+}
diff --git a/bootloader/interface/menus/installer.cpp b/bootloader/interface/menus/installer.cpp
index a82b4aebe..5f9ad8ebf 100644
--- a/bootloader/interface/menus/installer.cpp
+++ b/bootloader/interface/menus/installer.cpp
@@ -38,4 +38,4 @@ void Bootloader::InstallerMenu::setup() {
     m_columns[0] = ColumnBinder(&m_default_columns[0]);
     m_columns[1] = ColumnBinder(&m_default_columns[1]);
     m_columns[2] = ColumnBinder(&m_default_columns[2]);
-}
\ No newline at end of file
+}
diff --git a/bootloader/interface/menus/installer.h b/bootloader/interface/menus/installer.h
index b68a49aab..c26c27cbc 100644
--- a/bootloader/interface/menus/installer.h
+++ b/bootloader/interface/menus/installer.h
@@ -17,4 +17,4 @@ namespace Bootloader {
   };
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/bootloader/interface/menus/slot_recovery.cpp b/bootloader/interface/menus/slot_recovery.cpp
index d026f2be3..2f142be0a 100644
--- a/bootloader/interface/menus/slot_recovery.cpp
+++ b/bootloader/interface/menus/slot_recovery.cpp
@@ -36,4 +36,4 @@ void Bootloader::SlotRecoveryMenu::post_open() {
     } while (!Ion::USB::isEnumerated());
     Ion::USB::DFU(true, (void *)m_data);
   }
-}
\ No newline at end of file
+}
diff --git a/bootloader/interface/menus/slot_recovery.h b/bootloader/interface/menus/slot_recovery.h
index 452868dee..08676645d 100644
--- a/bootloader/interface/menus/slot_recovery.h
+++ b/bootloader/interface/menus/slot_recovery.h
@@ -16,4 +16,4 @@ namespace Bootloader {
   };
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/bootloader/interface/menus/warning.cpp b/bootloader/interface/menus/warning.cpp
index 316dfde69..fca936c14 100644
--- a/bootloader/interface/menus/warning.cpp
+++ b/bootloader/interface/menus/warning.cpp
@@ -32,4 +32,4 @@ void Bootloader::WarningMenu::setup() {
     m_columns[3] = ColumnBinder(&m_default_columns[3]);
     m_columns[4] = ColumnBinder(&m_default_columns[4]);
     m_columns[5] = ColumnBinder(&m_default_columns[5]);
-}
\ No newline at end of file
+}
diff --git a/bootloader/interface/menus/warning.h b/bootloader/interface/menus/warning.h
index bc98a5640..d2f8a649b 100644
--- a/bootloader/interface/menus/warning.h
+++ b/bootloader/interface/menus/warning.h
@@ -14,4 +14,4 @@ namespace Bootloader {
   };
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/bootloader/interface/src/menu.h b/bootloader/interface/src/menu.h
index da591a022..a9faccea8 100644
--- a/bootloader/interface/src/menu.h
+++ b/bootloader/interface/src/menu.h
@@ -123,4 +123,4 @@ namespace Bootloader {
   };
 }
 
-#endif // _BOOTLOADER_MENU_H_
\ No newline at end of file
+#endif // _BOOTLOADER_MENU_H_
diff --git a/bootloader/interface/static/interface.cpp b/bootloader/interface/static/interface.cpp
index 817b6f2c0..4244a227b 100644
--- a/bootloader/interface/static/interface.cpp
+++ b/bootloader/interface/static/interface.cpp
@@ -1,4 +1,3 @@
-
 #include <assert.h>
 #include <ion.h>
 #include <ion/timing.h>
diff --git a/bootloader/interface/static/interface.h b/bootloader/interface/static/interface.h
index 8c5234fc4..3741b5ec1 100644
--- a/bootloader/interface/static/interface.h
+++ b/bootloader/interface/static/interface.h
@@ -16,4 +16,4 @@ public:
 
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/bootloader/interface/static/messages.h b/bootloader/interface/static/messages.h
index de63bf3d3..4db53869e 100644
--- a/bootloader/interface/static/messages.h
+++ b/bootloader/interface/static/messages.h
@@ -5,14 +5,7 @@ namespace Bootloader {
 
 class Messages {
 public:
-  // TODO: Remove it when this fork will be updated
-  #ifdef UPSILON_VERSION
   constexpr static const char * mainTitle = "Upsilon Calculator";
-  #elif defined OMEGA_VERSION
-  constexpr static const char * mainTitle = "Omega Calculator";
-  #else
-  constexpr static const char * mainTitle = "NumWorks Calculator";
-  #endif
   
   // home menu
   constexpr static const char * homeTitle = "Select a slot";
diff --git a/bootloader/main.cpp b/bootloader/main.cpp
index 7902fc7d0..d5161456b 100644
--- a/bootloader/main.cpp
+++ b/bootloader/main.cpp
@@ -11,7 +11,7 @@
 
 __attribute__ ((noreturn)) void ion_main(int argc, const char * const argv[]) {
   // Clear the screen
-  Ion::Display::pushRectUniform(KDRect(0,0,320,240), KDColorWhite);
+  Ion::Display::pushRectUniform(KDRect(0,0,320,240), KDColorBlack);
   // Initialize the backlight
   Ion::Backlight::init();