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

Jump to bottom

Update ststm32 to 8.0 for HAL/STM32 #18496

Merged
merged 10 commits into from
Sep 8, 2020
Merged

Update ststm32 to 8.0 for HAL/STM32 #18496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
be59d59
Update to ststm32 8.0 (for HAL/STM32 only)
sjasonsmith May 9, 2020
a488c42
Remove USB Product strings and other unnecessary defines from platfor…
sjasonsmith Jul 1, 2020
3610b8a
Rename FYSETC variant and fix fan PWM resolution.
sjasonsmith Jun 29, 2020
d3c92e8
Assume CB not RB
thinkyhead May 4, 2020
6786121
Additional Malyan modifications which allow M200 using STM32F070CB to…
sjasonsmith Aug 8, 2020
e501ade
Assign Rumba32 serial timer in PlatformIO
sjasonsmith Aug 10, 2020
46ab37c
Detect conflicts amongst explicitly assigned timers
sjasonsmith Aug 10, 2020
f11a679
Merge branch 'bugfix-2.0.x' into PR/STM32_1.9
sjasonsmith Sep 7, 2020
8a6b538
Fix TFT LCD build (untested)
sjasonsmith Sep 7, 2020
2c32873
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/18496
thinkyhead Sep 8, 2020
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 .github/workflows/test-builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ jobs:
- mks_robin_stm32
- ARMED
- FYSETC_S6
- STM32F070CB_malyan
- STM32F070RB_malyan
- malyan_M300
- mks_robin_lite
Expand Down
2 changes: 1 addition & 1 deletion Marlin/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ ifeq ($(HARDWARE_VARIANT), Teensy)
LIB_CXXSRC += usb_api.cpp

else ifeq ($(HARDWARE_VARIANT), archim)
CDEFS += -DARDUINO_SAM_ARCHIM -DARDUINO_ARCH_SAM -D__SAM3X8E__ -DUSB_VID=0x27b1 -DUSB_PID=0x0001 -DUSBCON '-DUSB_MANUFACTURER="UltiMachine"' '-DUSB_PRODUCT="Archim"'
CDEFS += -DARDUINO_SAM_ARCHIM -DARDUINO_ARCH_SAM -D__SAM3X8E__ -DUSB_VID=0x27b1 -DUSB_PID=0x0001 -DUSBCON '-DUSB_MANUFACTURER="UltiMachine"' '-DUSB_PRODUCT_STRING="Archim"'
LIB_CXXSRC += variant.cpp IPAddress.cpp Reset.cpp RingBuffer.cpp Stream.cpp UARTClass.cpp USARTClass.cpp abi.cpp new.cpp watchdog.cpp CDC.cpp PluggableUSB.cpp USBCore.cpp
LIB_SRC += cortex_handlers.c iar_calls_sam3.c syscalls_sam3.c dtostrf.c itoa.c

Expand Down
Loading