Fix autodetection of workarounds for GCC 12.x 13.x and 14.x under Windows

Makefile

@@ -33,6 +33,15 @@ SD_HEX       = $(SD_PATH)/$(SD_FILENAME)_softdevice.hex
 
 MBR_HEX			 = lib/softdevice/mbr/hex/mbr_nrf52_2.4.1_mbr.hex
 
+# Detect the operating system
+# The "OS" environment variable on Windows is always "Windows_NT"
+# when running under a modern shell like cmd.exe or powershell
+ifeq ($(OS),Windows_NT)
+	NULL_DEVICE = NUL
+else
+	NULL_DEVICE = /dev/null
+endif
+
 # linker by MCU eg. nrf52840.ld
 ifeq ($(DEBUG), 1)
   LD_FILE = linker/$(MCU_SUB_VARIANT)_debug.ld
@@ -337,7 +346,7 @@ CFLAGS += -DDFU_APP_DATA_RESERVED=$(DFU_APP_DATA_RESERVED)
 
 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105523
 # Fixes for gcc version 12, 13 and 14.
-ifneq (,$(filter 12.% 13.% 14.%,$(shell $(CC) -dumpversion 2>/dev/null)))
+ifneq (,$(filter 12.% 13.% 14.%,$(shell $(CC) -dumpversion 2>$(NULL_DEVICE))))
 	CFLAGS += --param=min-pagesize=0
 endif
 

README.md

@@ -52,10 +52,8 @@
 - Heltec T096
 - Heltec T1
 - Heltec T114 / HT-nRF5262
-- LilyGo T-Echo
-- LilyGo T-Echo Lite
+- LilyGO T-Echo
 - Minewsemi MX25LE01
-- Nordic PCA10056 (nRF52840 DK)
 - Nologo ProMicro NRF52840 (aka SuperMini NRF52840)
 - RAK 4631
 - RAK 3401
@@ -80,9 +78,7 @@ When in OTA DFU mode, devices advertise using a board-specific name rather than
 | Heltec T1                    | `T1_DFU`                 |
 | Heltec T114                  | `T114_DFU`               |
 | LILYGO T-Echo                | `LGTE_DFU`               |
-| LILYGO T-Echo Lite           | `LTEL_DFU`               |
 | Minewsemi MX25LE01           | `MX25_DFU`               |
-| Nordic PCA10056              | `N056_DFU`               |
 | ProMicro NRF52840            | `PROM_DFU`               |
 | RAK 4631                     | `4631_DFU`               |
 | RAK 3401                     | `3401_DFU`               |

src/boards/lilygo_techo_lite/board.cmake

@@ -1 +0,0 @@
-set(MCU_VARIANT nrf52840)

src/boards/lilygo_techo_lite/board.h

@@ -1,66 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef _LILYGO_TECHO_LITE_H
-#define _LILYGO_TECHO_LITE_H
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-#define UICR_REGOUT0_VALUE UICR_REGOUT0_VOUT_3V3
-
-#define PIN_LDO_ENABLE      _PINNUM(0, 30)
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER         2
-#define LED_PRIMARY_PIN     _PINNUM(1, 7) // Green
-#define LED_SECONDARY_PIN   _PINNUM(1, 5) // Blue
-#define LED_STATE_ON        0
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTONS_NUMBER    2  // hold down user button on boot to enter OTA DFU mode.
-#define BUTTON_1          _PINNUM(0, 24)  // user button
-#define BUTTON_2          _PINNUM(0, 24)
-#define BUTTON_PULL       NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER  "LilyGo"
-#define BLEDIS_MODEL         "T-Echo-Lite"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-#define USB_DESC_VID           0x239A
-#define USB_DESC_UF2_PID       0x00DA
-#define USB_DESC_CDC_ONLY_PID  0x00DA
-
-#define UF2_PRODUCT_NAME  "Lilygo"
-#define UF2_VOLUME_LABEL  "TECHOLITE"
-#define UF2_BOARD_ID      "T-Echo-Lite-nRF52840"
-#define UF2_INDEX_URL     "https://www.lilygo.cc/"
-
-#endif // _LILYGO_TECHO_LITE_H

src/boards/lilygo_techo_lite/board.mk

@@ -1,2 +0,0 @@
-MCU_SUB_VARIANT = nrf52840
-CFLAGS += -DDEVICE_NAME='"LTEL_DFU"'

src/boards/lilygo_techo_lite/pinconfig.c

@@ -1,28 +0,0 @@
-#include "boards.h"
-#include "uf2/configkeys.h"
-
-__attribute__((used, section(".bootloaderConfig")))
-const uint32_t bootloaderConfig[] =
-{
-  /* CF2 START */
-  CFG_MAGIC0, CFG_MAGIC1,                       // magic
-  5, 100,                                       // used entries, total entries
-
-  204, 0x100000,                                // FLASH_BYTES = 0x100000
-  205, 0x40000,                                 // RAM_BYTES = 0x40000
-  208, (USB_DESC_VID << 16) | USB_DESC_UF2_PID, // BOOTLOADER_BOARD_ID = USB VID+PID, used for verification when updating bootloader via uf2
-  209, 0xada52840,                              // UF2_FAMILY = 0xada52840
-  210, 0x20,                                    // PINS_PORT_SIZE = PA_32
-
-  0, 0, 0, 0, 0, 0, 0, 0
-  /* CF2 END */
-};
-
-void board_init2(void) {
-  nrf_gpio_cfg_output(PIN_LDO_ENABLE);
-  nrf_gpio_pin_write(PIN_LDO_ENABLE, 1);
-}
-
-void board_teardown2(void) {
-  nrf_gpio_pin_write(PIN_LDO_ENABLE, 0);
-}

src/boards/pca10056/board.cmake

@@ -1 +0,0 @@
-set(MCU_VARIANT nrf52840)

src/boards/pca10056/board.h

@@ -1,63 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2018 Ha Thach for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef PCA10056_H
-#define PCA10056_H
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER         2
-#define LED_PRIMARY_PIN     13
-#define LED_SECONDARY_PIN   14
-#define LED_STATE_ON        0
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTONS_NUMBER      2
-#define BUTTON_1            11
-#define BUTTON_2            12
-#define BUTTON_PULL         NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER    "Nordic"
-#define BLEDIS_MODEL           "PCA10056"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-
-// Shared VID/PID with Feather nRF52840, will be disabled for building in the future
-#define USB_DESC_VID           0x239A
-#define USB_DESC_UF2_PID       0x00DA
-#define USB_DESC_CDC_ONLY_PID  0x00DA
-
-#define UF2_PRODUCT_NAME    "Nordic nRF52840 DK"
-#define UF2_BOARD_ID        "nRF52840-pca10056-v1"
-#define UF2_INDEX_URL       "https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-DK"
-
-#endif // PCA10056_H

src/boards/pca10056/board.mk

@@ -1,2 +0,0 @@
-MCU_SUB_VARIANT = nrf52840
-CFLAGS += -DDEVICE_NAME='"N056_DFU"'

src/boards/pca10056/pinconfig.c

@@ -1,19 +0,0 @@
-#include "boards.h"
-#include "uf2/configkeys.h"
-
-__attribute__((used, section(".bootloaderConfig")))
-const uint32_t bootloaderConfig[] =
-{
-  /* CF2 START */
-  CFG_MAGIC0, CFG_MAGIC1,                       // magic
-  5, 100,                                       // used entries, total entries
-
-  204, 0x100000,                                // FLASH_BYTES = 0x100000
-  205, 0x40000,                                 // RAM_BYTES = 0x40000
-  208, (USB_DESC_VID << 16) | USB_DESC_UF2_PID, // BOOTLOADER_BOARD_ID = USB VID+PID, used for verification when updating bootloader via uf2
-  209, 0xada52840,                              // UF2_FAMILY = 0xada52840
-  210, 0x20,                                    // PINS_PORT_SIZE = PA_32
-
-  0, 0, 0, 0, 0, 0, 0, 0
-  /* CF2 END */
-};

src/boards/wismesh_tag/board.h

@@ -34,8 +34,8 @@
 /* LED
  *------------------------------------------------------------------*/
 #define LEDS_NUMBER           2
-#define LED_PRIMARY_PIN       _PINNUM(1, 3)
-#define LED_SECONDARY_PIN     _PINNUM(1, 4)
+#define LED_PRIMARY_PIN       _PINNUM(1, 4)
+#define LED_SECONDARY_PIN     _PINNUM(1, 3)
 #define LED_STATE_ON          1
 
 /*------------------------------------------------------------------*/
@@ -45,7 +45,6 @@
 #define BUTTON_1              _PINNUM(0, 9)	// Allow booting to OTA DFU from button
 #define BUTTON_2              _PINNUM(0, 9)	// Allow booting to OTA DFU from button
 #define BUTTON_PULL           NRF_GPIO_PIN_PULLUP
-#define BUTTON_DFU_DELAY_MS   500
 
 //--------------------------------------------------------------------+
 // BLE OTA

src/main.c

@@ -248,14 +248,6 @@ static void check_dfu_mode(void) {
   if (dfu_skip) return;
 
   /*------------- Determine DFU mode (Serial, OTA, FRESET or normal) -------------*/
-  // Allow boards wait for button release so that wake presses don't enter DFU
-  #ifdef BUTTON_DFU_DELAY_MS
-  for (uint16_t waited = 0; waited < BUTTON_DFU_DELAY_MS; waited += 10) {
-    if (!button_pressed(BUTTON_DFU) && !button_pressed(BUTTON_FRESET)) break;
-    NRFX_DELAY_MS(10);
-  }
-  #endif
-
   // DFU button pressed
   dfu_start = dfu_start || button_pressed(BUTTON_DFU);