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
8db4fd7177
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
2015-03-23 22:08:50 -07:00
0d81abe1c9
Merge branch 'Development' into config_testing
...
Latest upstream commits
2015-03-23 21:13:04 -07:00
01740fd9c6
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
2015-03-23 21:12:36 -07:00
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
03fa9fae9f
Merge branch 'Development' into fix_temperature_minmax
...
Latest upstream commits
2015-03-23 20:42:48 -07:00
1fac388664
Revert measurement loop
2015-03-23 15:18:22 -07:00
703f3b38c4
Merge remote-tracking branch 'upstream/Development' into Development
2015-03-23 17:40:49 +01:00
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
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
e6f6c6e3a1
fix bad insertion config again
2015-03-23 08:32:48 +01:00
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
34a41648ab
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
2015-03-22 23:40:29 -07:00
4fbb80567e
Get upstream commits
2015-03-22 23:07:22 -07:00
7717e1ce33
Fix bad insert in configuration
2015-03-22 21:48:46 -07:00
146501215f
Fix mangled probe_pt calls
...
- Address issue #1669
- Remove the TOPO_ORIGIN configuration setting
2015-03-22 21:45:20 -07:00
15345cc249
Corrected Z_PROBE_ALLEN_KEY behaviour.
2015-03-22 13:54:51 +02:00
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
6c96f32069
Blind fix for #1507
2015-03-22 13:54:21 +02:00
379348487e
Removed malplaced comment.
2015-03-22 12:21:31 +01:00
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
582cd780cd
Fix compile error with *_DUAL_STEPPER_DRIVERS
...
- Patch up macros in stepper.cpp
2015-03-21 16:43:47 -07:00
9b3462f73f
Refactor SCARA calibration. Save some lines of code and possibly ROM.
2015-03-22 00:37:24 +01:00
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
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
