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