CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,396 Commits 1 Branch 0 Tags 107 MiB
84a11cfedc
Commit Graph

8396 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Lahteine
53f5086905 Fix MAKRPANEL assignments 
MAKRPANEL is a DOGLCD+ULTRA_LCD+NEWPANEL so customize its pins within
that block.
 2017-03-03 21:22:21 -06:00
Scott Lahteine
98c7b682ca General cleanup, const usage, var naming 2017-03-03 20:57:49 -06:00
jes
369bfc8a1e Reduce code size (40b, or 166b with bilinear subdivision) 2017-03-03 20:36:32 -06:00
Scott Lahteine
21fb347eee Merge pull request #5948 from thinkyhead/rc_fix_status_printf 
Fix "Heating..." message
 2017-03-03 12:28:27 -06:00
Scott Lahteine
0d13412105 Fix "Heating..." message 2017-03-03 12:12:51 -06:00
Scott Lahteine
5065636023 Merge pull request #5934 from thinkyhead/rc_advance_ed_ratio 
LIN_ADVANCE: Fixed E/D ratio option
 2017-03-03 03:24:41 -06:00
Scott Lahteine
903808bb97 Merge pull request #5943 from thinkyhead/catalan_march_2017 
Update Catalan language
 2017-03-03 03:13:51 -06:00
divendres
75ad82baab Update Catalan language 2017-03-02 20:40:06 -06:00
Scott Lahteine
34253497d4 Babysteps code tweak 
As suggested by https://github.com/MarlinFirmware/Marlin/pull/5887#issuecomment-283832163
 2017-03-02 20:35:45 -06:00
Scott Lahteine
e309e980ce Merge pull request #5942 from thinkyhead/rc_cleanup_finish_5887 
Clean up and finish #5887
 2017-03-02 20:26:13 -06:00
Scott Lahteine
fb4aead2b1 Clean up and finish #5887 2017-03-02 20:16:29 -06:00
Scott Lahteine
b3e2bd6f29 Reduce E_D_ratio code 2017-03-02 01:00:37 -06:00
Sebastianv650
de6c40ed8f Add option to fix E/D ratio 
Work around for slicers producing buggy gcode.
 2017-03-02 01:00:37 -06:00
Scott Lahteine
eeb490221f Remove BEEPER_PIN override in pins_RIGIDBOARD.h 
Resolves #5926. This override is no longer needed since the RAMPS LCD controller pins were fixed.
 2017-03-01 18:26:29 -06:00
Roxy-3D
11e892bd84 Merge pull request #5887 from Roxy-3D/RCBugFix 
Double Click of Encoder Wheel Jumps to Z-BabyStepping
 2017-03-01 17:15:02 -07:00
Scott Lahteine
cbeff12f8a Merge pull request #5933 from teemuatlut/lcd_days_hours 
Fix formatting of SD print time hours above one day
 2017-03-01 15:44:10 -06:00
Scott Lahteine
8a4e9d08a3 Merge pull request #5931 from thinkyhead/rc_core_endstop_fix 
Fix CoreYX / YZ / ZX endstop logic
 2017-03-01 15:32:11 -06:00
teemuatlut
9175d16660 Fix formatting of print time hours above one day 2017-03-01 18:55:25 +02:00
Scott Lahteine
b6d9eb229f Extend Core endstop commentary 2017-03-01 10:01:50 -06:00
Bob-the-Kuhn
c5e08e8761 CoreYX/YZ/ZX needs different endstop logic than CoreXY/YZ/XZ 
In the endstop testing section, add the "reverse" logic in addition to "normal" core handling.

In CoreXY/YZ/XZ steppers rotating the same direction gives X movement. Opposing directions produces Y movement.

In CoreYX/ZY/ZX this is reversed. Same = Y, Opposite = X.

----

Fixes the issue where the Y endstop was being checked when moving in the X direction, etc.
 2017-03-01 09:40:24 -06:00
Scott Lahteine
05b217c0d0 Merge pull request #5930 from thinkyhead/rc_lcd_timeout_config 
Make LCD_TIMEOUT_TO_STATUS configurable
 2017-02-28 19:42:27 -06:00
Scott Lahteine
c759c26cca Make LCD_TIMEOUT_TO_STATUS configurable 
As suggested in
https://github.com/MarlinFirmware/Marlin/issues/5570#issuecomment-283059
065
 2017-02-28 19:02:50 -06:00
Michael Henke
47729918fc
enable ENSURE_SMOOTH_MOVES 2017-02-27 20:42:49 -08:00
Michael Henke
330b981912 created Configuration.h and Configuration_adv.h for the kossel mini sold by flsun 2017-02-25 21:31:37 -08:00
Scott Lahteine
493e738575 Merge pull request #5910 from thinkyhead/rc_more_nozzle_wipe 
Bidirectional Zig-Zag Nozzle Wipe
 2017-02-25 22:03:33 -06:00
Colin Gilgenbach
48b7e0f8d8 Nozzle Wipe Vertical Zig-Zag 
- Add configuration support for zigzags in either the X or Y axis, for
wipe pads significantly longer in one dimension.
- Add configuration for default number of zig-zag triangles, vs. a
magic number in `Marlin_main.cpp`.
- Update description of auto nozzle wiping to match functionality
 2017-02-25 21:52:43 -06:00
Scott Lahteine
f17b81b765 Add MAPPER_C2C3 to French language 2017-02-25 18:49:00 -06:00
Roxy-3D
7e607b06eb Better comments on DOUBLE_CLICK_TIME_WINDOW 2017-02-23 13:13:57 -07:00
Scott Lahteine
f9e4717f5b Merge pull request #5892 from thinkyhead/rc_msg_heating_pstr 
Use PSTR for MSG_HEATING
 2017-02-22 12:26:08 -06:00
Scott Lahteine
34cba42104 Use PSTR for MSG_HEATING 2017-02-22 11:30:19 -06:00
Roxy-3D
584d147a02 fixup the indentation 2017-02-22 07:23:54 -07:00
Roxy-3D
e443e0e2a9 Fix scoping issues for double click to Z-Babystepping 2017-02-21 18:15:28 -07:00
Roxy-3D
17d1cd7c09 Double Click of Encoder Wheel Jumps to Z-BabyStepping 2017-02-21 18:08:19 -07:00
Roxy-3D
48d862377a Double Click of Encoder Wheel Jumps to Z-BabyStepping 2017-02-21 18:04:31 -07:00
Scott Lahteine
cfdc189796 Merge pull request #5856 from thinkyhead/rc_fix_bad_comment 
Remove non-applicable comment on MANUAL_Z_HOME_POS
 2017-02-20 17:54:30 -06:00
Scott Lahteine
2efdc72aa5 Merge pull request #5876 from thinkyhead/rc_hotend_status 
Add status_printf to print messages to the lcd status line.
 2017-02-20 17:29:27 -06:00
dot-bob
cd68380ce6 Add status_printf to print messages to the lcd status line. 
Also add a hotend indicator to the heating message displayed on the lcd status line.
 2017-02-20 15:26:54 -06:00
Scott Lahteine
012aff6823 Merge pull request #5862 from thinkyhead/rc_fix_a_thing 
Finish reducing of ABL_BILINEAR_SUBDIVISION
 2017-02-18 21:36:28 -06:00
Scott Lahteine
b9187020c4 Finish reducing of ABL_BILINEAR_SUBDIVISION 2017-02-18 20:01:19 -06:00
Scott Lahteine
e282b72151 Remove non-applicable comment on MANUAL_Z_HOME_POS 2017-02-18 05:14:43 -06:00
Scott Lahteine
49d562d23d Merge pull request #5855 from thinkyhead/rc_followup_5840 
Apply DISTINCT_E_FACTORS to sync_from_steppers
 2017-02-18 04:51:01 -06:00
Scott Lahteine
57f92a4632 Apply DISTINCT_E_FACTORS to sync_from_steppers 
Followup to #5840
 2017-02-18 04:36:41 -06:00
Scott Lahteine
4da8b1494b Merge pull request #5854 from thinkyhead/rc_fixup_m600 
M600 cleanup and bugfix
 2017-02-18 04:27:13 -06:00
Scott Lahteine
dd02dba6e6 Merge pull request #5840 from MagoKimbra/rc_fix_lin_advanced_step_to_mm 
Fix steps_to_mm for active extruders
 2017-02-18 04:25:53 -06:00
Scott Lahteine
6e0b3fcc08 Optimize M600 heater status LCD items 2017-02-18 04:08:00 -06:00
Scott Lahteine
44b4e116bd Commentary / style in gcode_M600 2017-02-18 04:08:00 -06:00
Scott Lahteine
561904345f Tweak config ordering for M600 2017-02-18 00:01:31 -06:00
Scott Lahteine
7fdc620ef7 Merge pull request #5850 from thinkyhead/drop_some_comments 
Remove some old code comments
 2017-02-17 16:45:44 -06:00
Scott Lahteine
284d6de9da Remove some old code comments 2017-02-17 15:25:56 -06:00
MagoKimbra
3685224c1a Fix steps_to_mm for active extruders 2017-02-15 21:45:39 +01:00