Skip to content
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

fix(CMSIS, PeriphDrivers, Examples): Bug fixes for ME13, ME14 and ME18 found in release testing #759

Merged
merged 4 commits into from
Oct 6, 2023
Merged

fix(CMSIS, PeriphDrivers, Examples): Bug fixes for ME13, ME14 and ME18 found in release testing #759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e74f371
Fix presense detect status position in MAX32570 registers
Jacob-Scheiffler Oct 5, 2023
2e9223d
Fix snprintf bugs in MAX32665 ADC example
Jacob-Scheiffler Oct 6, 2023
27b2877
Fix ME18 USB examples hanging in GPIO0_IRQhandler
Jacob-Scheiffler Oct 6, 2023
50fd5ad
resolvign clang-format/lint errors
Jacob-Scheiffler Oct 6, 2023
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
8 changes: 4 additions & 4 deletions Examples/MAX32665/ADC/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,20 +146,20 @@ int main(void)
overflow[3] = (MXC_ADC_GetData(&adc_val[3]) == E_OVERFLOW ? 1 : 0);

/* Display results on OLED display, display asterisk if overflow */
snprintf((char *)fmtstr, sizeof((char *)fmtstr), "0: 0x%04x%s 2: 0x%04x%s", adc_val[0],
snprintf((char *)fmtstr, sizeof(fmtstr), "0: 0x%04x%s 2: 0x%04x%s", adc_val[0],
overflow[0] ? "*" : " ", adc_val[2], overflow[2] ? "*" : " ");
printf("%s\n", fmtstr);

snprintf((char *)fmtstr, sizeof((char *)fmtstr), "1: 0x%04x%s 3: 0x%04x%s", adc_val[1],
snprintf((char *)fmtstr, sizeof(fmtstr), "1: 0x%04x%s 3: 0x%04x%s", adc_val[1],
overflow[1] ? "*" : " ", adc_val[3], overflow[3] ? "*" : " ");
printf("%s\n", fmtstr);
/* Determine if programmable limits on AIN1 were exceeded */
if (MXC_ADC_GetFlags() & (MXC_F_ADC_INTR_LO_LIMIT_IF | MXC_F_ADC_INTR_HI_LIMIT_IF)) {
snprintf((char *)fmtstr, sizeof((char *)fmtstr), " %s Limit on AIN0 ",
snprintf((char *)fmtstr, sizeof(fmtstr), " %s Limit on AIN0 ",
(MXC_ADC_GetFlags() & MXC_F_ADC_INTR_LO_LIMIT_IF) ? "Low" : "High");
MXC_ADC_ClearFlags(MXC_F_ADC_INTR_LO_LIMIT_IF | MXC_F_ADC_INTR_HI_LIMIT_IF);
} else {
snprintf((char *)fmtstr, sizeof((char *)fmtstr), " ");
snprintf((char *)fmtstr, sizeof(fmtstr), " ");
}
printf("%s\n", fmtstr);

Expand Down
11 changes: 11 additions & 0 deletions Examples/MAX32690/USB_CompositeDevice_MSC_HID/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
#include "msc.h"
#include "descriptors.h"
#include "mscmem.h"
#include "nvic_table.h"

/* **** Definitions **** */
#define EVENT_ENUM_COMP MAXUSB_NUM_EVENTS
Expand Down Expand Up @@ -113,15 +114,25 @@ int Hid_SW_Init(void)
}

/******************************************************************************/
void HID_SW_Handler(void)
{
MXC_GPIO_Handler(MXC_GPIO_GET_IDX(hid_sw[0].port));
}

int Hid_SW_RegisterCallback(unsigned int pb, pb_callback callback)
{
if (pb != 0) {
return E_INVALID;
}

if (callback) {
// Register callback
MXC_GPIO_RegisterCallback(&hid_sw[pb], callback, (void *)pb);

// Configure and enable interrupt
MXC_GPIO_IntConfig(&hid_sw[pb], MXC_GPIO_INT_FALLING);
MXC_GPIO_EnableInt(hid_sw[pb].port, hid_sw[pb].mask);
MXC_NVIC_SetVector(MXC_GPIO_GET_IRQ(MXC_GPIO_GET_IDX(hid_sw[pb].port)), HID_SW_Handler);
NVIC_EnableIRQ(MXC_GPIO_GET_IRQ(MXC_GPIO_GET_IDX(hid_sw[pb].port)));
} else { // Disable interrupt and clear callback
MXC_GPIO_DisableInt(hid_sw[pb].port, hid_sw[pb].mask);
Expand Down
11 changes: 11 additions & 0 deletions Examples/MAX32690/USB_HIDKeyboard/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
#include "enumerate.h"
#include "hid_kbd.h"
#include "descriptors.h"
#include "nvic_table.h"

/***** Definitions *****/
#define EVENT_ENUM_COMP MAXUSB_NUM_EVENTS
Expand Down Expand Up @@ -99,15 +100,25 @@ int Hid_SW_Init(void)
}

/******************************************************************************/
void HID_SW_Handler(void)
{
MXC_GPIO_Handler(MXC_GPIO_GET_IDX(hid_sw[0].port));
}

int Hid_SW_RegisterCallback(unsigned int pb, pb_callback callback)
{
if (pb != 0) {
return E_INVALID;
}

if (callback) {
// Register callback
MXC_GPIO_RegisterCallback(&hid_sw[pb], callback, (void *)pb);

// Configure and enable interrupt
MXC_GPIO_IntConfig(&hid_sw[pb], MXC_GPIO_INT_FALLING);
MXC_GPIO_EnableInt(hid_sw[pb].port, hid_sw[pb].mask);
MXC_NVIC_SetVector(MXC_GPIO_GET_IRQ(MXC_GPIO_GET_IDX(hid_sw[pb].port)), HID_SW_Handler);
NVIC_EnableIRQ(MXC_GPIO_GET_IRQ(MXC_GPIO_GET_IDX(hid_sw[pb].port)));
} else { // Disable interrupt and clear callback
MXC_GPIO_DisableInt(hid_sw[pb].port, hid_sw[pb].mask);
Expand Down
2 changes: 1 addition & 1 deletion Libraries/CMSIS/Device/Maxim/MAX32570/Include/owm_regs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ typedef struct {
#define MXC_F_OWM_CTRL_STAT_OD_SPEC_MODE_POS 4 /**< CTRL_STAT_OD_SPEC_MODE Position */
#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 */

#define MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT_POS 5 /**< CTRL_STAT_PRESENCE_DETECT Position */
#define MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT_POS 7 /**< CTRL_STAT_PRESENCE_DETECT Position */
#define MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT ((uint32_t)(0x1UL << MXC_F_OWM_CTRL_STAT_PRESENCE_DETECT_POS)) /**< CTRL_STAT_PRESENCE_DETECT Mask */

/**@} end of group OWM_CTRL_STAT_Register */
Expand Down
2 changes: 1 addition & 1 deletion Libraries/PeriphDrivers/Source/OWM/owm_reva_me13.svd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
<field>
<name>presence_detect</name>
<description>Presence Pulse Detected.</description>
<bitRange>[5:5]</bitRange>
<bitRange>[7:7]</bitRange>
<access>read-only</access>
</field>
</fields>
Expand Down