Skip to content
Merged
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
23021e2
Merge pull request #1 from MarlinFirmware/bugfix-2.0.x
mks-viva Jul 21, 2021
a5cdf57
Merge pull request #2 from MarlinFirmware/bugfix-2.0.x
mks-viva Jul 23, 2021
c632f12
Merge pull request #3 from MarlinFirmware/bugfix-2.0.x
mks-viva Jul 27, 2021
751676e
Merge pull request #4 from MarlinFirmware/bugfix-2.0.x
mks-viva Jul 28, 2021
c5f2515
Merge pull request #5 from MarlinFirmware/bugfix-2.0.x
mks-viva Jul 29, 2021
ccfcc2e
Add support mini12864 v3 for e3p board
mks-viva Jul 29, 2021
54916c2
Update pins_MKS_ROBIN_E3P.h
mks-viva Jul 29, 2021
12a95be
Tweak formatting
thinkyhead Jul 29, 2021
1114e86
Merge pull request #6 from MarlinFirmware/bugfix-2.0.x
mks-viva Jul 29, 2021
45d9815
Add support MKS new board: MKS Monster8 V1.x
mks-viva Jul 29, 2021
e1447d8
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/22455
thinkyhead Jul 31, 2021
71b8828
Update stm32f4.ini
thinkyhead Jul 31, 2021
6c8b634
apply formatter
thinkyhead Jul 31, 2021
a169e63
Merge pull request #7 from MarlinFirmware/bugfix-2.0.x
mks-viva Jul 31, 2021
88c3407
Merge pull request #8 from MarlinFirmware/bugfix-2.0.x
mks-viva Jul 31, 2021
e30f40d
Merge pull request #9 from MarlinFirmware/bugfix-2.0.x
mks-viva Aug 2, 2021
3e16bde
Merge pull request #10 from MarlinFirmware/bugfix-2.0.x
mks-viva Aug 6, 2021
7b7c1f7
Add support MKS PWC function in configuration
mks-viva Aug 6, 2021
1d77003
mks pwc function
mks-viva Aug 6, 2021
3c3f792
Update Configuration.h
mks-viva Aug 6, 2021
0d20548
Update pins_MKS_MONSTER8.h
mks-viva Aug 6, 2021
744b65a
Update pins_MKS_ROBIN_NANO_V3.h
mks-viva Aug 6, 2021
a7c2ef6
Update Configuration.h
mks-viva Aug 6, 2021
86915fc
Enforce MKS_PWC with sanity check
thinkyhead Aug 6, 2021
9b68967
Replace MKS_PWC/MKSPWC with PSU_CONTROL
thinkyhead Aug 6, 2021
f8a2118
cleanup
thinkyhead Aug 7, 2021
a9229d6
Merge pull request #11 from MarlinFirmware/bugfix-2.0.x
mks-viva Aug 9, 2021
08c5f40
Merge pull request #12 from MarlinFirmware/bugfix-2.0.x
mks-viva Aug 10, 2021
cc7ba24
Merge pull request #13 from MarlinFirmware/bugfix-2.0.x
mks-viva Aug 19, 2021
cc88536
Merge pull request #14 from MarlinFirmware/bugfix-2.0.x
mks-viva Sep 1, 2021
879fff5
Merge pull request #15 from MarlinFirmware/bugfix-2.0.x
mks-viva Sep 3, 2021
ff6818f
Merge pull request #16 from MarlinFirmware/bugfix-2.0.x
mks-viva Sep 6, 2021
96a69e5
Merge pull request #17 from MarlinFirmware/bugfix-2.0.x
mks-viva Sep 11, 2021
6441480
Support MKS Robin Nano V1.3 F4(include Nano V1.3 and Nano-S V1.3)
mks-viva Sep 11, 2021
7e25c22
cleanup
thinkyhead Sep 13, 2021
ea295b1
Combine common pins
thinkyhead Sep 13, 2021
8a43bed
Merge pull request #18 from MarlinFirmware/bugfix-2.0.x
mks-viva Sep 15, 2021
e5ac3da
Fix MKS Monster8 use eeprom the board restart issues
mks-viva Sep 15, 2021
2fc2230
Update stm32f4.ini
thinkyhead Sep 15, 2021
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
2 changes: 1 addition & 1 deletion ini/stm32f4.ini
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ board_build.offset = 0xC000
board_upload.offset_address = 0x0800C000
board_build.rename = mks_monster8.bin
build_flags = ${stm32_variant.build_flags} ${stm32f4_I2C1_CAN.build_flags}
-DHAL_PCD_MODULE_ENABLED
-DHAL_PCD_MODULE_ENABLED -DTIMER_SERIAL=TIM4
debug_tool = jlink
upload_protocol = jlink

Expand Down