c686069ccd
Revert "Remove 6x9 font"
...
This reverts commit e6cb8ee188
2015-03-24 17:13:05 +01:00
b00a531df8
Revert "Removed now unneded FONT_STATUSMENU"
...
This reverts commit 8c5bb38748
2015-03-24 17:01:56 +01:00
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
512a0056a9
Merge pull request #1658 from thinkyhead/planner_oh_planner
...
Cleanup of planner code
2015-03-23 22:21:27 -07:00
8db4fd7177
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
2015-03-23 22:08:50 -07:00
c6df5f4d85
small text correction
2015-03-23 21:55:03 -07:00
8dd94ccf58
Initial list from perusing the commit logs
2015-03-23 21:54:06 -07:00
4afe50b920
Merge pull request #1651 from thinkyhead/config_testing
...
Configuration sanity-checking
2015-03-23 21:23:13 -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
e2576b1ac5
Merge pull request #1674 from thinkyhead/fix_temperature_minmax
...
Cleanup temperature code
2015-03-23 21:10:03 -07:00
8b004d26c1
Merge pull request #1681 from thinkyhead/marlin_configurator
...
A logo for the Marlin wiki
2015-03-23 21:02:38 -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
b1a7f74ee4
A logo for the Marlin wiki
2015-03-23 18:25:31 -07:00
2606da9e81
Merge pull request #1678 from Nutz95/Development
...
Report changes from previous PR (#1670 ) from old code base including :
2015-03-23 15:29:51 -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
36474be8eb
Merge pull request #1675 from Wurstnase/Development
...
fix bad insertion config again
2015-03-23 00:33:56 -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
f65f61fa72
Merge pull request #1672 from thinkyhead/fix_probeaction
...
Fix mangled probe_pt calls
2015-03-22 22:40:52 -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
e0a42d3f9a
Merge pull request #1666 from maverikou/fix_1507
...
Fix 1507
2015-03-22 21:25:05 -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
88ed5268d2
Merge pull request #1663 from thinkyhead/fix_dual_z_1659
...
Fix compile error with `*_DUAL_STEPPER_DRIVERS`
2015-03-21 16:48:08 -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
a96bfee76a
Merge pull request #1660 from thinkyhead/fix_temperature_minmax
...
Fix temperature min/max test
2015-03-21 15:04:42 -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
b5970492e2
Merge pull request #1656 from AnHardt/menufix
...
Fix for menus failing to scroll
2015-03-20 21:09:26 -07:00
af14c684b5
Minor optimizations to planner code
...
- Prefetch values used more than once
2015-03-20 20:57:06 -07:00
