Jelajahi Sumber

Switch an ifdef and ready to send a pull request

Some code was unreachable for the v1.1 ODE because an
ifdef was on the wrong define.

Modify config and firmware_build to be inline with the public repo.
Morio 2 tahun lalu
induk
melakukan
a65914a487

+ 1 - 1
.github/workflows/firmware_build.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Build firmware
         run: |
           cd ZuluSCSI
-          pio run -ve ZuluSCSIv1_1_plus
+          pio run -v
     
       - name: Rename firmware files
         run: |

+ 1 - 1
lib/ZuluSCSI_platform_GD32F205/ZuluSCSI_platform.cpp

@@ -704,7 +704,7 @@ uint8_t platform_get_buttons()
     // Buttons are active low: internal pull-up is enabled,
     // and when button is pressed the pin goes low.
     uint8_t buttons = 0;
-#ifdef ZULUSCSI_HARDWARE_CONFIG
+#ifdef PLATFORM_VERSION_1_1_PLUS
     if (g_zuluscsi_version == ZSVersion_v1_1_ODE || g_zuluscsi_version == ZSVersion_v1_2)
     {
         if (!gpio_input_bit_get(EJECT_BTN_PORT, EJECT_BTN_PIN))   buttons |= 1;

+ 2 - 2
src/ZuluSCSI_config.h

@@ -27,8 +27,8 @@
 #include <ZuluSCSI_platform.h>
 
 // Use variables for version number
-#define FW_VER_NUM      "23.09.25"
-#define FW_VER_SUFFIX   "dev-v1.2"
+#define FW_VER_NUM      "23.10.12"
+#define FW_VER_SUFFIX   "dev"
 #define ZULU_FW_VERSION FW_VER_NUM "-" FW_VER_SUFFIX
 
 // Configuration and log file paths