Commit Graph

2522 Commits

Author SHA1 Message Date
Scott Lahteine
8dd94ccf58 Initial list from perusing the commit logs 2015-03-23 21:54:06 -07:00
Scott Lahteine
4afe50b920 Merge pull request #1651 from thinkyhead/config_testing
Configuration sanity-checking
2015-03-23 21:23:13 -07:00
Scott Lahteine
0d81abe1c9 Merge branch 'Development' into config_testing
Latest upstream commits
2015-03-23 21:13:04 -07:00
Scott Lahteine
e2576b1ac5 Merge pull request #1674 from thinkyhead/fix_temperature_minmax
Cleanup temperature code
2015-03-23 21:10:03 -07:00
Scott Lahteine
8b004d26c1 Merge pull request #1681 from thinkyhead/marlin_configurator
A logo for the Marlin wiki
2015-03-23 21:02:38 -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
b1a7f74ee4 A logo for the Marlin wiki 2015-03-23 18:25:31 -07:00
Scott Lahteine
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
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
Scott Lahteine
36474be8eb Merge pull request #1675 from Wurstnase/Development
fix bad insertion config again
2015-03-23 00:33:56 -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
4fbb80567e Get upstream commits 2015-03-22 23:07:22 -07:00
Scott Lahteine
f65f61fa72 Merge pull request #1672 from thinkyhead/fix_probeaction
Fix mangled probe_pt calls
2015-03-22 22:40:52 -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
Scott Lahteine
e0a42d3f9a Merge pull request #1666 from maverikou/fix_1507
Fix 1507
2015-03-22 21:25:05 -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
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
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
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
a96bfee76a Merge pull request #1660 from thinkyhead/fix_temperature_minmax
Fix temperature min/max test
2015-03-21 15:04:42 -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
b5970492e2 Merge pull request #1656 from AnHardt/menufix
Fix for menus failing to scroll
2015-03-20 21:09:26 -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
Scott Lahteine
0d869703ca Merge pull request #1655 from thinkyhead/fix_count_direction_init
Fix count_direction initializer
2015-03-20 05:45:33 -07:00
Scott Lahteine
2176a22d42 Fix count_direction initializer
- Addressing #1625
2015-03-20 05:45:05 -07:00
Scott Lahteine
cb6942d4a7 Merge branch 'Development' into config_testing
Get upstream commits
2015-03-20 05:30:36 -07:00
Scott Lahteine
e3f04c876a Merge pull request #1653 from thinkyhead/lcd_menu_hilite
Fix hiliting of edit items in LCD menus
2015-03-20 04:37:20 -07: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