Display the version of Environment Loader in menu

.github/workflows/ci.yml

@@ -18,6 +18,13 @@ jobs:
     needs: clang-format
     steps:
     - uses: actions/checkout@v3
+    - name: create version.h
+      run: |
+        git_hash=$(git rev-parse --short "$GITHUB_SHA")
+        cat <<EOF > ./source/version.h
+        #pragma once
+        #define ENVIRONMENT_LOADER_VERSION_EXTRA " (nightly-$git_hash)"
+        EOF
     - name: build binary
       run: |
         docker build . -t builder

.github/workflows/pr.yml

@@ -26,6 +26,13 @@ jobs:
     needs: clang-format
     steps:
     - uses: actions/checkout@v3
+    - name: create version.h
+      run: |
+        git_hash=$(git rev-parse --short "${{ github.event.pull_request.head.sha }}")
+        cat <<EOF > ./source/version.h
+        #pragma once
+        #define ENVIRONMENT_LOADER_VERSION_EXTRA " (nightly-$git_hash)"
+        EOF
     - name: build binary
       run: |
         docker build . -t builder

source/main.cpp

@@ -32,6 +32,9 @@
 #include "utils/DrawUtils.h"
 #include "utils/InputUtils.h"
 #include "utils/PairUtils.h"
+#include "version.h"
+
+#define ENVIRONMENT_LOADER_VERSION "v0.2.0"
 
 // clang-format off
 #define MEMORY_REGION_START         0x00A00000
@@ -350,6 +353,8 @@ std::string EnvironmentSelectionScreen(const std::map<std::string, std::string>
             DrawUtils::setFontSize(24);
             DrawUtils::print(16, 6 + 24, "Environment Loader");
             DrawUtils::drawRectFilled(8, 8 + 24 + 4, SCREEN_WIDTH - 8 * 2, 3, COLOR_WHITE);
+            DrawUtils::setFontSize(16);
+            DrawUtils::print(SCREEN_WIDTH - 16, 6 + 24, ENVIRONMENT_LOADER_VERSION ENVIRONMENT_LOADER_VERSION_EXTRA, true);
 
             // draw bottom bar
             DrawUtils::drawRectFilled(8, SCREEN_HEIGHT - 24 - 8 - 4, SCREEN_WIDTH - 8 * 2, 3, COLOR_WHITE);

source/utils/InputUtils.cpp

@@ -1,4 +1,6 @@
 #include "InputUtils.h"
+#include "logger.h"
+#include <coreinit/thread.h>
 #include <padscore/kpad.h>
 #include <padscore/wpad.h>
 #include <vpad/input.h>
@@ -97,11 +99,15 @@ InputUtils::InputData InputUtils::getControllerInput() {
     InputData inputData{};
     VPADStatus vpadStatus{};
     VPADReadError vpadError = VPAD_READ_UNINITIALIZED;
-    if (VPADRead(VPAD_CHAN_0, &vpadStatus, 1, &vpadError) > 0 && vpadError == VPAD_READ_SUCCESS) {
-        inputData.trigger = vpadStatus.trigger;
-        inputData.hold    = vpadStatus.hold;
-        inputData.release = vpadStatus.release;
-    }
+    do {
+        if (VPADRead(VPAD_CHAN_0, &vpadStatus, 1, &vpadError) > 0 && vpadError == VPAD_READ_SUCCESS) {
+            inputData.trigger = vpadStatus.trigger;
+            inputData.hold    = vpadStatus.hold;
+            inputData.release = vpadStatus.release;
+        } else {
+            OSSleepTicks(OSMillisecondsToTicks(1));
+        }
+    } while (vpadError == VPAD_READ_NO_SAMPLES);
 
     KPADStatus kpadStatus{};
     KPADError kpadError = KPAD_ERROR_UNINITIALIZED;

source/version.h

@@ -0,0 +1,2 @@
+#pragma once
+#define ENVIRONMENT_LOADER_VERSION_EXTRA ""