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.

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 for duplicated G42 & scara #21248

Merged
merged 5 commits into from
Mar 4, 2021
Merged

Conversation

tpruvot
Copy link
Contributor

@tpruvot tpruvot commented Mar 4, 2021

Fix for the commit 6225870

@tpruvot tpruvot changed the title Fix for duplicated G42 Fix for duplicated G42 & scara Mar 4, 2021
@ghost ghost mentioned this pull request Mar 4, 2021
@thinkyhead
Copy link
Member

Thanks! I was going to go searching SCARA forks and configurations to see what good defaults should be, and where to apply them as config options for the future. There are some other SCARA-oriented fixes that could make it into the codebase eventually, including alternative kinematics, changes to allow a tool to be offset from the center of the arm, and more….

@thinkyhead thinkyhead merged commit a0d3123 into MarlinFirmware:bugfix-2.0.x Mar 4, 2021
@tpruvot tpruvot deleted the g42 branch March 5, 2021 16:45
rmpel added a commit to rmpel/Marlin that referenced this pull request Mar 5, 2021
* bugfix-2.0.x: (135 commits)
  Tweak tests, consolidate pins target validation (MarlinFirmware#21254)
  [cron] Bump distribution date (2021-03-05)
  Fix multi-serial CRC error crash (MarlinFirmware#21249)
  Followup to MP_SCARA/TPARA patches (MarlinFirmware#21248)
  Remove extra G42
  Correct fan pins for MKS Robin Nano v3 (MarlinFirmware#21238)
  SMUFF => SMuFF (MarlinFirmware#21243)
  Implement G42, after all
  MK2_MULTIPLEXER dependency
  Update some py scripts
  Parking Extruder solenoid fix/cleanup
  Fix teensy35 tests
  [cron] Bump distribution date (2021-03-04)
  TPARA followup
  TPARA - 3DOF robot arm IK (MarlinFirmware#21005)
  misc. cleanup
  Improve opt_set (etc.) used for tests
  Fix MKS H43 compile (MarlinFirmware#21240)
  [cron] Bump distribution date (2021-03-03)
  Trust XY after Quiet Probing short sleep (MarlinFirmware#21237)
  ...

# Conflicts:
#	Marlin/Configuration.h
#	Marlin/Configuration_adv.h
rmpel added a commit to rmpel/Marlin that referenced this pull request Mar 6, 2021
* bugfix-2.0.x: (135 commits)
  Tweak tests, consolidate pins target validation (MarlinFirmware#21254)
  [cron] Bump distribution date (2021-03-05)
  Fix multi-serial CRC error crash (MarlinFirmware#21249)
  Followup to MP_SCARA/TPARA patches (MarlinFirmware#21248)
  Remove extra G42
  Correct fan pins for MKS Robin Nano v3 (MarlinFirmware#21238)
  SMUFF => SMuFF (MarlinFirmware#21243)
  Implement G42, after all
  MK2_MULTIPLEXER dependency
  Update some py scripts
  Parking Extruder solenoid fix/cleanup
  Fix teensy35 tests
  [cron] Bump distribution date (2021-03-04)
  TPARA followup
  TPARA - 3DOF robot arm IK (MarlinFirmware#21005)
  misc. cleanup
  Improve opt_set (etc.) used for tests
  Fix MKS H43 compile (MarlinFirmware#21240)
  [cron] Bump distribution date (2021-03-03)
  Trust XY after Quiet Probing short sleep (MarlinFirmware#21237)
  ...

# Conflicts:
#	Marlin/Configuration.h
#	Marlin/Configuration_adv.h
vyacheslav-shubin pushed a commit to vyacheslav-shubin/Marlin that referenced this pull request Mar 10, 2021
vyacheslav-shubin pushed a commit to vyacheslav-shubin/Marlin that referenced this pull request Mar 10, 2021
W4tel-BiDi pushed a commit to W4tel-BiDi/Marlin that referenced this pull request Apr 5, 2021
thinkyhead pushed a commit that referenced this pull request Apr 30, 2021
rmpel added a commit to rmpel/Marlin that referenced this pull request Feb 3, 2022
* bugfix-2.0.x: (135 commits)
  Tweak tests, consolidate pins target validation (MarlinFirmware#21254)
  [cron] Bump distribution date (2021-03-05)
  Fix multi-serial CRC error crash (MarlinFirmware#21249)
  Followup to MP_SCARA/TPARA patches (MarlinFirmware#21248)
  Remove extra G42
  Correct fan pins for MKS Robin Nano v3 (MarlinFirmware#21238)
  SMUFF => SMuFF (MarlinFirmware#21243)
  Implement G42, after all
  MK2_MULTIPLEXER dependency
  Update some py scripts
  Parking Extruder solenoid fix/cleanup
  Fix teensy35 tests
  [cron] Bump distribution date (2021-03-04)
  TPARA followup
  TPARA - 3DOF robot arm IK (MarlinFirmware#21005)
  misc. cleanup
  Improve opt_set (etc.) used for tests
  Fix MKS H43 compile (MarlinFirmware#21240)
  [cron] Bump distribution date (2021-03-03)
  Trust XY after Quiet Probing short sleep (MarlinFirmware#21237)
  ...

# Conflicts:
#	Marlin/Configuration.h
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants