Skip to content

Commit 06d693e

Browse files
ozersaJake-Carter
ozersa
and
Jake-Carter
authored
fix(PeriphDrivers): Fix OWM Presence Detect Bit and GPIO Alternate Functions, Use VDDIOH by Default (#811)
Signed-off-by: Sadik Ozer <[email protected]> Co-authored-by: Jake-Carter <[email protected]>
1 parent 16ff45b commit 06d693e

File tree

19 files changed

+26
-26
lines changed

19 files changed

+26
-26
lines changed

‎Libraries/CMSIS/Device/Maxim/MAX32650/Include/max32650.svd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6091,7 +6091,7 @@
60916091
<field>
60926092
<name>presence_detect</name>
60936093
<description>Presence Pulse Detected.</description>
6094-
<bitRange>[5:5]</bitRange>
6094+
<bitRange>[7:7]</bitRange>
60956095
<access>read-only</access>
60966096
</field>
60976097
</fields>

‎Libraries/CMSIS/Device/Maxim/MAX32650/Include/owm_regs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ typedef struct {
192192
#define MXC_F_OWM_CTRL_STAT_OD_SPEC_MODE_POS 4 /**< CTRL_STAT_OD_SPEC_MODE Position */
193193
#define MXC_F_OWM_CTRL_STAT_OD_SPEC_MODE ((uint32_t)(0x1UL << MXC_F_OWM_CTRL_STAT_OD_SPEC_MODE_POS)) /**< CTRL_STAT_OD_SPEC_MODE Mask */
194194

195-
#define MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT_POS 5 /**< CTRL_STAT_PRESENCE_DETECT Position */
195+
#define MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT_POS 7 /**< CTRL_STAT_PRESENCE_DETECT Position */
196196
#define MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT ((uint32_t)(0x1UL << MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT_POS)) /**< CTRL_STAT_PRESENCE_DETECT Mask */
197197

198198
/**@} end of group OWM_CTRL_STAT_Register */

‎Libraries/CMSIS/Device/Maxim/MAX32655/Include/max32655.svd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7216,7 +7216,7 @@
72167216
<field>
72177217
<name>presence_detect</name>
72187218
<description>Presence Pulse Detected.</description>
7219-
<bitRange>[5:5]</bitRange>
7219+
<bitRange>[7:7]</bitRange>
72207220
<access>read-only</access>
72217221
</field>
72227222
</fields>

‎Libraries/CMSIS/Device/Maxim/MAX32655/Include/owm_regs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ typedef struct {
192192
#define MXC_F_OWM_CTRL_STAT_OD_SPEC_MODE_POS 4 /**< CTRL_STAT_OD_SPEC_MODE Position */
193193
#define MXC_F_OWM_CTRL_STAT_OD_SPEC_MODE ((uint32_t)(0x1UL << MXC_F_OWM_CTRL_STAT_OD_SPEC_MODE_POS)) /**< CTRL_STAT_OD_SPEC_MODE Mask */
194194

195-
#define MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT_POS 5 /**< CTRL_STAT_PRESENCE_DETECT Position */
195+
#define MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT_POS 7 /**< CTRL_STAT_PRESENCE_DETECT Position */
196196
#define MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT ((uint32_t)(0x1UL << MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT_POS)) /**< CTRL_STAT_PRESENCE_DETECT Mask */
197197

198198
/**@} end of group OWM_CTRL_STAT_Register */

‎Libraries/CMSIS/Device/Maxim/MAX32680/Include/max32680.svd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7152,7 +7152,7 @@
71527152
<field>
71537153
<name>presence_detect</name>
71547154
<description>Presence Pulse Detected.</description>
7155-
<bitRange>[5:5]</bitRange>
7155+
<bitRange>[7:7]</bitRange>
71567156
<access>read-only</access>
71577157
</field>
71587158
</fields>

‎Libraries/CMSIS/Device/Maxim/MAX32680/Include/owm_regs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ typedef struct {
192192
#define MXC_F_OWM_CTRL_STAT_OD_SPEC_MODE_POS 4 /**< CTRL_STAT_OD_SPEC_MODE Position */
193193
#define MXC_F_OWM_CTRL_STAT_OD_SPEC_MODE ((uint32_t)(0x1UL << MXC_F_OWM_CTRL_STAT_OD_SPEC_MODE_POS)) /**< CTRL_STAT_OD_SPEC_MODE Mask */
194194

195-
#define MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT_POS 5 /**< CTRL_STAT_PRESENCE_DETECT Position */
195+
#define MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT_POS 7 /**< CTRL_STAT_PRESENCE_DETECT Position */
196196
#define MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT ((uint32_t)(0x1UL << MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT_POS)) /**< CTRL_STAT_PRESENCE_DETECT Mask */
197197

198198
/**@} end of group OWM_CTRL_STAT_Register */

‎Libraries/CMSIS/Device/Maxim/MAX78000/Include/max78000.svd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7262,7 +7262,7 @@
72627262
<field>
72637263
<name>presence_detect</name>
72647264
<description>Presence Pulse Detected.</description>
7265-
<bitRange>[5:5]</bitRange>
7265+
<bitRange>[7:7]</bitRange>
72667266
<access>read-only</access>
72677267
</field>
72687268
</fields>

‎Libraries/CMSIS/Device/Maxim/MAX78000/Include/owm_regs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ typedef struct {
192192
#define MXC_F_OWM_CTRL_STAT_OD_SPEC_MODE_POS 4 /**< CTRL_STAT_OD_SPEC_MODE Position */
193193
#define MXC_F_OWM_CTRL_STAT_OD_SPEC_MODE ((uint32_t)(0x1UL << MXC_F_OWM_CTRL_STAT_OD_SPEC_MODE_POS)) /**< CTRL_STAT_OD_SPEC_MODE Mask */
194194

195-
#define MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT_POS 5 /**< CTRL_STAT_PRESENCE_DETECT Position */
195+
#define MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT_POS 7 /**< CTRL_STAT_PRESENCE_DETECT Position */
196196
#define MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT ((uint32_t)(0x1UL << MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT_POS)) /**< CTRL_STAT_PRESENCE_DETECT Mask */
197197

198198
/**@} end of group OWM_CTRL_STAT_Register */

‎Libraries/CMSIS/Device/Maxim/MAX78002/Include/max78002.svd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11112,7 +11112,7 @@
1111211112
<field>
1111311113
<name>presence_detect</name>
1111411114
<description>Presence Pulse Detected.</description>
11115-
<bitRange>[5:5]</bitRange>
11115+
<bitRange>[7:7]</bitRange>
1111611116
<access>read-only</access>
1111711117
</field>
1111811118
</fields>

‎Libraries/CMSIS/Device/Maxim/MAX78002/Include/owm_regs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ typedef struct {
192192
#define MXC_F_OWM_CTRL_STAT_OD_SPEC_MODE_POS 4 /**< CTRL_STAT_OD_SPEC_MODE Position */
193193
#define MXC_F_OWM_CTRL_STAT_OD_SPEC_MODE ((uint32_t)(0x1UL << MXC_F_OWM_CTRL_STAT_OD_SPEC_MODE_POS)) /**< CTRL_STAT_OD_SPEC_MODE Mask */
194194

195-
#define MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT_POS 5 /**< CTRL_STAT_PRESENCE_DETECT Position */
195+
#define MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT_POS 7 /**< CTRL_STAT_PRESENCE_DETECT Position */
196196
#define MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT ((uint32_t)(0x1UL << MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT_POS)) /**< CTRL_STAT_PRESENCE_DETECT Mask */
197197

198198
/**@} end of group OWM_CTRL_STAT_Register */

‎Libraries/PeriphDrivers/Source/OWM/owm_me17.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,7 @@ int MXC_OWM_Init(const mxc_owm_cfg_t *cfg)
6969
return E_NULL_PTR;
7070
}
7171

72-
// Set system level configurations
73-
mxc_gpio_regs_t *gpio = gpio_cfg_owm.port;
74-
7572
MXC_SYS_ClockEnable(MXC_SYS_PERIPH_CLOCK_OWIRE);
76-
gpio->vssel |= gpio_cfg_owm.mask; // 1-Wire pins need to be at 3.3V.
7773

7874
if ((err = MXC_GPIO_Config(&gpio_cfg_owm)) != E_NO_ERROR) {
7975
return err;

‎Libraries/PeriphDrivers/Source/OWM/owm_me18.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,7 @@ int MXC_OWM_Init(const mxc_owm_cfg_t *cfg)
6969
return E_NULL_PTR;
7070
}
7171

72-
// Set system level configurations
73-
mxc_gpio_regs_t *gpio = gpio_cfg_owm.port;
74-
7572
MXC_SYS_ClockEnable(MXC_SYS_PERIPH_CLOCK_OWIRE);
76-
gpio->vssel |= gpio_cfg_owm.mask; // 1-Wire pins need to be at 3.3V.
7773

7874
if ((err = MXC_GPIO_Config(&gpio_cfg_owm)) != E_NO_ERROR) {
7975
return err;

‎Libraries/PeriphDrivers/Source/OWM/owm_reva_ai87.svd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
<field>
129129
<name>presence_detect</name>
130130
<description>Presence Pulse Detected.</description>
131-
<bitRange>[5:5]</bitRange>
131+
<bitRange>[7:7]</bitRange>
132132
<access>read-only</access>
133133
</field>
134134
</fields>

‎Libraries/PeriphDrivers/Source/OWM/owm_reva_me10.svd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
<field>
129129
<name>presence_detect</name>
130130
<description>Presence Pulse Detected.</description>
131-
<bitRange>[5:5]</bitRange>
131+
<bitRange>[7:7]</bitRange>
132132
<access>read-only</access>
133133
</field>
134134
</fields>

‎Libraries/PeriphDrivers/Source/OWM/owm_reva_me17.svd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
<field>
129129
<name>presence_detect</name>
130130
<description>Presence Pulse Detected.</description>
131-
<bitRange>[5:5]</bitRange>
131+
<bitRange>[7:7]</bitRange>
132132
<access>read-only</access>
133133
</field>
134134
</fields>

‎Libraries/PeriphDrivers/Source/SYS/pins_ai87.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,11 @@ const mxc_gpio_cfg_t gpio_cfg_i2s0 = { MXC_GPIO1, (MXC_GPIO_PIN_2 | MXC_GPIO_PIN
116116
const mxc_gpio_cfg_t gpio_cfg_i2s0_extclk = { MXC_GPIO0, (MXC_GPIO_PIN_14), MXC_GPIO_FUNC_ALT2,
117117
MXC_GPIO_PAD_NONE, MXC_GPIO_VSSEL_VDDIO, MXC_GPIO_DRVSTR_0 };
118118

119+
// 1-Wire pins need to be at 3.3V so that MXC_GPIO_VSSEL_VDDIOH is selected.
119120
const mxc_gpio_cfg_t gpio_cfg_owm = { MXC_GPIO0, (MXC_GPIO_PIN_6 | MXC_GPIO_PIN_7), MXC_GPIO_FUNC_ALT2,
120-
MXC_GPIO_PAD_NONE, MXC_GPIO_VSSEL_VDDIO, MXC_GPIO_DRVSTR_0 };
121+
MXC_GPIO_PAD_NONE, MXC_GPIO_VSSEL_VDDIOH, MXC_GPIO_DRVSTR_0 };
121122
const mxc_gpio_cfg_t gpio_cfg_owmb = { MXC_GPIO0, (MXC_GPIO_PIN_18 | MXC_GPIO_PIN_19), MXC_GPIO_FUNC_ALT2,
122-
MXC_GPIO_PAD_NONE, MXC_GPIO_VSSEL_VDDIO, MXC_GPIO_DRVSTR_0 };
123+
MXC_GPIO_PAD_NONE, MXC_GPIO_VSSEL_VDDIOH, MXC_GPIO_DRVSTR_0 };
123124

124125
const mxc_gpio_cfg_t gpio_cfg_rtcsqw = { MXC_GPIO3, MXC_GPIO_PIN_1, MXC_GPIO_FUNC_ALT1,
125126
MXC_GPIO_PAD_NONE, MXC_GPIO_VSSEL_VDDIO, MXC_GPIO_DRVSTR_0 };

‎Libraries/PeriphDrivers/Source/SYS/pins_me10.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ const mxc_gpio_cfg_t gpio_cfg_sdhc_1 = { MXC_GPIO1, (MXC_GPIO_PIN_0 | MXC_GPIO_P
214214
MXC_GPIO_PIN_4 | MXC_GPIO_PIN_5 | MXC_GPIO_PIN_6), MXC_GPIO_FUNC_ALT1,
215215
MXC_GPIO_PAD_NONE, MXC_GPIO_VSSEL_VDDIO, MXC_GPIO_DRVSTR_0 };
216216

217+
// 1-Wire pins need to be at 3.3V so that MXC_GPIO_VSSEL_VDDIOH is selected.
217218
const mxc_gpio_cfg_t gpio_cfg_owm = { MXC_GPIO1, (MXC_GPIO_PIN_30 | MXC_GPIO_PIN_31), MXC_GPIO_FUNC_ALT1,
218219
MXC_GPIO_PAD_NONE, MXC_GPIO_VSSEL_VDDIOH, MXC_GPIO_DRVSTR_0 };
219220

‎Libraries/PeriphDrivers/Source/SYS/pins_me17.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,11 @@ const mxc_gpio_cfg_t gpio_cfg_pt2 = { MXC_GPIO0, MXC_GPIO_PIN_16, MXC_GPIO_FUNC_
136136
const mxc_gpio_cfg_t gpio_cfg_pt3 = { MXC_GPIO0, MXC_GPIO_PIN_17, MXC_GPIO_FUNC_ALT2,
137137
MXC_GPIO_PAD_NONE, MXC_GPIO_VSSEL_VDDIO, MXC_GPIO_DRVSTR_0 };
138138

139-
const mxc_gpio_cfg_t gpio_cfg_owm = { MXC_GPIO0, (MXC_GPIO_PIN_6 | MXC_GPIO_PIN_7), MXC_GPIO_FUNC_ALT1,
140-
MXC_GPIO_PAD_NONE, MXC_GPIO_VSSEL_VDDIO, MXC_GPIO_DRVSTR_0 };
139+
// 1-Wire pins need to be at 3.3V so that MXC_GPIO_VSSEL_VDDIOH is selected.
140+
const mxc_gpio_cfg_t gpio_cfg_owm = { MXC_GPIO0, (MXC_GPIO_PIN_6 | MXC_GPIO_PIN_7), MXC_GPIO_FUNC_ALT2,
141+
MXC_GPIO_PAD_NONE, MXC_GPIO_VSSEL_VDDIOH, MXC_GPIO_DRVSTR_0 };
142+
const mxc_gpio_cfg_t gpio_cfg_owmb = { MXC_GPIO0, (MXC_GPIO_PIN_18 | MXC_GPIO_PIN_19), MXC_GPIO_FUNC_ALT2,
143+
MXC_GPIO_PAD_NONE, MXC_GPIO_VSSEL_VDDIOH, MXC_GPIO_DRVSTR_0 };
141144

142145
const mxc_gpio_cfg_t gpio_cfg_adc_ain0 = { MXC_GPIO2, MXC_GPIO_PIN_0, MXC_GPIO_FUNC_ALT1,
143146
MXC_GPIO_PAD_NONE, MXC_GPIO_VSSEL_VDDIO, MXC_GPIO_DRVSTR_0 };

‎Libraries/PeriphDrivers/Source/SYS/pins_me18.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,11 @@ const mxc_gpio_cfg_t gpio_cfg_pt14 = { MXC_GPIO2, MXC_GPIO_PIN_28, MXC_GPIO_FUNC
234234
const mxc_gpio_cfg_t gpio_cfg_pt15 = { MXC_GPIO2, MXC_GPIO_PIN_12, MXC_GPIO_FUNC_ALT2,
235235
MXC_GPIO_PAD_NONE, MXC_GPIO_VSSEL_VDDIO, MXC_GPIO_DRVSTR_0 };
236236

237+
// 1-Wire pins need to be at 3.3V so that MXC_GPIO_VSSEL_VDDIOH is selected.
237238
const mxc_gpio_cfg_t gpio_cfg_owm = { MXC_GPIO0, (MXC_GPIO_PIN_7 | MXC_GPIO_PIN_8), MXC_GPIO_FUNC_ALT1,
238-
MXC_GPIO_PAD_NONE, MXC_GPIO_VSSEL_VDDIO, MXC_GPIO_DRVSTR_0 };
239+
MXC_GPIO_PAD_NONE, MXC_GPIO_VSSEL_VDDIOH, MXC_GPIO_DRVSTR_0 };
240+
const mxc_gpio_cfg_t gpio_cfg_owmb = { MXC_GPIO1, (MXC_GPIO_PIN_30 | MXC_GPIO_PIN_31), MXC_GPIO_FUNC_ALT1,
241+
MXC_GPIO_PAD_NONE, MXC_GPIO_VSSEL_VDDIOH, MXC_GPIO_DRVSTR_0 };
239242

240243
const mxc_gpio_cfg_t gpio_cfg_adc_ain0 = { MXC_GPIO3, MXC_GPIO_PIN_0, MXC_GPIO_FUNC_ALT1,
241244
MXC_GPIO_PAD_NONE, MXC_GPIO_VSSEL_VDDIO, MXC_GPIO_DRVSTR_0 };

0 commit comments

Comments
 (0)