From f4cb22f436a3cd8cc0321775d98d9c9e8ef6c59d Mon Sep 17 00:00:00 2001
From: chain40 <chain40@outlook.com>
Date: Mon, 20 May 2024 11:34:11 +0800
Subject: [PATCH] feat: undefine CONFIG_GPIO_AS_PINRESET

---
 nrf5x.props | 4 ++--
 nrf5x.xml   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nrf5x.props b/nrf5x.props
index 7fd75bf..6ec4d2a 100644
--- a/nrf5x.props
+++ b/nrf5x.props
@@ -9,8 +9,8 @@
 <!-- In order to build this project manually (outside VisualGDB), please provide TOOLCHAIN_ROOT, BSP_ROOT, EFP_BASE and TESTFW_BASE variables via Environment or Make command line -->
 	<ItemDefinitionGroup>
 		<ClCompile>
-			<PreprocessorDefinitions>NRF52840_XXAA;S140_reserve;CONFIG_GPIO_AS_PINRESET;NRF_DFU_SETTINGS_VERSION=2;NRF_SD_BLE_API_VERSION=7;__STACK_SIZE=1024;__HEAP_SIZE=1024;ARM_MATH_CM4;SOFTDEVICE_PRESENT;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
-			<AdditionalIncludeDirectories>$(ProjectDir);$(BSP_ROOT)/nRF5x/components/softdevice/S140_reserve/headers;$(BSP_ROOT)/nRF5x/components/softdevice/S140_reserve/headers/nrf52;$(BSP_ROOT)/nRF5x/modules/nrfx;$(BSP_ROOT)/nRF5x/modules/nrfx/hal;$(BSP_ROOT)/nRF5x/modules/nrfx/drivers/include;$(BSP_ROOT)/nRF5x/modules/nrfx/drivers;$(BSP_ROOT)/nRF5x/external/nrf_oberon;$(BSP_ROOT)/nRF5x/modules/nrfx/mdk;$(BSP_ROOT)/nRF5x/components/toolchain/cmsis/dsp/Include;$(BSP_ROOT)/nRF5x/components/toolchain/cmsis/include;$(BSP_ROOT)/nRF5x/components/libraries/util;$(BSP_ROOT)/nRF5x/components/drivers_nrf/radio_config;$(BSP_ROOT)/nRF5x/components/drivers_nrf/sdio;$(BSP_ROOT)/nRF5x/components/drivers_nrf/sdio/config;$(BSP_ROOT)/nRF5x/components/drivers_nrf/spi_master;$(BSP_ROOT)/nRF5x/components/drivers_nrf/twi_master/deprecated;$(BSP_ROOT)/nRF5x/components/drivers_nrf/twi_master/deprecated/config;$(BSP_ROOT)/nRF5x/components/libraries/atomic;$(BSP_ROOT)/nRF5x/components/libraries/atomic_fifo;$(BSP_ROOT)/nRF5x/components/libraries/atomic_flags;$(BSP_ROOT)/nRF5x/components/libraries/balloc;$(BSP_ROOT)/nRF5x/components/libraries/block_dev;$(BSP_ROOT)/nRF5x/components/libraries/block_dev/empty;$(BSP_ROOT)/nRF5x/components/libraries/block_dev/qspi;$(BSP_ROOT)/nRF5x/components/libraries/block_dev/ram;$(BSP_ROOT)/nRF5x/components/libraries/block_dev/sdc;$(BSP_ROOT)/nRF5x/components/libraries/bootloader;$(BSP_ROOT)/nRF5x/components/libraries/bootloader/ble_dfu;$(BSP_ROOT)/nRF5x/components/libraries/bootloader/dfu;$(BSP_ROOT)/nRF5x/components/libraries/bootloader/serial_dfu;$(BSP_ROOT)/nRF5x/components/libraries/bsp;$(BSP_ROOT)/nRF5x/components/libraries/button;$(BSP_ROOT)/nRF5x/components/libraries/cli;$(BSP_ROOT)/nRF5x/components/libraries/cli/ble_uart;$(BSP_ROOT)/nRF5x/components/libraries/cli/cdc_acm;$(BSP_ROOT)/nRF5x/components/libraries/cli/libuarte;$(BSP_ROOT)/nRF5x/components/libraries/cli/rtt;$(BSP_ROOT)/nRF5x/components/libraries/cli/uart;$(BSP_ROOT)/nRF5x/components/libraries/crc16;$(BSP_ROOT)/nRF5x/components/libraries/crc32;$(BSP_ROOT)/nRF5x/components/libraries/crypto;$(BSP_ROOT)/nRF5x/components/libraries/crypto/backend/cc310;$(BSP_ROOT)/nRF5x/components/libraries/crypto/backend/cc310_bl;$(BSP_ROOT)/nRF5x/components/libraries/crypto/backend/cifra;$(BSP_ROOT)/nRF5x/components/libraries/crypto/backend/mbedtls;$(BSP_ROOT)/nRF5x/components/libraries/crypto/backend/micro_ecc;$(BSP_ROOT)/nRF5x/components/libraries/crypto/backend/nrf_hw;$(BSP_ROOT)/nRF5x/components/libraries/crypto/backend/nrf_sw;$(BSP_ROOT)/nRF5x/components/libraries/crypto/backend/oberon;$(BSP_ROOT)/nRF5x/components/libraries/crypto/backend/optiga;$(BSP_ROOT)/nRF5x/components/libraries/csense;$(BSP_ROOT)/nRF5x/components/libraries/csense_drv;$(BSP_ROOT)/nRF5x/components/libraries/delay;$(BSP_ROOT)/nRF5x/components/libraries/ecc;$(BSP_ROOT)/nRF5x/components/libraries/experimental_section_vars;$(BSP_ROOT)/nRF5x/components/libraries/experimental_task_manager;$(BSP_ROOT)/nRF5x/components/libraries/fds;$(BSP_ROOT)/nRF5x/components/libraries/fifo;$(BSP_ROOT)/nRF5x/components/libraries/fstorage;$(BSP_ROOT)/nRF5x/components/libraries/gfx;$(BSP_ROOT)/nRF5x/components/libraries/gpiote;$(BSP_ROOT)/nRF5x/components/libraries/hardfault;$(BSP_ROOT)/nRF5x/components/libraries/hci;$(BSP_ROOT)/nRF5x/components/libraries/led_softblink;$(BSP_ROOT)/nRF5x/components/libraries/libuarte;$(BSP_ROOT)/nRF5x/components/libraries/log;$(BSP_ROOT)/nRF5x/components/libraries/log/src;$(BSP_ROOT)/nRF5x/components/libraries/low_power_pwm;$(BSP_ROOT)/nRF5x/components/libraries/memobj;$(BSP_ROOT)/nRF5x/components/libraries/mem_manager;$(BSP_ROOT)/nRF5x/components/libraries/mpu;$(BSP_ROOT)/nRF5x/components/libraries/mutex;$(BSP_ROOT)/nRF5x/components/libraries/pwm;$(BSP_ROOT)/nRF5x/components/libraries/pwr_mgmt;$(BSP_ROOT)/nRF5x/components/libraries/queue;$(BSP_ROOT)/nRF5x/components/libraries/ringbuf;$(BSP_ROOT)/nRF5x/components/libraries/scheduler;$(BSP_ROOT)/nRF5x/components/libraries/sdcard;$(BSP_ROOT)/nRF5x/components/libraries/sensorsim;$(BSP_ROOT)/nRF5x/components/libraries/sha256;$(BSP_ROOT)/nRF5x/components/libraries/simple_timer;$(BSP_ROOT)/nRF5x/components/libraries/slip;$(BSP_ROOT)/nRF5x/components/libraries/sortlist;$(BSP_ROOT)/nRF5x/components/libraries/spi_mngr;$(BSP_ROOT)/nRF5x/components/libraries/stack_guard;$(BSP_ROOT)/nRF5x/components/libraries/stack_info;$(BSP_ROOT)/nRF5x/components/libraries/strerror;$(BSP_ROOT)/nRF5x/components/libraries/svc;$(BSP_ROOT)/nRF5x/components/libraries/timer;$(BSP_ROOT)/nRF5x/components/libraries/twi_mngr;$(BSP_ROOT)/nRF5x/components/libraries/twi_sensor;$(BSP_ROOT)/nRF5x/components/libraries/uart;$(BSP_ROOT)/nRF5x/components/libraries/usbd;$(BSP_ROOT)/nRF5x/components/libraries/usbd/class/audio;$(BSP_ROOT)/nRF5x/components/libraries/usbd/class/cdc;$(BSP_ROOT)/nRF5x/components/libraries/usbd/class/cdc/acm;$(BSP_ROOT)/nRF5x/components/libraries/usbd/class/dummy;$(BSP_ROOT)/nRF5x/components/libraries/usbd/class/hid;$(BSP_ROOT)/nRF5x/components/libraries/usbd/class/hid/generic;$(BSP_ROOT)/nRF5x/components/libraries/usbd/class/hid/kbd;$(BSP_ROOT)/nRF5x/components/libraries/usbd/class/hid/mouse;$(BSP_ROOT)/nRF5x/components/libraries/usbd/class/msc;$(BSP_ROOT)/nRF5x/components/libraries/usbd/class/nrf_dfu_trigger;$(BSP_ROOT)/nRF5x/components/softdevice/common;$(BSP_ROOT)/nRF5x/external/fprintf;$(BSP_ROOT)/nRF5x/modules/nrfx/drivers/src;$(BSP_ROOT)/nRF5x/modules/nrfx/drivers/src/prs;$(BSP_ROOT)/nRF5x/modules/nrfx/soc;$(BSP_ROOT)/nRF5x/integration/nrfx;$(BSP_ROOT)/nRF5x/integration/nrfx/legacy;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>NRF52840_XXAA;S140_reserve;NRF_DFU_SETTINGS_VERSION=2;NRF_SD_BLE_API_VERSION=7;__STACK_SIZE=1024;__HEAP_SIZE=1024;ARM_MATH_CM4;SOFTDEVICE_PRESENT;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>%(ClCompile.AdditionalIncludeDirectories);$(ProjectDir);$(BSP_ROOT)/nRF5x/components/softdevice/S140_reserve/headers;$(BSP_ROOT)/nRF5x/components/softdevice/S140_reserve/headers/nrf52;$(BSP_ROOT)/nRF5x/modules/nrfx;$(BSP_ROOT)/nRF5x/modules/nrfx/hal;$(BSP_ROOT)/nRF5x/modules/nrfx/drivers/include;$(BSP_ROOT)/nRF5x/modules/nrfx/drivers;$(BSP_ROOT)/nRF5x/external/nrf_oberon;$(BSP_ROOT)/nRF5x/modules/nrfx/mdk;$(BSP_ROOT)/nRF5x/components/toolchain/cmsis/dsp/Include;$(BSP_ROOT)/nRF5x/components/toolchain/cmsis/include;$(BSP_ROOT)/nRF5x/components/libraries/util;$(BSP_ROOT)/nRF5x/components/drivers_nrf/radio_config;$(BSP_ROOT)/nRF5x/components/drivers_nrf/sdio;$(BSP_ROOT)/nRF5x/components/drivers_nrf/sdio/config;$(BSP_ROOT)/nRF5x/components/drivers_nrf/spi_master;$(BSP_ROOT)/nRF5x/components/drivers_nrf/twi_master/deprecated;$(BSP_ROOT)/nRF5x/components/drivers_nrf/twi_master/deprecated/config;$(BSP_ROOT)/nRF5x/components/libraries/atomic;$(BSP_ROOT)/nRF5x/components/libraries/atomic_fifo;$(BSP_ROOT)/nRF5x/components/libraries/atomic_flags;$(BSP_ROOT)/nRF5x/components/libraries/balloc;$(BSP_ROOT)/nRF5x/components/libraries/block_dev;$(BSP_ROOT)/nRF5x/components/libraries/block_dev/empty;$(BSP_ROOT)/nRF5x/components/libraries/block_dev/qspi;$(BSP_ROOT)/nRF5x/components/libraries/block_dev/ram;$(BSP_ROOT)/nRF5x/components/libraries/block_dev/sdc;$(BSP_ROOT)/nRF5x/components/libraries/bootloader;$(BSP_ROOT)/nRF5x/components/libraries/bootloader/ble_dfu;$(BSP_ROOT)/nRF5x/components/libraries/bootloader/dfu;$(BSP_ROOT)/nRF5x/components/libraries/bootloader/serial_dfu;$(BSP_ROOT)/nRF5x/components/libraries/bsp;$(BSP_ROOT)/nRF5x/components/libraries/button;$(BSP_ROOT)/nRF5x/components/libraries/cli;$(BSP_ROOT)/nRF5x/components/libraries/cli/ble_uart;$(BSP_ROOT)/nRF5x/components/libraries/cli/cdc_acm;$(BSP_ROOT)/nRF5x/components/libraries/cli/libuarte;$(BSP_ROOT)/nRF5x/components/libraries/cli/rtt;$(BSP_ROOT)/nRF5x/components/libraries/cli/uart;$(BSP_ROOT)/nRF5x/components/libraries/crc16;$(BSP_ROOT)/nRF5x/components/libraries/crc32;$(BSP_ROOT)/nRF5x/components/libraries/crypto;$(BSP_ROOT)/nRF5x/components/libraries/crypto/backend/cc310;$(BSP_ROOT)/nRF5x/components/libraries/crypto/backend/cc310_bl;$(BSP_ROOT)/nRF5x/components/libraries/crypto/backend/cifra;$(BSP_ROOT)/nRF5x/components/libraries/crypto/backend/mbedtls;$(BSP_ROOT)/nRF5x/components/libraries/crypto/backend/micro_ecc;$(BSP_ROOT)/nRF5x/components/libraries/crypto/backend/nrf_hw;$(BSP_ROOT)/nRF5x/components/libraries/crypto/backend/nrf_sw;$(BSP_ROOT)/nRF5x/components/libraries/crypto/backend/oberon;$(BSP_ROOT)/nRF5x/components/libraries/crypto/backend/optiga;$(BSP_ROOT)/nRF5x/components/libraries/csense;$(BSP_ROOT)/nRF5x/components/libraries/csense_drv;$(BSP_ROOT)/nRF5x/components/libraries/delay;$(BSP_ROOT)/nRF5x/components/libraries/ecc;$(BSP_ROOT)/nRF5x/components/libraries/experimental_section_vars;$(BSP_ROOT)/nRF5x/components/libraries/experimental_task_manager;$(BSP_ROOT)/nRF5x/components/libraries/fds;$(BSP_ROOT)/nRF5x/components/libraries/fifo;$(BSP_ROOT)/nRF5x/components/libraries/fstorage;$(BSP_ROOT)/nRF5x/components/libraries/gfx;$(BSP_ROOT)/nRF5x/components/libraries/gpiote;$(BSP_ROOT)/nRF5x/components/libraries/hardfault;$(BSP_ROOT)/nRF5x/components/libraries/hci;$(BSP_ROOT)/nRF5x/components/libraries/led_softblink;$(BSP_ROOT)/nRF5x/components/libraries/libuarte;$(BSP_ROOT)/nRF5x/components/libraries/log;$(BSP_ROOT)/nRF5x/components/libraries/log/src;$(BSP_ROOT)/nRF5x/components/libraries/low_power_pwm;$(BSP_ROOT)/nRF5x/components/libraries/memobj;$(BSP_ROOT)/nRF5x/components/libraries/mem_manager;$(BSP_ROOT)/nRF5x/components/libraries/mpu;$(BSP_ROOT)/nRF5x/components/libraries/mutex;$(BSP_ROOT)/nRF5x/components/libraries/pwm;$(BSP_ROOT)/nRF5x/components/libraries/pwr_mgmt;$(BSP_ROOT)/nRF5x/components/libraries/queue;$(BSP_ROOT)/nRF5x/components/libraries/ringbuf;$(BSP_ROOT)/nRF5x/components/libraries/scheduler;$(BSP_ROOT)/nRF5x/components/libraries/sdcard;$(BSP_ROOT)/nRF5x/components/libraries/sensorsim;$(BSP_ROOT)/nRF5x/components/libraries/sha256;$(BSP_ROOT)/nRF5x/components/libraries/simple_timer;$(BSP_ROOT)/nRF5x/components/libraries/slip;$(BSP_ROOT)/nRF5x/components/libraries/sortlist;$(BSP_ROOT)/nRF5x/components/libraries/spi_mngr;$(BSP_ROOT)/nRF5x/components/libraries/stack_guard;$(BSP_ROOT)/nRF5x/components/libraries/stack_info;$(BSP_ROOT)/nRF5x/components/libraries/strerror;$(BSP_ROOT)/nRF5x/components/libraries/svc;$(BSP_ROOT)/nRF5x/components/libraries/timer;$(BSP_ROOT)/nRF5x/components/libraries/twi_mngr;$(BSP_ROOT)/nRF5x/components/libraries/twi_sensor;$(BSP_ROOT)/nRF5x/components/libraries/uart;$(BSP_ROOT)/nRF5x/components/libraries/usbd;$(BSP_ROOT)/nRF5x/components/libraries/usbd/class/audio;$(BSP_ROOT)/nRF5x/components/libraries/usbd/class/cdc;$(BSP_ROOT)/nRF5x/components/libraries/usbd/class/cdc/acm;$(BSP_ROOT)/nRF5x/components/libraries/usbd/class/dummy;$(BSP_ROOT)/nRF5x/components/libraries/usbd/class/hid;$(BSP_ROOT)/nRF5x/components/libraries/usbd/class/hid/generic;$(BSP_ROOT)/nRF5x/components/libraries/usbd/class/hid/kbd;$(BSP_ROOT)/nRF5x/components/libraries/usbd/class/hid/mouse;$(BSP_ROOT)/nRF5x/components/libraries/usbd/class/msc;$(BSP_ROOT)/nRF5x/components/libraries/usbd/class/nrf_dfu_trigger;$(BSP_ROOT)/nRF5x/components/softdevice/common;$(BSP_ROOT)/nRF5x/external/fprintf;$(BSP_ROOT)/nRF5x/modules/nrfx/drivers/src;$(BSP_ROOT)/nRF5x/modules/nrfx/drivers/src/prs;$(BSP_ROOT)/nRF5x/modules/nrfx/soc;$(BSP_ROOT)/nRF5x/integration/nrfx;$(BSP_ROOT)/nRF5x/integration/nrfx/legacy</AdditionalIncludeDirectories>
 			<AdditionalOptions>-mabi=aapcs %(ClCompile.AdditionalOptions)</AdditionalOptions>
 		</ClCompile>
 	</ItemDefinitionGroup>
diff --git a/nrf5x.xml b/nrf5x.xml
index e4e0970..3f582f7 100644
--- a/nrf5x.xml
+++ b/nrf5x.xml
@@ -18,7 +18,7 @@
       </KeyValue>
       <KeyValue>
         <Key>com.sysprogs.bspoptions.nrf5x.pinreset</Key>
-        <Value>CONFIG_GPIO_AS_PINRESET</Value>
+        <Value />
       </KeyValue>
       <KeyValue>
         <Key>com.sysprogs.bspoptions.primary_memory</Key>