Skip to content

Desmakers 4505 #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Desmakers 4505 #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
662532b
Fix missing return values for two functions to avoid warnings during …
OlafFilies Apr 14, 2025
3ce2360
Change sorting of XMC_GPIO_PORT values to avoid error during compilation
OlafFilies Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libraries/OneWire/src/OneWire.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
84 changes: 42 additions & 42 deletions libraries/OneWire/src/util/OneWireConf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,71 +20,71 @@ 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,
.selo_inversion = XMC_SPI_CH_SLAVE_SEL_INV_TO_MSLS,
.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,
.selo_inversion = XMC_SPI_CH_SLAVE_SEL_INV_TO_MSLS,
.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,
.selo_inversion = XMC_SPI_CH_SLAVE_SEL_INV_TO_MSLS,
.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
Expand All @@ -99,53 +99,53 @@ 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,
.selo_inversion = XMC_SPI_CH_SLAVE_SEL_INV_TO_MSLS,
.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,
.selo_inversion = XMC_SPI_CH_SLAVE_SEL_INV_TO_MSLS,
.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
Expand Down
Loading