zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
2764 commits 1 branch 0 tags 156 MiB
Commit graph

2232 commits

Author SHA1 Message Date
wurstnase a4ad9117dd comment #define Z_DUAL_STEPPER_DRIVERS 2015-03-25 13:46:29 +01:00
chris-bo 2dfd0e5ce7 Update Configuration.h 
documentation how to disable buzzer feedback
 2015-03-25 12:44:29 +01:00
Christian Bohn 4c3cbc0961 use only one implementation for beeper feedback 2015-03-25 12:23:50 +01:00
AnHardt 01cc97a3c3 Corected condition for PIDdT 2015-03-25 12:08:23 +01:00
AnHardt 94330705c7 Move definition of PIDdT back to temperature.h 
make it unconditional
remove all definitions in the 'Configuration.h's
remove form 'Conditionals.h'
 2015-03-25 11:51:41 +01:00
AnHardt 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.
 2015-03-25 11:08:24 +01:00
AnHardt 8848b7e9ef Add the missed {} to END_MENU in ultralcd.cpp 
what caused an extra update of encoderLine most of the time.
 2015-03-25 09:48:21 +01:00
AnHardt 4beffbca69 Make SMALL_INFOFONT configurable. 
Tweak the documentation
 2015-03-24 23:40:04 +01:00
alexborro c2ba5d0c09 Fix ZigZag and Topograph table 
ZigZag: Inverted Behavior.. If T supplied, it does not zigzag.
Topograph table: The table was rotated 90º clockwise.
 2015-03-24 15:50:31 -03:00
alexborro 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.
 2015-03-24 14:06:44 -03:00
AnHardt c686069ccd Revert "Remove 6x9 font" 
This reverts commit e6cb8ee188.

Conflicts:
	Marlin/dogm_lcd_implementation.h
Confilkt solved
Needs rework.
 2015-03-24 17:13:05 +01:00
AnHardt b00a531df8 Revert "Removed now unneded FONT_STATUSMENU" 
This reverts commit 8c5bb38748.
 2015-03-24 17:01:56 +01:00
AnHardt 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
 2015-03-24 16:59:15 +01:00
Scott Lahteine 8db4fd7177 Merge branch 'Development' into planner_oh_planner 
Latest upstream commits
 2015-03-23 22:08:50 -07:00
Scott Lahteine 0d81abe1c9 Merge branch 'Development' into config_testing 
Latest upstream commits
 2015-03-23 21:13:04 -07:00
Scott Lahteine 01740fd9c6 Merge branch 'Development' into planner_oh_planner 
Latest upstream commits
 2015-03-23 21:12:36 -07:00
Scott Lahteine 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`
 2015-03-23 20:55:48 -07:00
Scott Lahteine 03fa9fae9f Merge branch 'Development' into fix_temperature_minmax 
Latest upstream commits
 2015-03-23 20:42:48 -07:00
Scott Lahteine 1fac388664 Revert measurement loop 2015-03-23 15:18:22 -07:00
nicolas-rambaud 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.
 2015-03-23 12:29:12 +01:00
Scott Lahteine b26a3ea02c Merge pull request #1662 from josla972/refactor_scara 
Refactor SCARA calibration. Save some lines of code and possibly ROM.
 2015-03-23 00:51:18 -07:00
wurstnase e6f6c6e3a1 fix bad insertion config again 2015-03-23 08:32:48 +01:00
Scott Lahteine 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
 2015-03-23 00:27:29 -07:00
Scott Lahteine 34a41648ab Merge branch 'Development' into planner_oh_planner 
Latest upstream commits
 2015-03-22 23:40:29 -07:00
Scott Lahteine 4fbb80567e Get upstream commits 2015-03-22 23:07:22 -07:00
Scott Lahteine 7717e1ce33 Fix bad insert in configuration 2015-03-22 21:48:46 -07:00
Scott Lahteine 146501215f Fix mangled probe_pt calls 
- Address issue #1669
- Remove the TOPO_ORIGIN configuration setting
 2015-03-22 21:45:20 -07:00
maverikou 15345cc249 Corrected Z_PROBE_ALLEN_KEY behaviour. 2015-03-22 13:54:51 +02:00
maverikou 0f034dd97e Clean up Z_RAISE_AFTER_PROBING to work the same in all code paths except Z_PROBE_SLED. 2015-03-22 13:54:45 +02:00
maverikou 6c96f32069 Blind fix for #1507 2015-03-22 13:54:21 +02:00
Josef Larsson 379348487e Removed malplaced comment. 2015-03-22 12:21:31 +01:00
Scott Lahteine 8bd6e37b21 Merge pull request #1661 from thinkyhead/G92_no_offset 
Don't add home offsets in G29
 2015-03-21 16:49:06 -07:00
Scott Lahteine 582cd780cd Fix compile error with *_DUAL_STEPPER_DRIVERS 
- Patch up macros in stepper.cpp
 2015-03-21 16:43:47 -07:00
Josef Larsson 9b3462f73f Refactor SCARA calibration. Save some lines of code and possibly ROM. 2015-03-22 00:37:24 +01:00
Scott Lahteine 691e753cc3 Don't add home offsets in G29 
- Address #1262 by leaving values as set
- Rename `add_homing` to `home_offset`
 2015-03-21 16:30:02 -07:00
Scott Lahteine 88e81a4804 Latest upstream commits, plus fixes 
- Also add Manual Bed Leveling to the rest of the configs
 2015-03-21 16:12:57 -07:00
Scott Lahteine 15eb5d35a2 Merge branch 'Development' into config_testing 
Latest upstream commits
 2015-03-21 15:42:45 -07:00
Scott Lahteine 19df90622b Include Conditionals.h file in update 2015-03-21 15:40:20 -07:00
Scott Lahteine 9b639b4135 Merge pull request #1619 from epatel/manual-bed-leveling+mesh-bed-level 
Manual bed leveling + mesh bed leveling
 2015-03-21 15:39:42 -07:00
Scott Lahteine 2c9bd15625 Move LCD items to Conditionals.h 
- `Conditionals.h` is included twice, setting LCD values the first time
 2015-03-21 15:24:57 -07:00
Scott Lahteine 63abeaff38 Merge branch 'Development' into config_testing 
Latest upstream commits
 2015-03-21 15:03:06 -07:00
Scott Lahteine 3703694e30 Fix temperature min/max test 
- Base tests on all thermistors/thermocouples, not just heater 0
 2015-03-21 14:23:43 -07:00
Edward Patel 3d0a060a7a Added G29 command 2015-03-21 14:50:47 +01:00
Edward Patel c516747847 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 2015-03-21 14:49:52 +01:00
Scott Lahteine af14c684b5 Minor optimizations to planner code 
- Prefetch values used more than once
 2015-03-20 20:57:06 -07:00
Scott Lahteine 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
 2015-03-20 20:42:49 -07:00
AnHardt 64e3d33893 Fix shrinked menucode 
by updating 'encoderPosition' in END_MENU() line 1.
 2015-03-20 23:36:14 +01:00
Edward Patel a7e89d4cfa Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 2015-03-20 15:46:01 +01:00
AnHardt 8c5bb38748 Removed now unneded FONT_STATUSMENU 2015-03-20 14:12:12 +01:00
Scott Lahteine 2176a22d42 Fix count_direction initializer 
- Addressing #1625
 2015-03-20 05:45:05 -07:00
AnHardt 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
 2015-03-20 13:35:47 +01:00
Scott Lahteine cb6942d4a7 Merge branch 'Development' into config_testing 
Get upstream commits
 2015-03-20 05:30:36 -07:00
AnHardt 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
 2015-03-20 13:08:18 +01:00
Scott Lahteine 5644ad6809 Fix hiliting of edit items 2015-03-20 04:29:35 -07:00
Scott Lahteine 63d5d28085 Merge branch 'Development' into config_testing 
Latest upstream changes
 2015-03-20 04:15:18 -07:00
Scott Lahteine 526a755a66 Merge pull request #1652 from AnHardt/PIDdebug 
PID debug
 2015-03-20 04:14:08 -07:00
Scott Lahteine a1c240b0a4 Delta supports some auto bed leveling options 2015-03-20 04:04:45 -07:00
Edward Patel 5112cf8422 Added comment for the EEPROM storage 2015-03-20 11:46:47 +01:00
Edward Patel 4619d80524 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 2015-03-20 11:45:06 +01:00
Scott Lahteine 199151a4ed Merge pull request #1650 from AnHardt/beautify 
Beautivy statusscreen
 2015-03-20 03:38:02 -07:00
Scott Lahteine 2424713a8f Merge pull request #1640 from AnHardt/warning6 
codepos not used in gcode_M28()
 2015-03-20 02:58:00 -07:00
Scott Lahteine b6d381f863 Divide up Conditionals to get LCD items early 2015-03-20 02:50:28 -07:00
AnHardt e85061d20d Added changes to the 'new' Configuration.h s 2015-03-20 10:36:29 +01:00
Scott Lahteine 33c7c6e11d Conditionals.h requires Arduino.h 2015-03-20 01:27:14 -07:00
Scott Lahteine 8ade04b78e Felix and Hephestos configs 
- Not sure why these are showing as all new
 2015-03-19 22:25:05 -07:00
Scott Lahteine 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
 2015-03-19 22:22:23 -07:00
Edward Patel a61f679568 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 2015-03-20 02:28:35 +01:00
Edward Patel c87faa69ed Shortened mesh_plan_buffer_line() 2015-03-20 02:18:49 +01:00
AnHardt 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>
 2015-03-20 00:07:36 +01:00
AnHardt f1d3d1524d Merge branch 'optimize_menu_code' of https://github.com/thinkyhead/Marlin into beautify 
Conflicts:
	Marlin/dogm_lcd_implementation.h

solved merge conflict.
 2015-03-19 22:51:22 +01:00
AnHardt fa889cd6e1 Beautivy statusscreen 
by shifting things some pixels around
 2015-03-19 22:13:37 +01:00
Scott Lahteine 7279e4f82f Small code tweaks re lcd.print 2015-03-19 14:01:33 -07:00
Scott Lahteine 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.
 2015-03-19 13:49:06 -07:00
Scott Lahteine 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
 2015-03-19 13:40:36 -07:00
Scott Lahteine a547dc2148 Merge branch 'Development' into optimize_menu_code 
Get upstream changes
 2015-03-19 13:31:37 -07:00
alexborro 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.
 2015-03-19 14:16:18 -03:00
AnHardt 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.
 2015-03-19 12:35:43 +01:00
AnHardt ae01a6b5f2 Make use of codepos. 
Saves one addition.
Needs one pointer on the stack.

Don't know if this is a go trade.
 2015-03-19 09:45:16 +01:00
Scott Lahteine a534ac197a Merge pull request #1621 from AnHardt/remove--6x9-font 
Remove 6x9 font
 2015-03-18 23:10:42 -07:00
Scott Lahteine 80e0ee10ca Merge pull request #1631 from AnHardt/iss1593 
Decrease KILL_DELAY
 2015-03-18 19:10:38 -07:00
Scott Lahteine 4ce79920e5 Merge pull request #1635 from AnHardt/warnings1 
Negative times are unlikly
 2015-03-18 19:10:12 -07:00
Scott Lahteine 76127b8a55 Merge pull request #1630 from Wurstnase/fix_g29 
optional parameters must be named when ignoring order
 2015-03-18 19:09:40 -07:00
Scott Lahteine be3f2dc1d9 Merge pull request #1636 from AnHardt/warning2 
lcd_control_retract_menu() is conditional.
 2015-03-18 19:09:05 -07:00
Scott Lahteine 8d396584bf Merge pull request #1637 from AnHardt/warning3 
lcd_autostart_sd() has two conditions.
 2015-03-18 19:08:33 -07:00
Scott Lahteine 8664c6d465 Merge pull request #1638 from AnHardt/warning4 
delta[3] not used when DELTA not defined.
 2015-03-18 19:07:55 -07:00
Scott Lahteine 10711ccc6a Merge pull request #1639 from AnHardt/warning5 
G4 could wait for an undefined time
 2015-03-18 19:07:14 -07:00
Edward Patel 28c91deb5c EEPROM saving of z_values. 
Tried to make it a little intelligent.
 2015-03-18 21:07:07 +01:00
Edward Patel 240b5cfe04 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 2015-03-18 19:19:46 +01:00
alexborro 4521f6655b Restore "S" parameter of M204 for retrocompatibility. 2015-03-18 12:19:30 -03:00
alexborro 5ddb8d94e2 Update Documentation related to M204 2015-03-18 11:09:10 -03:00
AnHardt f8c4d43886 delta[3] is used with SCARA 
Shoot in the dark.
 2015-03-18 12:14:49 +01:00
AnHardt 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.
 2015-03-18 11:41:14 +01:00
AnHardt 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.
 2015-03-18 11:23:41 +01:00
AnHardt 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.
 2015-03-18 11:11:49 +01:00
AnHardt 5099b86ad4 lcd_autostart_sd() has two conditions. 
got:
ultralcd.cpp:408: warning: 'void lcd_autostart_sd()' defined but not used
 2015-03-18 10:51:13 +01:00
AnHardt 5d81c779cc lcd_control_retract_menu() is conditional. 
Got:
ultralcd.cpp:64: warning: 'void lcd_control_retract_menu()' declared 'static' but never defined
 2015-03-18 10:39:59 +01:00
AnHardt 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.
 2015-03-18 10:31:34 +01:00
AnHardt d1658eebfc Decrease KILL_DELAY 
Users hat to press kill-button for unexpexted lon times.
See #1593
 2015-03-18 01:45:42 +01:00
Wurstnase 00adb2a6c1 optional parameters must be named when ignoring order 2015-03-18 01:02:29 +01:00
Edward Patel 0d43898a22 Remove of mesh_plan_buffer_line parameter reference (e) 2015-03-17 22:55:29 +01:00
Edward Patel 8067a985ce Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 
Fixed conflicts:
	Marlin/planner.h
 2015-03-17 22:48:08 +01:00
wurstnase 05333f61b7 fix macro 2015-03-17 12:50:44 +01:00
AnHardt 1883e1bb60 Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
AnHardt be79235ef2 Add new (cleaner) Marlin font 
with sources in /fonts
 2015-03-17 10:33:02 +01:00
Scott Lahteine 89fe77468d Merge pull request #1586 from maverikou/delta_auto_bed_level 
Delta auto bed level (Updated PR)
 2015-03-16 18:17:11 -07:00
alexborro 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.
 2015-03-16 16:31:25 -03:00
AnHardt 8a29dd4839 Cleaned typo in dogm_lcd_implementation.h 2015-03-16 20:18:48 +01:00
AnHardt 7e69f72db6 Moved font directory. Updated README.fonts 2015-03-16 17:27:27 +01:00
AnHardt 00b162a993 Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji 
Conflicts:
	Marlin/language.h
Conflict cleaned
 2015-03-16 17:13:49 +01:00
AnHardt e38dd5f030 Merge remote-tracking branch 'origin/utf' into utf-kanji 2015-03-16 17:00:54 +01:00
AnHardt 08e4651ece Corrected cyrillic font again 
Thank you @Nprod.
 2015-03-16 16:59:14 +01:00
Wurstnase 752c804677 remove offset, add minimum scan area 2015-03-16 15:13:16 +01:00
Wurstnase 14f0250853 allow negative values 
and some more comments
 2015-03-16 14:26:59 +01:00
AnHardt e6cb8ee188 Remove 6x9 font 
in dogm_lcd_implementation.h
by using standard font and
shifting down temperature displays by one pixel
Saves 2300 bytes.
 2015-03-16 11:18:27 +01:00
maverikou e93eb3e8d3 Update test 2015-03-16 09:16:00 +02:00
maverikou b8ae3feb9e Update test 2015-03-16 09:03:15 +02:00
maverikou 3570447ded Fix Z_RAISE_AFTER_PROBING 2015-03-16 08:35:49 +02:00
maverikou 8a739b6fba Merge branch 'Development' into delta_auto_bed_level 
Conflicts:
	Marlin/Marlin_main.cpp
 2015-03-16 08:24:26 +02:00
Scott Lahteine 7629c4f05c Cleanup for menu optimization 
- Compare pr_char to space
- Fewer calls to lcd_strlen
 2015-03-15 22:54:54 -07:00
Scott Lahteine 3405f85a6a Reduce size of menu code 
- Get rid of _selected functions, passing selected state instead
 2015-03-15 22:02:33 -07:00
Edward Patel e983a5ab92 Disable option. Enable for use/test. 2015-03-16 02:50:11 +01:00
Edward Patel f34b9c83d1 Added comment about MESH_NUM axis points. 2015-03-16 01:48:46 +01:00
Scott Lahteine a686c9878f Move TOPO_ORIGIN define to Configuration.h 
- Addressing issue #1608
 2015-03-15 15:49:36 -07:00
Edward Patel 8005d22c81 Added menu option for bed leveling. 2015-03-15 23:24:32 +01:00
Edward Patel 0e51e53813 WIP. Adding bed leveling code. 2015-03-15 23:24:32 +01:00
Scott Lahteine d0d12962e0 Merge pull request #1615 from AnHardt/fix-1611 
Fix #1611
 2015-03-15 15:19:02 -07:00
AnHardt f0dcea7e14 Fix #1611 
Warning: suggest parentheses around comparison in operand of &

pretty much helped.
 2015-03-15 22:52:50 +01:00
AnHardt 28b1c37dea Fix for #1612 2015-03-15 21:35:33 +01:00
AnHardt 2f374f1465 Removed Kanji. 2015-03-15 16:44:37 +01:00
Scott Lahteine 5efc798642 Merge pull request #1546 from apollo-ng/pr-felix 
Added support for Felix 2.0/3.0 printers
 2015-03-15 07:52:22 -07:00
Scott Lahteine b83e52e50f Merge pull request #1467 from thinkyhead/marlin_configurator 
Configurator utility
 2015-03-15 07:49:19 -07:00
Scott Lahteine 7bc77dc134 Merge pull request #1583 from galexander1/m404fix 
M404 should not use 'N' address as parameter because 'N' is reserved
 2015-03-15 07:47:30 -07:00
Scott Lahteine b80ed51fcc Fix controllerFan() code 
- Add support for 4th extruder
- Fix parentheses matching
- Apply coding standards
- Address issue mentioned at #1575
 2015-03-15 06:55:31 -07:00
Scott Lahteine 4b50205f11 Merge branch 'Development' into marlin_configurator 
Latest upstream changes
 2015-03-15 06:37:32 -07:00
Scott Lahteine bb4cb1b15a Merge pull request #1606 from thinkyhead/cleanup_stepper 
Cleanup of stepper.cpp
 2015-03-15 06:05:08 -07:00
Scott Lahteine 63f41f56f8 Merge pull request #1607 from chris-bo/Development 
Update ultralcd_st7920_u8glib_rrd.h
 2015-03-15 01:04:40 -07:00
Scott Lahteine 4eabd80025 Fix babystep for extruder_duplication 2015-03-14 18:31:25 -07:00
alexborro d3259d0dba Merge pull request #1581 from msutas/Development 
Filament Runout Sensor Feature
 2015-03-14 18:35:20 -03:00
AnHardt 25c4f17e5d Corrected Cyrillic fonts. Round II. 2015-03-14 15:10:45 +01:00
chris-bo b73ba26b23 Update ultralcd_st7920_u8glib_rrd.h 2015-03-14 14:31:00 +01:00
Scott Lahteine 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
 2015-03-14 04:28:22 -07:00
AnHardt 44a205d9d9 Corrected Cyrillic fonts. 
Cleaned typo in language_test.h Cyrillic part.
 2015-03-14 12:27:47 +01:00
chrono 4d878b9bac Fixed path typos in README 2015-03-14 10:18:12 +00:00
chrono 12ec557a75 Added DEFAULT_TRAVEL_ACCELERATION 2015-03-14 10:14:13 +00:00
chrono 1d25d510bc Upstream Merge Fixes 2015-03-14 09:48:30 +00:00
chrono a89d690b77 Merge remote-tracking branch 'upstream/Development' into pr-felix 2015-03-14 09:25:43 +00:00
Scott Lahteine cb57fc727d Declare pid_output for PIDBEDTEMP 2015-03-13 20:19:51 -07:00
Scott Lahteine 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
 2015-03-13 19:49:41 -07:00
AnHardt 730497aaa1 Make use of ligatures in language_kana_utf8.h 2015-03-13 19:47:40 +01:00
AnHardt 3240d89f7d Logic cleanup in utf_mapper. 2015-03-13 19:45:10 +01:00
alexborro 2f3c77b751 Fix decimal places in G29 Bed Equation Coeficients 2015-03-13 14:39:41 -03:00
AnHardt 96f8d20f2f Change selection logic another time 
Automatic selection was to unflexible.

Updated documentation

Updated language files to new logic and documentation.

Updated bdf2u8g.exe
 2015-03-13 14:26:58 +01:00
Wurstnase 76da32b567 add hash-bang for python3 2015-03-13 07:44:20 +01:00
Wurstnase 2e7ba44633 some renaming for readability 2015-03-13 07:31:27 +01:00
Scott Lahteine 352aa3f4c5 Merge branch 'Development' into marlin_configurator 
Latest upstream
 2015-03-12 17:12:51 -07:00
Scott Lahteine e3ca9137b5 Fix missing temp_error declarations 
- Fix for #1591 replacing #1595
 2015-03-11 16:38:42 -07:00
Wurstnase 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.
 2015-03-11 23:53:28 +01:00
Scott Lahteine 08694339eb Merge branch 'Development' into marlin_configurator 
Conflicts:
	Marlin/Configuration.h
 2015-03-11 15:47:32 -07:00
Scott Lahteine e4d77a6313 Merge pull request #1554 from 2PrintBeta/Development 
Macro indirection for stepper drivers + Support for TMC26X and L6470 Stepper Drivers
 2015-03-11 15:31:57 -07:00
Mehmet Sutas b373826428 Merge pull request #2 from MarlinFirmware/Development 
update
 2015-03-12 00:07:39 +02:00
AnHardt 5bafb1fe1f Add user test to language_test.h and make it default. 
Improve description in Configuration.h
 2015-03-11 20:46:52 +01:00
alexborro c0b6075f77 Fix max acceleration limits in planner 
The max acceleration limiting was in wrong place.
 2015-03-11 15:08:11 -03:00
alexborro 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.
 2015-03-11 13:19:02 -03:00
alexborro 888cf161bd fix travel speed option for G29 
I forgot to enclousure the variable with #ifdef
 2015-03-11 10:03:32 -03:00
alexborro af63b54562 Add travel speed option to G29 command line 2015-03-11 09:51:56 -03:00
AnHardt 817751d4b9 Added new languages, the Cyrillic display and a test language to find out your hardware. 2015-03-11 11:10:35 +01:00
AnHardt 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.
 2015-03-11 10:55:16 +01:00
AnHardt b60761bcff Removed some messages that shouldn't be translated in the Japanese files. 
And made falback to kana work.
 2015-03-11 10:30:38 +01:00
AnHardt 97ae3c5c6a Corected some errors inrtoduced by a faild global replacement. 2015-03-11 10:26:36 +01:00
AnHardt 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.
 2015-03-10 22:34:56 +01:00
alexborro 5bf42066fa Fix typo in configuration.h 2015-03-10 15:06:34 -03:00
alexborro 8a4b62d081 Set more regular setup in configuration.h 2015-03-10 14:41:21 -03:00
AnHardt 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.
 2015-03-10 18:30:09 +01:00
alexborro 60ceca1bc1 Add speed configuration for home-bumping movement 2015-03-10 14:08:32 -03:00
AnHardt 6fc2ccd568 Make use of new remenbering fontswitch. 2015-03-10 18:04:03 +01:00
AnHardt 0f26f3abf2 Add a test_language. 
Will show the compleet utf8 or ASCII charset
To se the second half of ASCII click on "01234..."
 2015-03-10 17:59:28 +01:00
AnHardt 901cf203fe Add legal stuff to marlin_kanji.h 2015-03-10 17:49:16 +01:00
AnHardt 2d5134b0ed Introduce - clean - prepae language files 2015-03-10 17:46:25 +01:00
domonoky d813090d90 Merge remote-tracking branch 'remotes/upstream/Development' into Development 
Conflicts:
	Marlin/Marlin_main.cpp
	Marlin/stepper.cpp
 2015-03-10 10:46:37 +01:00
Scott Lahteine c321c97f35 Merge pull request #1584 from galexander1/stringcleanup 
fix a handful of cases where strtod() was cast to int, instead of just using strtol()
 2015-03-10 01:48:30 -07:00
maverikou 53abc5e2f1 Merge branch 'Development' into delta_auto_bed_level 2015-03-09 22:28:57 +02:00
Mehmet Sutas 956fb2d278 Merge pull request #1 from MarlinFirmware/Development 
update
 2015-03-09 11:05:49 +02:00
Scott Lahteine 978dadf806 Base64 decode AJAX-fetched text properly 2015-03-08 21:54:17 -07:00
Scott Lahteine 0eae9c24bc Merge pull request #1582 from galexander1/deltaconftypo 
fix typo in delta example config introduced in commit 697ee2d
 2015-03-08 21:13:14 -07:00
Scott Lahteine 624f23f550 Merge pull request #1575 from Wurstnase/fix-controllerFan 
Fix controller fan
 2015-03-08 20:36:38 -07:00
maverikou 424c747fb3 Enable M401 and M402 for deltas with allen key z-probes. 2015-03-08 09:57:38 +02:00
maverikou 0d593ab7c1 Fix debug message 2015-03-08 09:41:31 +02:00
Greg Alexander 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.
 2015-03-07 21:14:34 -05:00
Greg Alexander ed7874b4e0 M404 should not use 'N' address as parameter because 'N' is reserved for the line number 2015-03-07 17:35:06 -05:00
Greg Alexander b9dfa5cad4 use code_value_long() instead of (int)code_value() 2015-03-07 17:33:15 -05:00
Greg Alexander 901b03d020 use strtol() instead of strtod() when an integer value is desired 2015-03-07 17:24:26 -05:00
Greg Alexander 4fba7b084f fix typo in delta example config introduced in 
commit 697ee2dc50
 2015-03-07 16:43:41 -05:00
Mehmet Sutas 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.
 2015-03-07 22:43:15 +02:00
maverikou e6862700af Add Z_RAISE_AFTER_PROBING to all config files 2015-03-07 20:55:30 +02:00
maverikou 39d255608d Test an extra delta configuration with auto bed leveling code paths 2015-03-07 20:53:23 +02:00
maverikou 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.
 2015-03-07 20:36:21 +02:00
Wurstnase a5342c942e Update Marlin_main.cpp 2015-03-07 16:47:53 +01:00
Scott Lahteine 0f3b7d5575 Update annotated configurations 
- Also update base configs
 2015-03-07 01:07:40 -08:00
Scott Lahteine c5aa56bc4d Merge branch 'Development' into marlin_configurator 
Latest upstream commits
 2015-03-06 23:00:03 -08:00
Scott Lahteine 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
 2015-03-06 22:14:34 -08:00