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(MAXUSB): Updated makefiles for USB examples #1319

Merged
merged 4 commits into from
Jan 9, 2025
Merged

fix(MAXUSB): Updated makefiles for USB examples #1319

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e48da27
updated makefile to use correct depth when maxim path not set
Eric-Busch0 Jan 9, 2025
3158d07
format
Eric-Busch0 Jan 9, 2025
7b624de
updated all makefiles with USB
Eric-Busch0 Jan 9, 2025
9344c88
update gitignore
Eric-Busch0 Jan 9, 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
1 change: 1 addition & 0 deletions Examples/MAX32690/USB/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build
2 changes: 1 addition & 1 deletion Examples/MAX32690/USB/MAXUSB/USB_CDCACM/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ $(info Loaded project.mk)

ifeq "$(MAXIM_PATH)" ""
# MAXIM_PATH is still not defined...
DEPTH := ../../../../
DEPTH := ../../../../..
MAXIM_PATH := $(abspath $(DEPTH))
$(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.)
$(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path)
Expand Down
2 changes: 1 addition & 1 deletion Examples/MAX32690/USB/MAXUSB/USB_CompositeDevice_MSC_CDC/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ $(info Loaded project.mk)

ifeq "$(MAXIM_PATH)" ""
# MAXIM_PATH is still not defined...
DEPTH := ../../../../
DEPTH := ../../../../..
MAXIM_PATH := $(abspath $(DEPTH))
$(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.)
$(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path)
Expand Down
2 changes: 1 addition & 1 deletion Examples/MAX32690/USB/MAXUSB/USB_CompositeDevice_MSC_HID/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ $(info Loaded project.mk)

ifeq "$(MAXIM_PATH)" ""
# MAXIM_PATH is still not defined...
DEPTH := ../../../../
DEPTH := ../../../../..
MAXIM_PATH := $(abspath $(DEPTH))
$(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.)
$(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path)
Expand Down
2 changes: 1 addition & 1 deletion Examples/MAX32690/USB/MAXUSB/USB_HIDKeyboard/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ $(info Loaded project.mk)

ifeq "$(MAXIM_PATH)" ""
# MAXIM_PATH is still not defined...
DEPTH := ../../../../
DEPTH := ../../../../..
MAXIM_PATH := $(abspath $(DEPTH))
$(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.)
$(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path)
Expand Down
2 changes: 1 addition & 1 deletion Examples/MAX32690/USB/MAXUSB/USB_MassStorage/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ $(info Loaded project.mk)

ifeq "$(MAXIM_PATH)" ""
# MAXIM_PATH is still not defined...
DEPTH := ../../../../
DEPTH := ../../../../..
MAXIM_PATH := $(abspath $(DEPTH))
$(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.)
$(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path)
Expand Down
2 changes: 1 addition & 1 deletion Examples/MAX32690/USB/TinyUSB/cdc_msc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ $(info Loaded project.mk)

ifeq "$(MAXIM_PATH)" ""
# MAXIM_PATH is still not defined...
DEPTH := ../../../../
DEPTH := ../../../../..
MAXIM_PATH := $(abspath $(DEPTH))
$(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.)
$(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path)
Expand Down
2 changes: 1 addition & 1 deletion Examples/MAX32690/USB/TinyUSB/cdc_msc_freertos/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ $(info Loaded project.mk)

ifeq "$(MAXIM_PATH)" ""
# MAXIM_PATH is still not defined...
DEPTH := ../../../../
DEPTH := ../../../../..
MAXIM_PATH := $(abspath $(DEPTH))
$(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.)
$(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path)
Expand Down
2 changes: 1 addition & 1 deletion Examples/MAX32690/USB/TinyUSB/hid_composite/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ $(info Loaded project.mk)

ifeq "$(MAXIM_PATH)" ""
# MAXIM_PATH is still not defined...
DEPTH := ../../../../
DEPTH := ../../../../..
MAXIM_PATH := $(abspath $(DEPTH))
$(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.)
$(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path)
Expand Down
2 changes: 1 addition & 1 deletion Examples/MAX32690/USB/TinyUSB/msc_dual_lun/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ $(info Loaded project.mk)

ifeq "$(MAXIM_PATH)" ""
# MAXIM_PATH is still not defined...
DEPTH := ../../../../
DEPTH := ../../../../..
MAXIM_PATH := $(abspath $(DEPTH))
$(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.)
$(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path)
Expand Down
2 changes: 1 addition & 1 deletion Examples/MAX32690/USB/TinyUSB/msc_ext_flash/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ $(info Loaded project.mk)

ifeq "$(MAXIM_PATH)" ""
# MAXIM_PATH is still not defined...
DEPTH := ../../../../
DEPTH := ../../../../..
MAXIM_PATH := $(abspath $(DEPTH))
$(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.)
$(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path)
Expand Down
3 changes: 0 additions & 3 deletions Examples/MAX32690/USB/TinyUSB/msc_ext_flash/msc_ext_flash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,6 @@ int32_t tud_msc_scsi_cb(uint8_t lun, uint8_t const scsi_cmd[16], void *buffer, u

void spixf_disk_init()
{
uint32_t id;
if (!is_initialized) {
Ext_Flash_Init();
Ext_Flash_Reset();
Expand All @@ -231,8 +230,6 @@ void spixf_disk_init()
Ext_Flash_Quad(0);
}

id = Ext_Flash_ID();

is_initialized = true;
}
}
Expand Down
Loading