More passing by references whenever possible in OpenFIREdisplay

Author: SeongGino

OpenFIREmain/OpenFIREcommon.cpp

@@ -767,7 +767,7 @@ void FW_Common::GetPosition()
                     int rawX[4];
                     int rawY[4];
                     // RAW Output for viewing in processing sketch mapped to 1920x1080 screen resolution
-                    for (int i = 0; i < 4; i++) {
+                    for (int i = 0; i < 4; ++i) {
                         if(OF_Prefs::profiles[OF_Prefs::currentProfile].irLayout) {
                             rawX[i] = map(OpenFIREdiamond.X(i), 0, 1023 << 2, 1920, 0);
                             rawY[i] = map(OpenFIREdiamond.Y(i), 0, 768 << 2, 0, 1080);

OpenFIREmain/OpenFIREdisplay.cpp

@@ -80,7 +80,7 @@ void ExtDisplay::TopPanelUpdate(const char *textPrefix, const char *profText)
     }
 }
 
-void ExtDisplay::ScreenModeChange(int8_t screenMode, bool isAnalog)
+void ExtDisplay::ScreenModeChange(const int &screenMode, const bool &isAnalog)
 {
     if(display != nullptr) {
         idleTimeStamp = millis();
@@ -236,11 +236,11 @@ void ExtDisplay::ShowTemp()
 
 // Warning: SLOOOOW, should only be used in cali/where the mouse isn't being updated.
 // Use at your own discression.
-void ExtDisplay::DrawVisibleIR(int pointX[4], int pointY[4])
+void ExtDisplay::DrawVisibleIR(int *pointX, int *pointY)
 {
     if(display != nullptr) {
         display->fillRect(0, 16, 128, 48, BLACK);
-        for(uint i = 0; i < 4; ++i) {
+        for(int i = 0; i < 4; ++i) {
           pointX[i] = map(pointX[i], 0, 1920, 0, 128);
           pointY[i] = map(pointY[i], 0, 1080, 16, 64);
           pointY[i] = constrain(pointY[i], 16, 64);
@@ -250,10 +250,10 @@ void ExtDisplay::DrawVisibleIR(int pointX[4], int pointY[4])
     }
 }
 
-void ExtDisplay::PauseScreenShow(uint8_t currentProf, char name1[16], char name2[16], char name3[16], char name4[16])
+void ExtDisplay::PauseScreenShow(const int &currentProf, const char* name1, const char* name2, const char* name3, const char* name4)
 {
     if(display != nullptr) {
-        char* namesList[16] = { name1, name2, name3, name4 };
+        const char* namesList[] = { name1, name2, name3, name4 };
         TopPanelUpdate("Using ", namesList[currentProf]); // names are placeholder
         display->fillRect(0, 16, 128, 48, BLACK);
         display->setTextSize(1);
@@ -273,7 +273,7 @@ void ExtDisplay::PauseScreenShow(uint8_t currentProf, char name1[16], char name2
     }
 }
 
-void ExtDisplay::PauseListUpdate(uint8_t selection)
+void ExtDisplay::PauseListUpdate(const int &selection)
 {
     if(display != nullptr) {
         display->fillRect(0, 16, 128, 48, BLACK);
@@ -420,7 +420,7 @@ void ExtDisplay::PauseListUpdate(uint8_t selection)
     }
 }
 
-void ExtDisplay::PauseProfileUpdate(uint8_t selection, char name1[16], char name2[16], char name3[16], char name4[16])
+void ExtDisplay::PauseProfileUpdate(const int &selection, const char* name1, const char* name2, const char* name3, const char* name4)
 {
     if(display != nullptr) {
         display->fillRect(0, 16, 128, 48, BLACK);
@@ -477,7 +477,7 @@ void ExtDisplay::PauseProfileUpdate(uint8_t selection, char name1[16], char name
     }
 }
 
-void ExtDisplay::SaveScreen(uint8_t status)
+void ExtDisplay::SaveScreen(const int &status)
 {
     if(display != nullptr) {
         display->fillRect(0, 16, 128, 48, BLACK);
@@ -489,7 +489,7 @@ void ExtDisplay::SaveScreen(uint8_t status)
     }
 }
 
-void ExtDisplay::PrintAmmo(uint8_t ammo)
+void ExtDisplay::PrintAmmo(const uint &ammo)
 {
     if(display != nullptr) {
         currentAmmo = ammo;
@@ -498,7 +498,7 @@ void ExtDisplay::PrintAmmo(uint8_t ammo)
         uint ammoLeft = ammo / 10;
         uint ammoRight = ammo - (ammoLeft * 10);
 
-        if(!ammo) { ammoEmpty = true; } else { ammoEmpty = false; }
+        ammoEmpty = ammo ? false : true;
 
         if(screenState == Screen_Mamehook_Single) {
             display->fillRect(40, 22, (NUMBER_GLYPH_WIDTH*2)+6, NUMBER_GLYPH_HEIGHT, BLACK);
@@ -514,11 +514,11 @@ void ExtDisplay::PrintAmmo(uint8_t ammo)
     }
 }
 
-void ExtDisplay::PrintLife(uint8_t life)
+void ExtDisplay::PrintLife(const uint &life)
 {
     if(display != nullptr) {
         currentLife = life;
-        if(!life) { lifeEmpty = true; } else { lifeEmpty = false; }
+        lifeEmpty = life ? false : true;
         if(screenState == Screen_Mamehook_Single) {
             if(lifeBar) {
                 display->fillRect(14, 37, 100, 9, BLACK);

OpenFIREmain/OpenFIREdisplay.h

@@ -32,7 +32,7 @@ class ExtDisplay {
     void TopPanelUpdate(const char *, const char * = nullptr);
 
     /// @brief Clear screen for different gun modes
-    void ScreenModeChange(int8_t screenMode, bool isAnalog = false);
+    void ScreenModeChange(const int &screenMode, const bool &isAnalog = false);
 
     /// @brief Perform maintenance operations (WIP)
     /// @details For when values aren't being updated, but still want to change something on the screen
@@ -41,25 +41,26 @@ class ExtDisplay {
 
     /// @brief Draw seen points here
     /// @details Should ONLY be used in scenarios where the mouse isn't being updated, i.e. calibration.
-    void DrawVisibleIR(int pointX[4], int pointY[4]);
+    ///          Arguments here point to the original arrays of seen coords [4]
+    void DrawVisibleIR(int *pointX, int *pointY);
 
     /// @brief Draw hotkey pause mode layout
-    void PauseScreenShow(uint8_t currentProf, char name1[16], char name2[16], char name3[16], char name4[16]);
+    void PauseScreenShow(const int &currentProf, const char* name1, const char* name2, const char* name3, const char* name4);
 
     /// @brief Update simple pause mode list on screen
-    void PauseListUpdate(uint8_t selection);
+    void PauseListUpdate(const int &selection);
 
     /// @brief Update simple pause mode profiles list on screen
-    void PauseProfileUpdate(uint8_t selection, char name1[16], char name2[16], char name3[16], char name4[16]);
+    void PauseProfileUpdate(const int &selection, const char* name1, const char* name2, const char* name3, const char* name4);
 
     /// @brief Print save status message
-    void SaveScreen(uint8_t status);
+    void SaveScreen(const int &status);
 
     /// @brief Update main screen ammo glyphs
-    void PrintAmmo(uint8_t ammo);
+    void PrintAmmo(const uint &ammo);
 
     /// @brief Update main screen life glyphs
-    void PrintLife(uint8_t life);
+    void PrintLife(const uint &life);
 
     enum ScreenMode_e {
         Screen_None = -1,
@@ -105,7 +106,7 @@ class ExtDisplay {
     bool mister = false;
 
 private:
-    int8_t screenState = Screen_None;
+    int screenState = Screen_None;
 
     bool ammoEmpty = false;
     bool lifeEmpty = false;