82d2f11129
More additional sanity checks for Z_PROBE_AND_ENDSTOP
10 years ago
05134f0807
Additional Sanity Checks for Z_PROBE_AND_ENDSTOP
10 years ago
c75a5e8c55
Fixed typo for Z_PROBE_AND_ENDSTOP support in pins_RAMPS.h.
...
Confirmed Sanity checks are working.....
10 years ago
a98ac4033b
Added Z_PROBE_PIN to #define for Z_PROBE_AND_ENDSTOP support.
10 years ago
6125124d6c
Config file cleanup for Z_PROBE_AND_ENDSTOP support.
10 years ago
324c14943b
Bug fixes for Z_PROBE_AND_ENDSTOP.
...
Code cleanup for Z_PROBE_AND_ENDSTOP.
Added Z_PROBE_PIN to pins_RAMPS_13.h
10 years ago
ca5821aa57
Made #ifdef DELTA branch instead
...
Another fellow here gave me the idea to do it this way
10 years ago
04fda6b3e9
Undesired behavior with endstops swapped
...
Made my swap commented out so its the option not the default.
10 years ago
ca1477d830
Revert "Undesired behavior with endstops swapped"
...
This reverts commit 15028e9b08
10 years ago
15028e9b08
Undesired behavior with endstops swapped
...
I made my changes to swap MIN and MAX endstops on the Azteeg X3 Pro the
option rather than the default to fix unexpected reversal.
10 years ago
18245c6cd2
Update pins_RAMBO.h
...
Updated for the changes that Thinkyhead made before I submitted mine.
10 years ago
234a9d0b12
Viki 2 Pins from Manual
...
I added in the pins into the new board files for the Azteeg X3, X3 Pro,
Printrboard, and Rambo. I'm sure it can be added for others too but
these are the manual specified pins. Just like many things here though,
I can't test for the boards other than the Azteeg X3 Pro. Hopefully it
works smoothly for everyone who happens on this nifty display. :)
10 years ago
a22efc5f11
Merge pull request #1597 from Wurstnase/g29_auto_script
...
G29 auto script
10 years ago
62a3da9618
Merge pull request #1723 from thinkyhead/tweak_g92
...
Tweak G92
10 years ago
afff968e88
ARRAY_BY_EXTRUDERS, shorthand to sync planner
...
- Add some documentation to planner and stepper headers
- Patch up RAMBO pins with undefs
- Add `sync_plan_position` inline to set current XYZE
- Swap indices in `extruder_offset` to fix initialization values
10 years ago
2b0c25a091
Tweak G92 to call plan_set_position only once, yes?
10 years ago
22bea37393
Azteeg X3 Pro Pin Revisions
...
I added the fan pins in here and left them at -1 in configuration_adv.h
and it works fine. Pinned for a 4 extruder from 1-4 and HE5 being the
controller fan, HE6 being the Extruder Auto Fan/Water pump in the Kraken
case, and HE7 being for part cooling fan. Added in descriptions for the
MIN MAX pin swap and for servo motor additions.
10 years ago
93dc0d0518
Merge pull request #1718 from AnHardt/blink
...
Move variable blink from ultralcd.h to dogm_lcd_implementation.h
10 years ago
edb67ea165
Patch generic delta config
...
- Addressing issue mentioned at #1699
10 years ago
c481c3b180
Move variable blink from ultralcd.h to dogm_lcd_implementation.h
...
to avoid warnings about unused blink.
Concentrate definitions of variables in dogm_lcd_implementation.h to one place.
Make only local used variable currentfont static.
10 years ago
059052889f
Further Sanity Checks for Z_PROBE_AND_ENDSTOP.
10 years ago
8b81f20c61
Filling in more places where Z_PROBE_PIN and Z_PROBE_AND_ENDSTOP need to
...
be.
Added Sanity Check for it.
Added hook so it's enabled.
10 years ago
fd823449ad
Added serial message for Z Probe trigger.
10 years ago
92eb8109ab
Fix declaration of old_z_probe_endstop.
10 years ago
44b88b41a2
Added credit for code.
10 years ago
2979b40a7a
Fixed typo in Z Probe and Endstop section.
10 years ago
9f3ff14008
Enabled separate Z Probe and Z Axis endstop use at same time.
...
Typo fixes in comments in existing code.
10 years ago
b14be7235e
Merge pull request #1585 from galexander1/strtod_e_fix
...
Fix `code_value` (so `G1X1E2` isn't evaluated as `G1 X100 E2`)
10 years ago
ba871e46bf
Fix compiler warnings
...
- Patched up for most included configurations
10 years ago
ffe0df4b36
Latest upstream commits
10 years ago
bc2f249cc6
Merge pull request #1622 from AnHardt/tm-utf-minus-kanji
...
The big Language Pack
10 years ago
abfcbd793f
Merge pull request #1693 from chris-bo/rework_lcd_beeper
...
use only one implementation for beeper feedback
10 years ago
55739a4efe
Fix Z_APPLY_STEP
10 years ago
df02b992b0
Fix redundant_temperatrure_raw setting
10 years ago
fe29bdd72b
Also fix temperature externs
10 years ago
578f93bc26
Fixup temp arrays and leveling equation, prepare for merge
10 years ago
7d472367e2
Merge pull request #1713 from epatel/Development
...
Parentheses need here otherwise sanitycheck.h does wrong thing on line 222
10 years ago
ce485175eb
Give all temp arrays 4 indices
10 years ago
782464ea4d
Parentheses need here otherwise sanitycheck.h does wrong thing on line 222
10 years ago
460f73056b
Fix ECHOPAIR ambiguity
...
- Also patch up some warnings
10 years ago
19d418cd6a
Fix up the code to eliminate warnings
10 years ago
b2496533c6
Put " M" into pmem
10 years ago
267d6bef15
Eliminate most warnings
...
- Fix a bug reading `code_value` for `M503 Sn`
- Hide and remove unused variables
10 years ago
3fd7790a15
Merge branch 'Development' into fixup_leveling
...
Latest upstream commits
10 years ago
b76a352d41
Fix the planeNormal calculation
10 years ago
410f64782a
Always 4 temp sensors
10 years ago
0b32431551
Remove abs() from planeNormal.z
10 years ago
53169d96e8
Set temp_meas_ready in set_current_temp_raw
10 years ago
06eb7f5b3c
Latest upstream commits
10 years ago
04328d7537
Add zprobe_zoffset in set_bed_level_equation_*
...
- Also a small tweak to SanityCheck.h
10 years ago
d2e73545ba
Merge pull request #1705 from AnHardt/ddt
...
Avoid warnings in SanitiCheck.h
10 years ago
78090275a9
Fix probe range editing
...
- Increase the probe offset range to -20…20
- Apply the range limits to the menu item
10 years ago
1ff6df8f9e
Avoid warnings in SanitiCheck.h
...
/SanityCheck.h:107:53: warning: missing terminating ' character
...
10 years ago
ebe5b87c2c
< like in the oher compareble loops
...
to avoid:
Marlin_main.cpp:1790: warning: array subscript is above array bounds.
10 years ago
20f909567a
Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
...
Conflicts:
README.md
Solved
10 years ago
eab5fad539
code formatting
10 years ago
abadeac08d
Group zprobe_zoffset with bed leveling
10 years ago
9e8427f253
Merge pull request #1698 from zeuseye/Development
...
Clean "fromsd" array if not SDSUPPORT
10 years ago
32331faee4
Prettify Bed Level Correction Matrix
...
- Put + in front of positive values in the output
10 years ago
f5f4c2b366
Merge branch 'Development' into fixup_leveling
...
Latest upstream commits
10 years ago
7667023817
Merge pull request #1694 from Wurstnase/fix_z_config
...
comment #define Z_DUAL_STEPPER_DRIVERS
10 years ago
5eff15c409
Merge branch 'Development' into fixup_leveling
...
Latest upstream commits
10 years ago
ad05a726c1
Merge pull request #1691 from AnHardt/PID_dt
...
Move definition of PIDdT back to temperature.h
10 years ago
5261d35737
Fix custom m-code behavior
...
Don’t set CUSTOM_M_CODE_SET_Z_PROBE_OFFSET if there’s no Z probe
10 years ago
fbf9b21e0c
Merge plus fixup zprobe_zoffset
...
- Make `zprobe_zoffset` conditional
- Fix ConfigurationStore for `zprobe_zoffset`
10 years ago
96b5da7198
Fix up bed leveling code
...
- Init `zprobe_zoffset`
- Remove `current_position[Z_AXIS] = zprobe_zoffset` lines from the
`set_bed_level_equation_*` functions
- Apply standards to `mesh_bed_leveling` files
- Document `MESH_BED_LEVELING`
10 years ago
02b4f5f9cd
Merge pull request #1689 from AnHardt/MAXand161
...
Fix MAX6675 again and introduce set_current_temp_raw()
10 years ago
f680e509c4
Enclosed error-messages for TEMP_SENSOR_1_AS_REDUNDANT in PSTR()
10 years ago
d43d47da14
Clean "fromsd" array is not SDSUPPORT
...
if not have SDSUPPORT the fromsd array is not necessary
10 years ago
ac81b4084f
Make variables and function static.
10 years ago
55025558dc
Implement Dry-Run mode in G29
...
It just probe all the bed without appliying the matrix.
Useful after a first G29 to check the topology.
10 years ago
a4ad9117dd
comment #define Z_DUAL_STEPPER_DRIVERS
10 years ago
2dfd0e5ce7
Update Configuration.h
...
documentation how to disable buzzer feedback
10 years ago
4c3cbc0961
use only one implementation for beeper feedback
10 years ago
01cc97a3c3
Corected condition for PIDdT
10 years ago
94330705c7
Move definition of PIDdT back to temperature.h
...
make it unconditional
remove all definitions in the 'Configuration.h's
remove form 'Conditionals.h'
10 years ago
dd0067afa6
Fix MAX6675 again and introduce set_current_temp_raw()
...
to make the temperature-code work again with Arduino 1.0.6.
Sorry could not make an extra block on base level.
10 years ago
8848b7e9ef
Add the missed {} to END_MENU in ultralcd.cpp
...
what caused an extra update of encoderLine most of the time.
10 years ago
4beffbca69
Make SMALL_INFOFONT configurable.
...
Tweak the documentation
10 years ago
045ea42cc8
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
c2ba5d0c09
Fix ZigZag and Topograph table
...
ZigZag: Inverted Behavior.. If T supplied, it does not zigzag.
Topograph table: The table was rotated 90º clockwise.
10 years ago
0ce3576685
New Feature: Z_DUAL_ENDSTOPS
...
Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z
steppers - Let's call them Z stepper and Z2 stepper.
That way the machine is capable to align the bed during home, since both
Z steppers are homed.
There is also an implementation of M666 (software endstops adjustment)
to this feature.
After Z homing, this adjustment is applied to just one of the steppers
in order to align the bed.
One just need to home the Z axis and measure the distance difference
between both Z axis and apply the math: Z adjust = Z - Z2.
If the Z stepper axis is closer to the bed, the measure Z > Z2 (yes, it
is.. think about it) and the Z adjust would be positive.
Play a little bit with small adjustments (0.5mm) and check the
behaviour.
The M119 (endstops report) will start reporting the Z2 Endstop as well.
10 years ago
c686069ccd
Revert "Remove 6x9 font"
...
This reverts commit e6cb8ee188
10 years ago
b00a531df8
Revert "Removed now unneded FONT_STATUSMENU"
...
This reverts commit 8c5bb38748
10 years ago
9d589cbb2a
Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji
...
Conflicts:
Marlin/example_configurations/delta/generic/Configuration.h
Marlin/example_configurations/delta/kossel_mini/Configuration.h
Marlin/language.h
Conflicts solved
10 years ago
8db4fd7177
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
10 years ago
0d81abe1c9
Merge branch 'Development' into config_testing
...
Latest upstream commits
10 years ago
01740fd9c6
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
10 years ago
fc53e43de6
Don't test raw temp for MAX6675
...
- Remove test of raw temp for thermistor 0 when using MAX6675
- Longer `raw_temp_value` array for `TEMP_SENSOR_1_AS_REDUNDANT`
10 years ago
03fa9fae9f
Merge branch 'Development' into fix_temperature_minmax
...
Latest upstream commits
10 years ago
1fac388664
Revert measurement loop
10 years ago
703f3b38c4
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
37cde8a191
Report changes from previous PR from old code base including :
...
I've updated the minimum values from the LCD.
It has been a while that i want to at least fix this.
I have an inductive probe and often i need to set my zOffset to something lower than 0.5.
With the current implementation, the default LCD value is set to 0.5 for some reason.
On my case i need to be able to set it down to 0.0 as my inductive probe can be lower than 0.5.
Before with the LCD we couldn't change this value below 0.5. We had to flash the firmware every time which was painful.
Now we are able to change this value down to 0.0 if needed.
I've also changed the minimum value for Z min acceleration.
In the default configuration it's set to 25 but on the LCD the minimum was 100 which is not coherent.
I've changes the minimum to 10. On this axis, depending on the mechanics/motor drivers we might require very low acceleration, so i guess 10 is somehow realistic.
10 years ago
b26a3ea02c
Merge pull request #1662 from josla972/refactor_scara
...
Refactor SCARA calibration. Save some lines of code and possibly ROM.
10 years ago
e6f6c6e3a1
fix bad insertion config again
10 years ago
6bdee87be3
Cleanup temperature code
...
- Get rid of unused temp states in the ISR, resulting in more frequent
temperature reading with fewer sensors
- Shrink code slightly in min/max testing
10 years ago
34a41648ab
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
10 years ago
4fbb80567e
Get upstream commits
10 years ago
7717e1ce33
Fix bad insert in configuration
10 years ago
146501215f
Fix mangled probe_pt calls
...
- Address issue #1669
- Remove the TOPO_ORIGIN configuration setting
10 years ago
15345cc249
Corrected Z_PROBE_ALLEN_KEY behaviour.
10 years ago
0f034dd97e
Clean up Z_RAISE_AFTER_PROBING to work the same in all code paths except Z_PROBE_SLED.
10 years ago
6c96f32069
Blind fix for #1507
10 years ago
379348487e
Removed malplaced comment.
10 years ago
8bd6e37b21
Merge pull request #1661 from thinkyhead/G92_no_offset
...
Don't add home offsets in G29
10 years ago
582cd780cd
Fix compile error with `*_DUAL_STEPPER_DRIVERS`
...
- Patch up macros in stepper.cpp
10 years ago
9b3462f73f
Refactor SCARA calibration. Save some lines of code and possibly ROM.
10 years ago
691e753cc3
Don't add home offsets in G29
...
- Address #1262 by leaving values as set
- Rename `add_homing` to `home_offset`
10 years ago
88e81a4804
Latest upstream commits, plus fixes
...
- Also add Manual Bed Leveling to the rest of the configs
10 years ago
15eb5d35a2
Merge branch 'Development' into config_testing
...
Latest upstream commits
10 years ago
19df90622b
Include Conditionals.h file in update
10 years ago
9b639b4135
Merge pull request #1619 from epatel/manual-bed-leveling+mesh-bed-level
...
Manual bed leveling + mesh bed leveling
10 years ago
2c9bd15625
Move LCD items to `Conditionals.h`
...
- `Conditionals.h` is included twice, setting LCD values the first time
10 years ago
63abeaff38
Merge branch 'Development' into config_testing
...
Latest upstream commits
10 years ago
3703694e30
Fix temperature min/max test
...
- Base tests on all thermistors/thermocouples, not just heater 0
10 years ago
3d0a060a7a
Added G29 command
10 years ago
c516747847
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
10 years ago
af14c684b5
Minor optimizations to planner code
...
- Prefetch values used more than once
10 years ago
13fbf42d95
Cleanup of planner code
...
- Use named axis indexes, `X_AXIS` etc.
- Replace `block.steps_A` with block.steps[A]`
- Replace `A_segment_time` with `segment_time[A]`
- Add `A_AXIS`, `B_AXIS` for `COREXY` axes
- Conditional compile based on `EXTRUDERS`
- Add BLOCK_MOD macro for planner block indexes
- Apply coding standards to `planner.h` and `planner.cpp`
- Small optimizations of planner code
- Update `stepper.cpp` for new `block` struct
- Replace `memcpy` with loops, let the compiler unroll them
- Make `movesplanned` into an inline function
10 years ago
64e3d33893
Fix shrinked menucode
...
by updating 'encoderPosition' in END_MENU() line 1.
10 years ago
a7e89d4cfa
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
10 years ago
8c5bb38748
Removed now unneded FONT_STATUSMENU
10 years ago
2176a22d42
Fix count_direction initializer
...
- Addressing #1625
10 years ago
e72cb3e45d
Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji
...
Conflicts:
Marlin/dogm_lcd_implementation.h
Marlin/ultralcd_implementation_hitachi_HD44780.h
Fix merge conflicts 2
10 years ago
cb6942d4a7
Merge branch 'Development' into config_testing
...
Get upstream commits
10 years ago
6bfccaf99e
Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji
...
Conflicts:
Marlin/dogm_lcd_implementation.h
Marlin/ultralcd_implementation_hitachi_HD44780.h
Fixed conflicts 1
10 years ago
5644ad6809
Fix hiliting of edit items
10 years ago
63d5d28085
Merge branch 'Development' into config_testing
...
Latest upstream changes
10 years ago
526a755a66
Merge pull request #1652 from AnHardt/PIDdebug
...
PID debug
10 years ago
a1c240b0a4
Delta supports some auto bed leveling options
10 years ago
5112cf8422
Added comment for the EEPROM storage
10 years ago
4619d80524
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
10 years ago
199151a4ed
Merge pull request #1650 from AnHardt/beautify
...
Beautivy statusscreen
10 years ago
2424713a8f
Merge pull request #1640 from AnHardt/warning6
...
codepos not used in gcode_M28()
10 years ago
b6d381f863
Divide up Conditionals to get LCD items early
10 years ago
e85061d20d
Added changes to the 'new' Configuration.h s
10 years ago
33c7c6e11d
Conditionals.h requires Arduino.h
10 years ago
8ade04b78e
Felix and Hephestos configs
...
- Not sure why these are showing as all new
10 years ago
670006b919
Remove invariant code from Configurations
...
- Add `Conditionals.h` with calculated configuration values
- Add `SanityCheck.h` with checks for configuration errors
- Remove equivalent code from all configurations
- Move error checks from some sources to `SanityCheck.h` also
- Fix initialization of count_direction in stepper.cpp
10 years ago
a61f679568
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
10 years ago
c87faa69ed
Shortened mesh_plan_buffer_line()
10 years ago
47c1ea72af
Merge https://github.com/kieranc/Marlin into PIDdebug
...
Conflicts:
Marlin/temperature.cpp
Cleaned merge conflict.
Codeposition had changed.
Variable pid_input had vanished.
Signed-off-by: AnHardt <github@kitelab.de>
10 years ago
f1d3d1524d
Merge branch 'optimize_menu_code' of https://github.com/thinkyhead/Marlin into beautify
...
Conflicts:
Marlin/dogm_lcd_implementation.h
solved merge conflict.
10 years ago
fa889cd6e1
Beautivy statusscreen
...
by shifting things some pixels around
10 years ago
7279e4f82f
Small code tweaks re lcd.print
10 years ago
90ba61b9b8
Include indicator for new drawmenu_generic
...
In the new method we pass the character that should be used for
selected state, not the character to print always.
10 years ago
15d29efad5
Pass sel to lcd_implementation_mark_as_selected
...
- Pass selected state directly to lcd_implementation_mark_as_selected
- Rename sel function parameter
- Include a minor fix for SdBaseFile.h
10 years ago
a547dc2148
Merge branch 'Development' into optimize_menu_code
...
Get upstream changes
10 years ago
9c1f6e7ac7
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
e650d4044e
Fix "Stop Print" function in the LCD menu
...
When one hit "Stop Print" option in LCD menu, the command buffer was not
cleared. The printer keep moving until the buffer has been emptied.
Actually I could not clear the command buffer as well.. I don't know
why, it doesnt work as expected.
I need to implement a routine inside Stepper ISR to handle such
situation.
10 years ago
e917477fec
Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
...
Conflicts:
Marlin/dogm_lcd_implementation.h
Marlin/fonts/make_fonts.bat
Claerd conflicts with my own #1621 . (His was easy. :-) )
corrected typo in fonts/README.fonts
Applied changes to the new delta-configurations
and deletet there some extra whitespace at the line-endings.
10 years ago
ae01a6b5f2
Make use of codepos.
...
Saves one addition.
Needs one pointer on the stack.
Don't know if this is a go trade.
10 years ago
a534ac197a
Merge pull request #1621 from AnHardt/remove--6x9-font
...
Remove 6x9 font
10 years ago
80e0ee10ca
Merge pull request #1631 from AnHardt/iss1593
...
Decrease KILL_DELAY
10 years ago
4ce79920e5
Merge pull request #1635 from AnHardt/warnings1
...
Negative times are unlikly
10 years ago
76127b8a55
Merge pull request #1630 from Wurstnase/fix_g29
...
optional parameters must be named when ignoring order
10 years ago
be3f2dc1d9
Merge pull request #1636 from AnHardt/warning2
...
lcd_control_retract_menu() is conditional.
10 years ago
8d396584bf
Merge pull request #1637 from AnHardt/warning3
...
lcd_autostart_sd() has two conditions.
10 years ago
8664c6d465
Merge pull request #1638 from AnHardt/warning4
...
delta[3] not used when DELTA not defined.
10 years ago
10711ccc6a
Merge pull request #1639 from AnHardt/warning5
...
G4 could wait for an undefined time
10 years ago
28c91deb5c
EEPROM saving of z_values.
...
Tried to make it a little intelligent.
10 years ago
240b5cfe04
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
10 years ago
4521f6655b
Restore "S" parameter of M204 for retrocompatibility.
10 years ago
5ddb8d94e2
Update Documentation related to M204
10 years ago
f8c4d43886
delta[3] is used with SCARA
...
Shoot in the dark.
10 years ago
72a9fed4fb
codepos not used in gcode_M28()
...
Got:
Marlin_main.cpp:2567: warning: unused variable 'codepos'
Needs revision.
Don't now how this should look like.
10 years ago
b94dd33641
G4 could wait for an undefined time
...
Got:
Marlin_main.cpp:1689: warning: 'codenum' may be used uninitialized in this function
And indeed codenum is undefined when no parameter is given.
10 years ago
e90985a4e8
delta[3] not used when DELTA not defined.
...
got:
Marlin_main.cpp:387: warning: 'delta' defined but not used
Compiles cleaner when definition is removed.
10 years ago
5099b86ad4
lcd_autostart_sd() has two conditions.
...
got:
ultralcd.cpp:408: warning: 'void lcd_autostart_sd()' defined but not used
10 years ago
5d81c779cc
lcd_control_retract_menu() is conditional.
...
Got:
ultralcd.cpp:64: warning: 'void lcd_control_retract_menu()' declared 'static' but never defined
10 years ago
450b89e63c
Negative times are unlikly
...
While bunting an other bug I stumbled across:
ultralcd.cpp:1250: warning: comparison between signed and unsigned
integer expressions
Changed to the type of lcd_next_update_millis.
10 years ago
d1658eebfc
Decrease KILL_DELAY
...
Users hat to press kill-button for unexpexted lon times.
See #1593
10 years ago
00adb2a6c1
optional parameters must be named when ignoring order
10 years ago
0d43898a22
Remove of mesh_plan_buffer_line parameter reference (e)
10 years ago
8067a985ce
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
...
Fixed conflicts:
Marlin/planner.h
10 years ago
05333f61b7
fix macro
10 years ago
1883e1bb60
Applied thinkyheads corrections from 2015-03-17
10 years ago
be79235ef2
Add new (cleaner) Marlin font
...
with sources in /fonts
10 years ago
89fe77468d
Merge pull request #1586 from maverikou/delta_auto_bed_level
...
Delta auto bed level (Updated PR)
10 years ago
2b1ddc0413
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
cb676cdf39
Fix CoreXY homing bug introduced by PR #1606
...
The Check Endstop logic must be:
if (current_block->steps_x != current_block->steps_y || (TEST(out_bits,
X_AXIS) == TEST(out_bits, Y_AXIS)))
if (TEST(out_bits, X_HEAD))
not
if (TEST(out_bits, X_HEAD) && (current_block->steps_x !=
current_block->steps_y || (TEST(out_bits, X_AXIS) == TEST(out_bits,
Y_AXIS))))
Same applies for Y axis.
10 years ago
8a29dd4839
Cleaned typo in dogm_lcd_implementation.h
10 years ago
7e69f72db6
Moved font directory. Updated README.fonts
10 years ago
00b162a993
Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji
...
Conflicts:
Marlin/language.h
Conflict cleaned
10 years ago
e38dd5f030
Merge remote-tracking branch 'origin/utf' into utf-kanji
10 years ago
08e4651ece
Corrected cyrillic font again
...
Thank you @Nprod.
10 years ago
752c804677
remove offset, add minimum scan area
10 years ago
14f0250853
allow negative values
...
and some more comments
10 years ago
e6cb8ee188
Remove 6x9 font
...
in dogm_lcd_implementation.h
by using standard font and
shifting down temperature displays by one pixel
Saves 2300 bytes.
10 years ago
e93eb3e8d3
Update test
10 years ago
b8ae3feb9e
Update test
10 years ago
3570447ded
Fix Z_RAISE_AFTER_PROBING
10 years ago
8a739b6fba
Merge branch 'Development' into delta_auto_bed_level
...
Conflicts:
Marlin/Marlin_main.cpp
10 years ago
7629c4f05c
Cleanup for menu optimization
...
- Compare pr_char to space
- Fewer calls to lcd_strlen
10 years ago
3405f85a6a
Reduce size of menu code
...
- Get rid of _selected functions, passing selected state instead
10 years ago
e983a5ab92
Disable option. Enable for use/test.
10 years ago
f34b9c83d1
Added comment about MESH_NUM axis points.
10 years ago
a686c9878f
Move TOPO_ORIGIN define to Configuration.h
...
- Addressing issue #1608
10 years ago
8005d22c81
Added menu option for bed leveling.
10 years ago
0e51e53813
WIP. Adding bed leveling code.
10 years ago
d0d12962e0
Merge pull request #1615 from AnHardt/fix-1611
...
Fix #1611
10 years ago
f0dcea7e14
Fix #1611
...
Warning: suggest parentheses around comparison in operand of &
pretty much helped.
10 years ago
28b1c37dea
Fix for #1612
10 years ago
a8c1bdabd2
Update: readme.md for K8200 example
...
* readme.md: updated typo and URLs
10 years ago
2f374f1465
Removed Kanji.
10 years ago
5efc798642
Merge pull request #1546 from apollo-ng/pr-felix
...
Added support for Felix 2.0/3.0 printers
10 years ago
b83e52e50f
Merge pull request #1467 from thinkyhead/marlin_configurator
...
Configurator utility
10 years ago
7bc77dc134
Merge pull request #1583 from galexander1/m404fix
...
M404 should not use 'N' address as parameter because 'N' is reserved
10 years ago
b80ed51fcc
Fix controllerFan() code
...
- Add support for 4th extruder
- Fix parentheses matching
- Apply coding standards
- Address issue mentioned at #1575
10 years ago
4b50205f11
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
10 years ago
bb4cb1b15a
Merge pull request #1606 from thinkyhead/cleanup_stepper
...
Cleanup of stepper.cpp
10 years ago
63f41f56f8
Merge pull request #1607 from chris-bo/Development
...
Update ultralcd_st7920_u8glib_rrd.h
10 years ago
4eabd80025
Fix babystep for extruder_duplication
10 years ago
d3259d0dba
Merge pull request #1581 from msutas/Development
...
Filament Runout Sensor Feature
10 years ago
25c4f17e5d
Corrected Cyrillic fonts. Round II.
10 years ago
b73ba26b23
Update ultralcd_st7920_u8glib_rrd.h
10 years ago
c37f7d15c9
- Rename WRITE_E_STEP for consistency
...
- Add BIT and TEST macros
- Add _APPLY_ macros to stepper.cpp to help with consolidation
- Consolidate code in stepper.cpp using macros
- Apply standards in stepper.cpp
- Use >= 0 instead of > -1 as a better semantic
- Replace DUAL_Y_CARRIAGE with Y_DUAL_STEPPER_DRIVERS
10 years ago
44a205d9d9
Corrected Cyrillic fonts.
...
Cleaned typo in language_test.h Cyrillic part.
10 years ago
4d878b9bac
Fixed path typos in README
10 years ago
12ec557a75
Added DEFAULT_TRAVEL_ACCELERATION
10 years ago
1d25d510bc
Upstream Merge Fixes
10 years ago
a89d690b77
Merge remote-tracking branch 'upstream/Development' into pr-felix
10 years ago
cb57fc727d
Declare pid_output for PIDBEDTEMP
10 years ago
3d6deb9bdf
Simplify manage_heater
...
- Make separate get_pid_output(e) and get_pid_output_bed() function
- Reduce size of manage_heater function
- Hopefully work around linker errors
10 years ago
730497aaa1
Make use of ligatures in language_kana_utf8.h
10 years ago
3240d89f7d
Logic cleanup in utf_mapper.
10 years ago
2f3c77b751
Fix decimal places in G29 Bed Equation Coeficients
10 years ago
96f8d20f2f
Change selection logic another time
...
Automatic selection was to unflexible.
Updated documentation
Updated language files to new logic and documentation.
Updated bdf2u8g.exe
10 years ago
76da32b567
add hash-bang for python3
10 years ago
2e7ba44633
some renaming for readability
10 years ago
352aa3f4c5
Merge branch 'Development' into marlin_configurator
...
Latest upstream
10 years ago
e3ca9137b5
Fix missing temp_error declarations
...
- Fix for #1591 replacing #1595
10 years ago
0620267ebb
g29 auto-mode for the new G29 LRFB
...
short:
this script scans the first few lines from a gcode. If the line between 2 different z are greater than min_g1 this is our first layer. On this layer we search the min and max values of X and Y. With an offset we write that in a new file.
10 years ago
08694339eb
Merge branch 'Development' into marlin_configurator
...
Conflicts:
Marlin/Configuration.h
10 years ago
e4d77a6313
Merge pull request #1554 from 2PrintBeta/Development
...
Macro indirection for stepper drivers + Support for TMC26X and L6470 Stepper Drivers
10 years ago
b373826428
Merge pull request #2 from MarlinFirmware/Development
...
update
10 years ago
5bafb1fe1f
Add user test to language_test.h and make it default.
...
Improve description in Configuration.h
10 years ago
c0b6075f77
Fix max acceleration limits in planner
...
The max acceleration limiting was in wrong place.
10 years ago
9157cbd8f3
Add Travel Acceleration and change the M204 options
...
Added option to set Travel Acceleration (non printing moves).
The M204 options was a non sense (S for printing moves and T for retract
moves).
It has been changed to:
P = Printing moves
R = Retract only (no X, Y, Z) moves
T = Travel (non
printing) moves
I will add this info o G-Code wiki in reprap.org. I also advise to put
this info in Marlin next version changelog.
10 years ago
888cf161bd
fix travel speed option for G29
...
I forgot to enclousure the variable with #ifdef
10 years ago
af63b54562
Add travel speed option to G29 command line
10 years ago
817751d4b9
Added new languages, the Cyrillic display and a test language to find out your hardware.
10 years ago
c4b0087f7a
Insert utf_mapper.h
...
Top -> down
- Decide what output function is to use.
- Precautions. If non of the DISPLAY_CHARSET_HD44780's is selected fall back to Japanese.
- When we are not on the dogms setup a mapping table depending on display type and mapper.
- If we are on dogm we use ONE To ONE mapping - except kanji.
- select and define one of the mapping functions.
10 years ago
b60761bcff
Removed some messages that shouldn't be translated in the Japanese files.
...
And made falback to kana work.
10 years ago
97ae3c5c6a
Corected some errors inrtoduced by a faild global replacement.
10 years ago
ae76b1e8a8
Changes in dogm_lcd_implementation.h in detail.
...
Top -> down
- We don't need the old Marlion_font package any more - we made new.
- But we need information about configured fonts and the mappers.
- We support Cyrillic now.
- LCD_CLASS is not used in this file. LiquidCrystalRus.h is deleted anyway.
- define some fonts
- BIG_EDIT_FONT works only together with western languages.
- Select a matching FONT for the MENUE depending on the defined language.
- Number the different font-types. Wanted to avoid to store complete font-structures when changing fonts back and forth.
- Marlin special symbols are now at the lower end - like in 'ultralcd_implementation_hitachi_HD44780.h'
- insert the new remembering setFont function.
- insert the new counting lcd_print functions.
- make use of the new setFont and lcd_print functions.
- On some places redefined one character long strings with chars to avoid overhead and reduce warnings.
10 years ago
5bf42066fa
Fix typo in configuration.h
10 years ago
8a4b62d081
Set more regular setup in configuration.h
10 years ago
255ca68123
Changes in ultralcd_implementation_hitachi_HD44780.h in detail
...
Top -> down:
We don't need LiquidCrystalRus.cpp and LiquidCrystalRus.h any more. Functionality is now in utf_mapper.h
Comment on LCD_STR_BEDTEMP about behaviour in strings.
Change LCD_STR_ARROW_RIGHT from "\x7E" to ">" because "\x7E" is only ARROW_RIGHT on displays with DISPLAY_CHARSET_HD44780_JAPAN.
Introduce the counting UTF8 enabled lcd_print functions.
Replace the old lcd.print functions and make use of them.
A bit of reformatting around the changes.
10 years ago
60ceca1bc1
Add speed configuration for home-bumping movement
10 years ago
6fc2ccd568
Make use of new remenbering fontswitch.
10 years ago
0f26f3abf2
Add a test_language.
...
Will show the compleet utf8 or ASCII charset
To se the second half of ASCII click on "01234..."
10 years ago
901cf203fe
Add legal stuff to marlin_kanji.h
10 years ago
2d5134b0ed
Introduce - clean - prepae language files
10 years ago
d813090d90
Merge remote-tracking branch 'remotes/upstream/Development' into Development
...
Conflicts:
Marlin/Marlin_main.cpp
Marlin/stepper.cpp
10 years ago
c321c97f35
Merge pull request #1584 from galexander1/stringcleanup
...
fix a handful of cases where strtod() was cast to int, instead of just using strtol()
10 years ago
53abc5e2f1
Merge branch 'Development' into delta_auto_bed_level
10 years ago
956fb2d278
Merge pull request #1 from MarlinFirmware/Development
...
update
10 years ago
978dadf806
Base64 decode AJAX-fetched text properly
10 years ago
0eae9c24bc
Merge pull request #1582 from galexander1/deltaconftypo
...
fix typo in delta example config introduced in commit 697ee2d
10 years ago
624f23f550
Merge pull request #1575 from Wurstnase/fix-controllerFan
...
Fix controller fan
10 years ago
424c747fb3
Enable M401 and M402 for deltas with allen key z-probes.
10 years ago
0d593ab7c1
Fix debug message
10 years ago
3e8c5678f5
fix bug where, i.e., "G1X1E1" would be interpretted as "G1 X10 E1",
...
because strtod() will read the E address value as if it was a base 10
exponent.
10 years ago
ed7874b4e0
M404 should not use 'N' address as parameter because 'N' is reserved for the line number
10 years ago
b9dfa5cad4
use code_value_long() instead of (int)code_value()
10 years ago
901b03d020
use strtol() instead of strtod() when an integer value is desired
10 years ago
4fba7b084f
fix typo in delta example config introduced in
...
commit 697ee2dc50
10 years ago
cfc6a3a87a
Filament Runout Sensor Feature
...
With this change a mechanical or optical switch may be used to check the
availability of the filament and when the filament runs out an M600
(filament change) command is issued. This is only done while printing
with an SD card.
This feature was requested several times (issue #679 ), but the requests
were not accepted since it was believed that this situation should be
handled at host side. However during an SD print the control is totally
on firmware and I think that during an SD print it should be handled by
the firmware.
The original code was posted at reprap forum
(http://forums.reprap.org/read.php?1,297350 ) by Lazymonk. I have only
corrected some bugs of the code and improved it by adding definitions to
the configuration.h in order to make it more standardized.
10 years ago
e6862700af
Add Z_RAISE_AFTER_PROBING to all config files
10 years ago
39d255608d
Test an extra delta configuration with auto bed leveling code paths
10 years ago
7c24b97958
Ported over Johann Rocholl's improvements for delta printers:
...
- Nonlinear auto bed leveling code (includes G29, G30, Z_RAISE_AFTER_PROBING). Cleaned it up to be a delta-specific AUTO_BED_LEVELING_GRID code path.
- Allen key z-probe deployment and retraction code. Cleaned it up and added safety checks.
10 years ago
a5342c942e
Update Marlin_main.cpp
10 years ago
0f3b7d5575
Update annotated configurations
...
- Also update base configs
10 years ago
c5aa56bc4d
Merge branch 'Development' into marlin_configurator
...
Latest upstream commits
10 years ago
d085725c86
More sanity-checking for ABL
...
- Moved sanity-checks to Marlin_main.cpp
- Applied to other configuration files
- Fixed formatting of ABL output
- Passing verbose level to probe_pt
- Miscellaneous cleanup
- Put CONFIG_STEPPERS_TOSHIBA into Configuration.h
10 years ago
8b6766b37b
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
10 years ago
9eed8c8cf0
Make sure a ROM is selected for ULTRA_LCD
10 years ago
7136268273
Added 'dogm_font_data_6x10_marlin_Kanji.h'
...
This is copied from http://www.thingiverse.com/thing:664397
// Japanese Original font
// Version 0.1 by ichibey
//
// 営利目的で利用する際は、かならず許可を得てください。非営利の場合は、CCライセンスに従い使用ください。
// http://creativecommons.org/licenses/by-nc/2.1/jp/legalcode
This font is very special. It uses a mixture of katakana an kanji symbols, uses multi character symbols and is only addressable by '\xxx' sequences.
10 years ago
16e173e167
Added 5 new font.h files to main directory.
...
The former place of 'dogm_font_data_6x9_marlin.h' was in 'dogm_font_data_m0arlin.h'.
Deleted 'dogm_font_data_marlin.h'.
10 years ago
254970c92a
Merge pull request #1570 from C-o-r-E/escape_fix
...
Fixes gCode handling of comments and escaped characters
10 years ago
25dc79f124
Remove M48 credits also
10 years ago
34e51f576f
Fix compile error in gcode_G29
...
- A redo of #1576 , which missed topo_flag
- Always set verbose_level
10 years ago
b14270b029
Added font tools
10 years ago
fe2bd237d5
Add font sources.
...
Fonts have been created with fony.exe (http://hukka.ncn.fi/?fony )
The HD44760_? fonts simulate the fonts of the character based displays.
The ISO10646 fonts provide the right size of the standard fonts.
Marlin_symbols contains only the the special symbols of the original marlin font.
10 years ago
344a12bd10
Merge pull request #1571 from AnHardt/Undubble
...
Undubble MSG_MIN & MSG MAX
10 years ago
1149c24b86
More grouping, cleanup, start on overrides
10 years ago
62bd734612
fix controllerFan() for inverted enable pins
...
add ```^ !(n_ENABLE_ON)``` for each stepper
10 years ago
3024f6c706
Undubble MSG_MIN &MSG MAX
10 years ago
63b62d8d4e
Fixed in-line comments and escaping
...
* "G1 X1 ; test" was not executing "G1 X1" due to never leaving comment mode.
* "M117 Hello \;)" printed "Hello \" to the display due to not replacing serial_char properly.
Tested with the following commands:
* M117 Hello ; test => displays "Hello" on display, ignores "test"
* G1 X1 ; foo => moves 1mm in X, ignores "foo"
* ; test => completely ignored, not even acknowledged
* M117 Hello \;) => displays "Hello ;)" on display
* M117 Hello \\;) => displays "Hello \" on display, ignores ")"
10 years ago
99fb1bc3e8
Attempt to resolve #1568 and add basic escape character support
10 years ago
fad14ae7eb
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
10 years ago
cdc38aa783
Move gcode handlers into inline functions
10 years ago
6d9e9a6bef
Merge branch 'Development' into enhanced_g29
...
Latest upstream changes
10 years ago
4db2179f5c
Include 4th extruder support
10 years ago
f90a947e65
Fix autoretract
...
Autoretract was broken, looks like it was overlooked when the retracted flag was updated for multi extruders.
10 years ago
2ef6b3d57a
Fix wrong defines, broken syntax
10 years ago
08b722b635
Merge pull request #1555 from C-o-r-E/solenoids
...
Add support for solenoid articulated extruders
10 years ago
32744d41a9
Do sanity checking on LRFB values
...
- Setting boundaries based on configured limits, contrasting with G28
(which forgets these limits?)
10 years ago
0a7d85c20e
Minor fixes
10 years ago
48e3a97a18
Removed extra encoder definitions from pins_FELIX2.h
10 years ago
d052a3c6aa
Merge pull request #1551 from thinkyhead/redundant_encrot
...
Cleanup rotary encoder encrot* defines
10 years ago
d8eeddfb93
Updated DUAL Extruder config, added README and enabled NEWPANEL by default
10 years ago
b423b90c77
Added Configuration_adv.h to examples for LCD/SD Support
10 years ago
075507fb9a
missed one X_ENABLE_PIN
10 years ago
dfb38874f8
Some suggested changes for #1555
10 years ago
7f8ea7105f
Arrange ProbeAction values bitwise
10 years ago
7684721977
Enhanced G29
...
- Adapted “Enhanced G29” code referred to in #1499 and posted at
[3dprintboard.com](http://3dprintboard.com/showthread.php?3105-Auto_Bed_
Leveling-Enhanced-G29-command)
- Compatible with current G29 while adding some new arguments
- `V` sets the verbose level for serial out
- `T` (or `V` > 2) send a Topology report to serial out
- `E` works the same way as before
- `P` works as before (source used `n` or `U`/`u`)
- `L`, `R`, `B`, `F` work as before
- Still needs sanity checking for `LRBF`
10 years ago
874d3d3fc5
Add support for solenoid articulated extruders
10 years ago
7540a81106
Minor fixes
10 years ago
a375d648c7
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
4a7aca2736
Merge remote-tracking branch 'remotes/upstream/Development' into Development
10 years ago
715104e477
Fix Endstop check for CoreXY bots.
...
The X_Axis could not home to min while Y_Max endstop was trigged.
10 years ago
e428e8da75
Merge pull request #1552 from thinkyhead/cleanup_cardreader
...
Cleanup of cardreader.*
10 years ago
20e59dc61e
Don't skip files starting with underscores
10 years ago
f171656f8e
Cleanup of cardreader.*
...
- Apply standards to cardreader.*
- Fix minor issues with cardreader.cpp
- Apply standards to some other stale regions
10 years ago
f379edca78
Cleanup rotary encoder encrot* defines
...
The encrot values are used in only one place, and don’t vary, so remove
redundant references.
10 years ago
c7cdb176c8
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
10 years ago
49f471a5fc
Merge pull request #1541 from thinkyhead/fixup_temperature
...
Cleanup of temperature code
10 years ago
f2710e11d1
Optimize initial loading, code cleanup
10 years ago
558c6313f7
Merge branch 'pr-felix' into Marlix
10 years ago
08bc723a3c
Enable PIDBED
10 years ago
e487bd642b
Updated PR to streamline integration
10 years ago
2eeb241b42
Find fields that group together
...
- Do field grouping
- Tweak configurations for better grouping
10 years ago
e30bfedce4
Fix undefined *_PROBE_BED_POSITION error
10 years ago
3eafea840d
Minor fixes in Configuration.h
10 years ago
c7fb1b70f2
Initial Configuration.h for Felix 2.0/3.0
10 years ago
2e172f38bd
Added support for Felix 2.0/3.0 printers
10 years ago
f994729999
Parse and use dependent groups
...
- Parse #if, #ifdef, etc. for rules to enable fields
10 years ago
9b50ec6512
Panel One encoder pins
10 years ago
838a22de64
Fix switch value method, make app global
10 years ago
8d5839151b
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
10 years ago
443e7edef4
- Add support for L6470 Drivers.
...
- Both TMC, L6470 and pin-driven drivers work.
- All can be mixed and matched as needed.
10 years ago
1db02c2891
Merge branch 'Development' into fixup_temperature
...
Merge upstream changes
10 years ago
a99470fbb0
Merge pull request #1527 from maverikou/panel_one
...
Added support for PanelOne from T3P3.
10 years ago
5727cb3ed4
Cleanup TMC Stepper a bit.
10 years ago
a5bbd402bf
Merge pull request #1539 from AnHardt/dummysensor
...
Extend the idea of dummy temperature sensors.
10 years ago
1a7b0d9a37
Redo HAS_* macros to fix define error
10 years ago
864dddc878
Macros to the top, a few HAS_* macros
10 years ago
227ab8c665
Merge pull request #1503 from MarcelMo/patch-2
...
Support for simple customisable AutoZProbing area
10 years ago
fd1ea9d56f
Move literal strings to language files
10 years ago
8742b6bd56
Merge branch 'Development' into panel_one
10 years ago
aa9c1f1bed
Better name for ADC macro
10 years ago
9c9726d469
Cleanup of temperature code
...
- Reduce calls to millis()
- General cleanup of manage_heaters
- General cleanup of pid autotune
- Formatting here & there
- Macros to clean up and shrink ISR code (reduced by ~364 lines)
10 years ago
c6d2ebe452
Extend the idea of dummy temperature sensors.
...
Added a second sensor and made them configurable.
10 years ago
c9a3eb0c1a
Spacing in calculate_volumetric_multiplier(s)
10 years ago
2af559cca3
Shared function for menu_edit_* and menu_edit_callback_*
10 years ago
df8c51528f
Merge branch 'Development' into cleanup_ultralcd
...
Latest upstream changes
10 years ago
517f411999
Spacing adjustment to menu_edit* macro
10 years ago
4938ae5caf
Add required backslash for macro expansion
10 years ago
Chris Roadfeldt