diff --git a/libraries/OneWire/src/OneWire.cpp b/libraries/OneWire/src/OneWire.cpp
index 0a32a18d..aa84fef5 100644
--- a/libraries/OneWire/src/OneWire.cpp
+++ b/libraries/OneWire/src/OneWire.cpp
@@ -162,7 +162,7 @@ OneWire::~OneWire() { delete mImplementation; }
 //
 // Returns 1 if a device asserted a presence pulse, 0 otherwise.
 //
-uint8_t OneWire::reset(void) { mImplementation->reset(); }
+uint8_t OneWire::reset(void) { return mImplementation->reset(); }
 
 //
 // Write a bit. Port and bit is used to cut lookup time and provide
@@ -235,7 +235,7 @@ void OneWire::target_search(uint8_t family_code) { mImplementation->target_searc
 //        FALSE : device not found, end of search
 //
 uint8_t OneWire::search(uint8_t *newAddr, bool search_mode /* = true */) {
-    mImplementation->search(newAddr, search_mode);
+    return mImplementation->search(newAddr, search_mode);
 }
 #endif
 
diff --git a/libraries/OneWire/src/util/OneWireConf.h b/libraries/OneWire/src/util/OneWireConf.h
index eeb7fe21..29f08b71 100644
--- a/libraries/OneWire/src/util/OneWireConf.h
+++ b/libraries/OneWire/src/util/OneWireConf.h
@@ -20,17 +20,17 @@ XMC_SPI_t mappingHW[] = {
                         .parity_mode = XMC_USIC_CH_PARITY_MODE_NONE},
      .mosi = {.port = (XMC_GPIO_PORT_t *)PORT0_BASE, .pin = (uint8_t)6},
      .mosi_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT7,
-                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
-                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
+                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
+                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
      .miso = {.port = (XMC_GPIO_PORT_t *)PORT0_BASE, .pin = (uint8_t)6},
      .miso_config = {.mode = XMC_GPIO_MODE_INPUT_TRISTATE,
-                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
-                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
+                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
+                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
      .input_source = XMC_INPUT_C,
      .sclkout = {.port = (XMC_GPIO_PORT_t *)PORT0_BASE, .pin = (uint8_t)6},
      .sclkout_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT7,
-                        .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
-                        .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD}},
+                        .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
+                        .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH}},
     {.channel = XMC_SPI0_CH1,
      .channel_config = {.baudrate = 15984375U,
                         .bus_mode = (XMC_SPI_CH_BUS_MODE_t)XMC_SPI_CH_BUS_MODE_MASTER,
@@ -38,17 +38,17 @@ XMC_SPI_t mappingHW[] = {
                         .parity_mode = XMC_USIC_CH_PARITY_MODE_NONE},
      .mosi = {.port = (XMC_GPIO_PORT_t *)PORT0_BASE, .pin = (uint8_t)7},
      .mosi_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT7,
-                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
-                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
+                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
+                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
      .miso = {.port = (XMC_GPIO_PORT_t *)PORT0_BASE, .pin = (uint8_t)7},
      .miso_config = {.mode = XMC_GPIO_MODE_INPUT_TRISTATE,
-                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
-                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
+                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
+                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
      .input_source = XMC_INPUT_D,
      .sclkout = {.port = (XMC_GPIO_PORT_t *)PORT0_BASE, .pin = (uint8_t)7},
      .sclkout_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT7,
-                        .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
-                        .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD}},
+                        .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
+                        .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH}},
     {.channel = XMC_SPI0_CH1,
      .channel_config = {.baudrate = 15984375U,
                         .bus_mode = (XMC_SPI_CH_BUS_MODE_t)XMC_SPI_CH_BUS_MODE_MASTER,
@@ -56,17 +56,17 @@ XMC_SPI_t mappingHW[] = {
                         .parity_mode = XMC_USIC_CH_PARITY_MODE_NONE},
      .mosi = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)11},
      .mosi_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT7,
-                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
-                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
+                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
+                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
      .miso = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)11},
      .miso_config = {.mode = XMC_GPIO_MODE_INPUT_TRISTATE,
-                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
-                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
+                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
+                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
      .input_source = XMC_INPUT_F,
      .sclkout = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)11},
      .sclkout_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT7,
-                        .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
-                        .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD}},
+                        .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
+                        .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH}},
     {.channel = XMC_SPI0_CH1,
      .channel_config = {.baudrate = 15984375U,
                         .bus_mode = (XMC_SPI_CH_BUS_MODE_t)XMC_SPI_CH_BUS_MODE_MASTER,
@@ -74,17 +74,17 @@ XMC_SPI_t mappingHW[] = {
                         .parity_mode = XMC_USIC_CH_PARITY_MODE_NONE},
      .mosi = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)10},
      .mosi_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT7,
-                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
-                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
+                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
+                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
      .miso = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)10},
      .miso_config = {.mode = XMC_GPIO_MODE_INPUT_TRISTATE,
-                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
-                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
+                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
+                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
      .input_source = XMC_INPUT_E,
      .sclkout = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)10},
      .sclkout_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT7,
-                        .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
-                        .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD}}};
+                        .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
+                        .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH}}};
 
 #elif defined(XMC1100_Boot_Kit)
     #define NUM_ONEWIRE_HW 3
@@ -99,17 +99,17 @@ XMC_SPI_t mappingHW[] = {
                         .parity_mode = XMC_USIC_CH_PARITY_MODE_NONE},
      .mosi = {.port = (XMC_GPIO_PORT_t *)PORT1_BASE, .pin = (uint8_t)1},
      .mosi_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT6,
-                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
-                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
+                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
+                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
      .miso = {.port = (XMC_GPIO_PORT_t *)PORT1_BASE, .pin = (uint8_t)1},
      .miso_config = {.mode = XMC_GPIO_MODE_INPUT_TRISTATE,
-                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
-                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
+                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
+                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
      .input_source = XMC_INPUT_D,
      .sclkout = {.port = (XMC_GPIO_PORT_t *)PORT1_BASE, .pin = (uint8_t)1},
      .sclkout_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT6,
-                        .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
-                        .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD}},
+                        .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
+                        .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH}},
     {.channel = XMC_SPI0_CH0,
      .channel_config = {.baudrate = 15984375U,
                         .bus_mode = (XMC_SPI_CH_BUS_MODE_t)XMC_SPI_CH_BUS_MODE_MASTER,
@@ -117,17 +117,17 @@ XMC_SPI_t mappingHW[] = {
                         .parity_mode = XMC_USIC_CH_PARITY_MODE_NONE},
      .mosi = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)1},
      .mosi_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT6,
-                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
-                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
+                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
+                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
      .miso = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)1},
      .miso_config = {.mode = XMC_GPIO_MODE_INPUT_TRISTATE,
-                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
-                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
+                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
+                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
      .input_source = XMC_INPUT_F,
      .sclkout = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)1},
      .sclkout_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT6,
-                        .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
-                        .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD}},
+                        .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
+                        .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH}},
     {.channel = XMC_SPI0_CH0,
      .channel_config = {.baudrate = 15984375U,
                         .bus_mode = (XMC_SPI_CH_BUS_MODE_t)XMC_SPI_CH_BUS_MODE_MASTER,
@@ -135,17 +135,17 @@ XMC_SPI_t mappingHW[] = {
                         .parity_mode = XMC_USIC_CH_PARITY_MODE_NONE},
      .mosi = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)0},
      .mosi_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT6,
-                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
-                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
+                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
+                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
      .miso = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)0},
      .miso_config = {.mode = XMC_GPIO_MODE_INPUT_TRISTATE,
-                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
-                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
+                     .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
+                     .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
      .input_source = XMC_INPUT_E,
      .sclkout = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)0},
      .sclkout_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT6,
-                        .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
-                        .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD}}};
+                        .input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
+                        .output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH}}};
 
 #elif defined(XMC4700_Relax_Kit)
     #define NUM_ONEWIRE_HW 6