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

Configuration.h LCD & SDCard section rewrite #3526

Merged
merged 5 commits into from
Apr 17, 2016
Merged

Configuration.h LCD & SDCard section rewrite #3526

merged 5 commits into from
Apr 17, 2016

Conversation

thinkyhead
Copy link
Member

Building on #3496 – apply comment updates to remaining configs.

@thinkyhead thinkyhead merged commit c7353d7 into MarlinFirmware:RCBugFix Apr 17, 2016
@jbrazio
Copy link
Contributor

jbrazio commented Apr 17, 2016

@thinkyhead how do you do this "jbrazio committed with thinkyhead 2 days ago", when I applied your patch with git apply foo.path it lost track from who was the original author despite the info was on the header of the patch.

@thinkyhead
Copy link
Member Author

thinkyhead commented Apr 17, 2016 •
edited
Loading

The commits I gathered from your branch, copied into a new branch that I pushed to my origin, then I added a couple of commits onto that, and made a new PR. The PR itself is from me, but the commits are from us both.

git remote add jbrazio [email protected]:jbrazio/Marlin.git
git fetch jbrazio
git checkout jbrazio/doc/sdcard-panel-rewrite -b rc_lcd_config_comments
. . .

@jbrazio
Copy link
Contributor

jbrazio commented Apr 17, 2016

Got it, should have added your repo as a remote to mine so the info is not lost, we're always learning !

@thinkyhead thinkyhead deleted the rc_lcd_config_comments branch April 17, 2016 03:37
This was referenced May 2, 2016
Merged
Merged
thinkyhead added a commit that referenced this pull request May 3, 2016
@thinkyhead
Merge pull request #3669 from esenapaj/patch-2
4e1a91c 
Fix for PR #3526(Configuration.h LCD & SDCard s...
nomukaiki pushed a commit to nomukaiki/Marlin that referenced this pull request May 3, 2016
Merge branch 'RCBugFix' into configurations/KosselXL
5046fad 
* RCBugFix: (251 commits)
  Fix for PR MarlinFirmware#3526(Configuration.h LCD & SDCard s...
  Additional follow-up the PR MarlinFirmware#3631(Encapsulate S...
  Cleanup, debug strings in Planner::adjusted_position
  Fix BABYSTEPPING, add it to Travis test
  8.3-filenames second try
  Revisited German translation
  Follow-up the PR MarlinFirmware#3631(Encapsulate Stepper, ...
  Some clean-up for example configuration files
  Revert PR 3648 to fix SD printing
  Include more fans in sensitive pins list
  Use #undef in AZTEEG_X3_PRO for RAMPS overrides
  NOOP macro for do-nothing macros
  Updated comment for THERMAL_PROTECTION_BED
  Introduce temp watch protection for the bed
  Updated version header gen script
  Encapsulate dual Z endstop handling
  A little extra gcode_T spacing
  Planner singleton class
  Localize M119 in Endstops class
  Stepper and Endstops as singleton objects
  ...

# Conflicts:
#	Marlin/Configuration.h
#	Marlin/Configuration_adv.h
#	README.md
nomukaiki pushed a commit to nomukaiki/Marlin that referenced this pull request May 4, 2016
Some clean-up for example configuration files
cc9ba21 
Some clean-up for example configuration files

Follow-up and fix the PR MarlinFirmware#3253(Make the Autotune item(s) in the LCD menu optional):
・Update forgotten file(Felix/Configuration_DUAL.h)

Follow-up the PR MarlinFirmware#3526(Configuration.h LCD & SDCard section rewrite):
・Add section of RigidBot Panel to RepRapWorld/Megatronics/Configuration.h

Follow-up the PR MarlinFirmware#3576(Z Safe Homing for all):
・Adjust spacing

Follow-up and fix the PR MarlinFirmware#3625(Print job statistics):
・Update forgotten file(Felix/Configuration_DUAL.h)
・Remove ambiguous character "f" in top of RigidBot/Configuration.h
nomukaiki pushed a commit to nomukaiki/Marlin that referenced this pull request May 4, 2016
Fix for PR MarlinFirmware#3526(Configuration.h LCD & SDCard s...
b27f9cf 
Fix for PR MarlinFirmware#3526(Configuration.h LCD & SDCard section rewrite)

It removes duplicated BQ_LCD_SMART_CONTROLLER.
nomukaiki pushed a commit to nomukaiki/Marlin that referenced this pull request May 4, 2016
Merge branch 'configurations/KosselXL' of https://github.com/nomukaik…
282054a 
…i/Marlin into configurations/KosselXL

* 'configurations/KosselXL' of https://github.com/nomukaiki/Marlin: (254 commits)
  Working version with Endstops
  New settings
  Fix for PR MarlinFirmware#3526(Configuration.h LCD & SDCard s...
  Additional follow-up the PR MarlinFirmware#3631(Encapsulate S...
  Cleanup, debug strings in Planner::adjusted_position
  Fix BABYSTEPPING, add it to Travis test
  8.3-filenames second try
  Revisited German translation
  Follow-up the PR MarlinFirmware#3631(Encapsulate Stepper, ...
  Some clean-up for example configuration files
  Revert PR 3648 to fix SD printing
  Settings with BLTouch
  Include more fans in sensitive pins list
  Use #undef in AZTEEG_X3_PRO for RAMPS overrides
  NOOP macro for do-nothing macros
  Updated comment for THERMAL_PROTECTION_BED
  Introduce temp watch protection for the bed
  Updated version header gen script
  Encapsulate dual Z endstop handling
  A little extra gcode_T spacing
  ...
@jbrazio jbrazio modified the milestone: 1.1.0 Jul 18, 2016
CONSULitAS pushed a commit to CONSULitAS/Marlin-K8200 that referenced this pull request Aug 18, 2016
Some clean-up for example configuration files
9672bde 
Some clean-up for example configuration files

Follow-up and fix the PR MarlinFirmware#3253(Make the Autotune item(s) in the LCD menu optional):
・Update forgotten file(Felix/Configuration_DUAL.h)

Follow-up the PR MarlinFirmware#3526(Configuration.h LCD & SDCard section rewrite):
・Add section of RigidBot Panel to RepRapWorld/Megatronics/Configuration.h

Follow-up the PR MarlinFirmware#3576(Z Safe Homing for all):
・Adjust spacing

Follow-up and fix the PR MarlinFirmware#3625(Print job statistics):
・Update forgotten file(Felix/Configuration_DUAL.h)
・Remove ambiguous character "f" in top of RigidBot/Configuration.h
CONSULitAS pushed a commit to CONSULitAS/Marlin-K8200 that referenced this pull request Aug 18, 2016
Fix for PR MarlinFirmware#3526(Configuration.h LCD & SDCard s...
9a04a1c 
Fix for PR MarlinFirmware#3526(Configuration.h LCD & SDCard section rewrite)

It removes duplicated BQ_LCD_SMART_CONTROLLER.
nomukaiki pushed a commit to nomukaiki/Marlin that referenced this pull request Apr 2, 2017
Merge branch 'configurations/KosselXL' into RCBugFix
125bca5 
* configurations/KosselXL: (265 commits)
  New PID and Z pos
  Latest settings for nozzle V6
  Delta segments per second
  Decreased delta segments
  Working version with Endstops
  New settings
  Fix for PR MarlinFirmware#3526(Configuration.h LCD & SDCard s...
  Additional follow-up the PR MarlinFirmware#3631(Encapsulate S...
  Cleanup, debug strings in Planner::adjusted_position
  Fix BABYSTEPPING, add it to Travis test
  8.3-filenames second try
  Revisited German translation
  Follow-up the PR MarlinFirmware#3631(Encapsulate Stepper, ...
  Some clean-up for example configuration files
  Revert PR 3648 to fix SD printing
  Settings with BLTouch
  Include more fans in sensitive pins list
  Use #undef in AZTEEG_X3_PRO for RAMPS overrides
  NOOP macro for do-nothing macros
  Updated comment for THERMAL_PROTECTION_BED
  ...

# Conflicts:
#	Marlin/Configuration.h
#	Marlin/Configuration_adv.h
#	Marlin/pins_RAMPS.h
#	Marlin/ultralcd.h
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
C: Documentation PR: Configurations PR: General Cleanup
Projects
None yet
Milestone
1.1.0
Development

Successfully merging this pull request may close these issues.
2 participants
@thinkyhead @jbrazio