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
15eb5d35a2
Merge branch 'Development' into config_testing
...
Latest upstream commits
2015-03-21 15:42:45 -07:00
19df90622b
Include Conditionals.h file in update
2015-03-21 15:40:20 -07:00
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
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
63abeaff38
Merge branch 'Development' into config_testing
...
Latest upstream commits
2015-03-21 15:03:06 -07:00
3703694e30
Fix temperature min/max test
...
- Base tests on all thermistors/thermocouples, not just heater 0
2015-03-21 14:23:43 -07:00
3d0a060a7a
Added G29 command
2015-03-21 14:50:47 +01:00
c516747847
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
2015-03-21 14:49:52 +01:00
af14c684b5
Minor optimizations to planner code
...
- Prefetch values used more than once
2015-03-20 20:57:06 -07:00
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
64e3d33893
Fix shrinked menucode
...
by updating 'encoderPosition' in END_MENU() line 1.
2015-03-20 23:36:14 +01:00
a7e89d4cfa
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
2015-03-20 15:46:01 +01:00
8c5bb38748
Removed now unneded FONT_STATUSMENU
2015-03-20 14:12:12 +01:00
2176a22d42
Fix count_direction initializer
...
- Addressing #1625
2015-03-20 05:45:05 -07:00
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
cb6942d4a7
Merge branch 'Development' into config_testing
...
Get upstream commits
2015-03-20 05:30:36 -07:00
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
5644ad6809
Fix hiliting of edit items
2015-03-20 04:29:35 -07:00
63d5d28085
Merge branch 'Development' into config_testing
...
Latest upstream changes
2015-03-20 04:15:18 -07:00
526a755a66
Merge pull request #1652 from AnHardt/PIDdebug
...
PID debug
2015-03-20 04:14:08 -07:00
a1c240b0a4
Delta supports some auto bed leveling options
2015-03-20 04:04:45 -07:00
5112cf8422
Added comment for the EEPROM storage
2015-03-20 11:46:47 +01:00
4619d80524
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
2015-03-20 11:45:06 +01:00
199151a4ed
Merge pull request #1650 from AnHardt/beautify
...
Beautivy statusscreen
2015-03-20 03:38:02 -07:00
2424713a8f
Merge pull request #1640 from AnHardt/warning6
...
codepos not used in gcode_M28()
2015-03-20 02:58:00 -07:00
b6d381f863
Divide up Conditionals to get LCD items early
2015-03-20 02:50:28 -07:00
e85061d20d
Added changes to the 'new' Configuration.h s
2015-03-20 10:36:29 +01:00
33c7c6e11d
Conditionals.h requires Arduino.h
2015-03-20 01:27:14 -07:00
8ade04b78e
Felix and Hephestos configs
...
- Not sure why these are showing as all new
2015-03-19 22:25:05 -07:00
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
a61f679568
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
2015-03-20 02:28:35 +01:00
c87faa69ed
Shortened mesh_plan_buffer_line()
2015-03-20 02:18:49 +01:00
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
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
fa889cd6e1
Beautivy statusscreen
...
by shifting things some pixels around
2015-03-19 22:13:37 +01:00
7279e4f82f
Small code tweaks re lcd.print
2015-03-19 14:01:33 -07:00
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
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
a547dc2148
Merge branch 'Development' into optimize_menu_code
...
Get upstream changes
2015-03-19 13:31:37 -07:00
9c1f6e7ac7
Merge remote-tracking branch 'upstream/Development' into Development
2015-03-19 18:49:34 +01:00
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
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
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
a534ac197a
Merge pull request #1621 from AnHardt/remove--6x9-font
...
Remove 6x9 font
2015-03-18 23:10:42 -07:00
80e0ee10ca
Merge pull request #1631 from AnHardt/iss1593
...
Decrease KILL_DELAY
2015-03-18 19:10:38 -07:00
4ce79920e5
Merge pull request #1635 from AnHardt/warnings1
...
Negative times are unlikly
2015-03-18 19:10:12 -07:00
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
be3f2dc1d9
Merge pull request #1636 from AnHardt/warning2
...
lcd_control_retract_menu() is conditional.
2015-03-18 19:09:05 -07:00
8d396584bf
Merge pull request #1637 from AnHardt/warning3
...
lcd_autostart_sd() has two conditions.
2015-03-18 19:08:33 -07:00
