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

Full Feature support for Stock build Anycubic Chiron #19505

Merged
merged 29 commits into from
Sep 28, 2020
Merged

Full Feature support for Stock build Anycubic Chiron #19505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
4546f2d
Beta 10
SwiftNick Sep 21, 2020
0e01938
First release candidate
SwiftNick Sep 21, 2020
9a6992b
Update chiron_tft.cpp
SwiftNick Sep 22, 2020
b6f0284
Tidying up
SwiftNick Sep 22, 2020
768b085
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
SwiftNick Sep 24, 2020
af46c86
Cleanup serial port defs that break build
SwiftNick Sep 24, 2020
65e7891
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/19505
thinkyhead Sep 25, 2020
c4a023b
Revert user configs
thinkyhead Sep 25, 2020
08a04af
revert better
thinkyhead Sep 25, 2020
99eff03
Fix a dgus flag
thinkyhead Sep 25, 2020
5d36024
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/19505
thinkyhead Sep 25, 2020
9673cf4
Tweak NUM_DIGITAL_PINS
thinkyhead Sep 25, 2020
b311906
Fix regressions and whitespace
thinkyhead Sep 25, 2020
7a4403b
Refactored to use MarlinSerial
SwiftNick Sep 25, 2020
1990c81
Headings, cleanup
thinkyhead Sep 25, 2020
227488e
Fix serial usage, use num2str, etc.
thinkyhead Sep 25, 2020
823364a
Fix wrapper, pragma
thinkyhead Sep 25, 2020
e4e8e7f
NULL => nullptr
thinkyhead Sep 25, 2020
b92f48d
remove extui help
thinkyhead Sep 25, 2020
43635b0
ibid.
thinkyhead Sep 25, 2020
c11cfc7
Surely I3MEGA needs LCD_SERIAL_PORT
thinkyhead Sep 25, 2020
445667b
Add POWER_LOSS_RECOVER_ZHOME
thinkyhead Sep 25, 2020
836c8f8
Use shorthand
thinkyhead Sep 26, 2020
d7ba62d
fixed build issues
SwiftNick Sep 26, 2020
33d4c2d
debug cleanuo and power loss z home fixes
SwiftNick Sep 26, 2020
b5d513f
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/19505
thinkyhead Sep 28, 2020
1179df2
Clean up vim droppings
thinkyhead Sep 28, 2020
454f810
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/19505
thinkyhead Sep 28, 2020
b6401ae
Minor adjustment
thinkyhead Sep 28, 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 Marlin/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1166,6 +1166,7 @@
#if ENABLED(POWER_LOSS_RECOVERY)
#define PLR_ENABLED_DEFAULT false // Power Loss Recovery enabled by default. (Set with 'M413 Sn' & M500)
//#define BACKUP_POWER_SUPPLY // Backup power / UPS to move the steppers on power loss
//#define POWER_LOSS_RECOVER_ZHOME // Z homing is needed for proper recovery. 99.9% of the time this should be disabled!
//#define POWER_LOSS_ZRAISE 2 // (mm) Z axis raise on resume (on power loss with UPS)
//#define POWER_LOSS_PIN 44 // Pin to detect power loss. Set to -1 to disable default pin on boards without module.
//#define POWER_LOSS_STATE HIGH // State of pin indicating power loss
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/AVR/pinsDebug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#define NUMBER_PINS_TOTAL NUM_DIGITAL_PINS

#if MB(BQ_ZUM_MEGA_3D, MIGHTYBOARD_REVE, MINIRAMBO, SCOOVO_X9H)
#if MB(BQ_ZUM_MEGA_3D, MIGHTYBOARD_REVE, MINIRAMBO, SCOOVO_X9H, TRIGORILLA_14)
#define AVR_ATmega2560_FAMILY_PLUS_70 1
#endif

Expand Down
9 changes: 3 additions & 6 deletions Marlin/src/HAL/AVR/pinsDebug_plus_70.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,12 @@
* Structures for 2560 family boards that use more than 70 pins
*/

#undef NUM_DIGITAL_PINS
#if MB(BQ_ZUM_MEGA_3D)
#if MB(BQ_ZUM_MEGA_3D, MINIRAMBO, SCOOVO_X9H, TRIGORILLA_14)
#undef NUM_DIGITAL_PINS
#define NUM_DIGITAL_PINS 85
#elif MB(MIGHTYBOARD_REVE)
#undef NUM_DIGITAL_PINS
#define NUM_DIGITAL_PINS 80
#elif MB(MINIRAMBO)
#define NUM_DIGITAL_PINS 85
#elif MB(SCOOVO_X9H)
#define NUM_DIGITAL_PINS 85
#endif

#define PA 1
Expand Down
12 changes: 10 additions & 2 deletions Marlin/src/feature/powerloss.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,14 +367,22 @@ void PrintJobRecovery::resume() {

gcode.process_subcommands_now_P(PSTR(
"G28R0" // No raise during G28
TERN_(IS_CARTESIAN, "XY") // Don't home Z on Cartesian
#if IS_CARTESIAN && DISABLED(POWER_LOSS_RECOVER_ZHOME)
"XY" // Don't home Z on Cartesian unless overridden
#endif
));

#endif

// Pretend that all axes are homed
set_all_homed();

#if ENABLED(POWER_LOSS_RECOVER_ZHOME)
// Z has been homed so restore Z to ZsavedPos + POWER_LOSS_ZRAISE
sprintf_P(cmd, PSTR("G1 F500 Z%s"), dtostrf(info.current_position.z + POWER_LOSS_ZRAISE, 1, 3, str_1));
gcode.process_subcommands_now(cmd);
#endif

// Recover volumetric extrusion state
#if DISABLED(NO_VOLUMETRICS)
#if HAS_MULTI_EXTRUDER
Expand Down Expand Up @@ -481,7 +489,7 @@ void PrintJobRecovery::resume() {

// Move back to the saved Z
dtostrf(info.current_position.z, 1, 3, str_1);
#if Z_HOME_DIR > 0
#if Z_HOME_DIR > 0 || ENABLED(POWER_LOSS_RECOVER_ZHOME)
sprintf_P(cmd, PSTR("G1 Z%s F200"), str_1);
#else
gcode.process_subcommands_now_P(PSTR("G1 Z0 F200"));
Expand Down
Loading