zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
3351 commits 1 branch 0 tags 156 MiB
Commit graph

2674 commits

Author SHA1 Message Date
AnHardt 671aaf2dc9 Minor fix for M300 
Corrected wrong order of parameters.
 2015-04-19 13:25:20 +02:00
Scott Lahteine d931220a65 Tweak comments 2015-04-18 23:12:29 -07:00
Scott Lahteine 47847765e2 Add M410 QuickStop command 2015-04-18 23:07:48 -07:00
Scott Lahteine a4ca87ba99 Merge pull request #1933 from bq/Fix_stray_in_configuration 
Fixed compilation error "error: stray ‘\357’ in program"
 2015-04-18 03:56:31 -07:00
Scott Lahteine 5e3bb4bdf3 Merge pull request #1931 from paclema/M303_echo 
Added new PID autotune info, to make easy copy & paste results to marlin
 2015-04-18 03:49:31 -07:00
Ivan Galvez Junquera b99e63a7bf Fixed compilation error "error: stray ‘\357’ in program" in several configuration files. 
Introduced in commit 697ee2dc and later spread to other files.
 2015-04-17 16:10:58 +02:00
paclema 581685a231 Added new PID autotune info, to make easy copy & paste results to marlin 2015-04-17 11:15:09 +02:00
Chris Palmer 483384aaa4 Fixed faulty comment merge 2015-04-17 09:31:53 +01:00
Chris Palmer cc6b7cf3ce Fixed some comment spellings. 2015-04-17 09:28:08 +01:00
Chris Palmer e4595fa24a Fixed jump in speed when using high accelerations on axes with lots of steps. 
I.e., when acceleration * steps per mm > 2,000,000.
This was done by changing MultiU24X24toH16 to take a 32b bit operand.
Removed the claim that stepper.cpp uses the Leib algorithm.
 2015-04-16 23:04:38 +01:00
Wurstnase b09a957fce make 'wait' optional and mark as workaround 2015-04-16 21:42:54 +02:00
Scott Lahteine 63b98b8280 Raise Z for M401 and M402 2015-04-16 07:24:33 -07:00
wurstnase d69da22f7c last_command_time inside get_command() 2015-04-16 16:20:23 +02:00
Scott Lahteine 53be0f3399 Babystep delay 2us 2015-04-16 04:16:36 -07:00
wurstnase 574e2d856e remove config 2015-04-16 13:07:20 +02:00
paclema cde5eee2a5 Removed unnecessary comments 2015-04-15 19:01:09 +02:00
paclema e1b69db6d1 Fixed M48 mismatch between n and P parameter on documentation 2015-04-15 18:17:58 +02:00
CONSULitAS 1de9b568db Example Configuration for K8200: comments/URL/readme 
Example Configuration for K8200 : comments/URL/readme

example_configurations\K8200\Configuration.h:
* add machine specific header
* change STRING_URL to K8200 fork (@thinkyhead: What do you think?)

example_configurations\K8200\readme.md:
* updated documentation
* added URLs and links
 2015-04-15 10:02:13 +02:00
CONSULitAS 0af5e3a04f Example Configuration for K8200: comments/URL/readme 
Example Configuration for K8200 : comments/URL/readme

example_configurations\K8200\Configuration.h:
* add machine specific header
* change STRING_URL to K8200 fork (@thinkyhead: What do you think?)

example_configurations\K8200\readme.md:
* updated documentation
* added URLs and links
 2015-04-15 10:00:41 +02:00
Scott Lahteine 637babb99b Merge pull request #1915 from elgambitero/Development 
Some minor translations to spanish
 2015-04-14 19:59:39 -07:00
elgambitero cb9ac490d4 Some minor translations to spanish 2015-04-14 23:14:52 +02:00
CONSULitAS 3851ac6226 Example Configuration for K8200 back in sync 
example_configurations\K8200\Configuration.h:
* merge upstream changes from default Configuration.h manually
* add some machine specific comments
 2015-04-14 17:12:42 +02:00
CONSULitAS b447a4ffab Merge remote-tracking branch 'upstream/Development' into Development 2015-04-14 15:35:08 +02:00
Scott Lahteine 7336e6df07 Always define old_z, not always z2 2015-04-14 04:55:20 -07:00
Scott Lahteine 5dd87d2e74 Enable all old_z_*_endstop vars for Z_DUAL_ENDSTOPS 
- Potentially addressing #1911
 2015-04-14 04:05:51 -07:00
Scott Lahteine 3f02da646c Make sure axis_active is cleared for #1908 2015-04-14 03:41:37 -07:00
Scott Lahteine e0e68c5cbc Rename servos[] array in Marlin to servo[] 2015-04-14 03:13:25 -07:00
Chris Petersen ffaf1b4f22 Add pin configuration for Brainwave Pro 
Copied from jcrocholl's contributions to the OpenBeamUSA Marlin fork
 2015-04-13 23:46:57 -07:00
Scott Lahteine 642f6a92bc fix type of code_has_value 2015-04-13 18:02:17 -07:00
Scott Lahteine 17ad80c1e1 Spacing in XYZ_CONSTS 2015-04-13 17:58:47 -07:00
Scott Lahteine 09d60e0128 Naming and code comments 2015-04-13 17:17:36 -07:00
Mehmet Sutas 5a9e45cc4a Fix Syntax Error Filament Runout Statement 2015-04-13 22:37:18 +03:00
Scott Lahteine 257a907456 Fix typo in next_bed_check_ms 2015-04-12 23:17:28 -07:00
Scott Lahteine e4b1e8651b next_ vars faster than previous_ 
- Change some `previous_` time vars to `next_` so an add only happens
at intervals
- Fix `HEATER_0_USES_MAX6675` polling too frequently, or not at all
 2015-04-12 23:06:50 -07:00
Scott Lahteine ccddc280be Apply three more commits 2015-04-12 22:47:44 -07:00
Scott Lahteine 74e4b42f7e Default MACHINE_NAME to "3D Printer" 2015-04-12 17:17:41 -07:00
Scott Lahteine 8857b9e921 Use the extruder argument in plan_buffer_line 2015-04-12 16:57:00 -07:00
Scott Lahteine ac2b23f574 Homing fixes 
- Prevent `Z_SAFE_HOMING` from homing Z twice in some cases
- Allow `G28` with XYZ values of 0 to explicitly set the position
- Don’t add `home_offset` when setting XYZ explicitly in `G28`
- Add `code_has_value` function to check for the presence of a numeric
value (could just test for space or nul to allow other types of values)
 2015-04-11 20:06:48 -07:00
Scott Lahteine 055b11814a Additional cleanup of ultralcd.cpp 2015-04-11 04:56:08 -07:00
Scott Lahteine 388dd0cfa5 Fix doubled lcd_quick_feedback 
- MENU_ITEM causes lcd_quick_feedback to be called, so only those calls
to `lcd_goto_menu` outside of the `MENU_ITEM` macro need to set the
`feedback` flag when calling `lcd_goto_menu`.
 2015-04-11 04:45:04 -07:00
Scott Lahteine c6bb98abad machine name for hephestos too 2015-04-11 01:36:24 -07:00
Scott Lahteine ccbe2c4ea3 Apply CUSTOM_MACHINE_NAME to configurations 
- Replace “Mendel” with “RepRap”
 2015-04-10 21:29:42 -07:00
Scott Lahteine 5fe382949b Some G-Codes comment cleanup 2015-04-10 16:16:13 -07:00
Scott Lahteine 8b16ebe705 Break out prevent_dangerous_extrude feature 
- It’s inline here, but could be a macro and duplicated for
`planner.cpp`
 2015-04-09 22:40:37 -07:00
Scott Lahteine 740152ee70 Merge branch 'Development' into cold_extrude 
Latest upstream commits
 2015-04-09 20:23:47 -07:00
Scott Lahteine 5914d9d7de Shuffling declarations.. 2015-04-09 20:21:30 -07:00
Scott Lahteine b328c6e6b6 Shuffling declarations. 2015-04-09 20:05:10 -07:00
Scott Lahteine fb4cefc91d Define lcd_move_[xyz] ahead of lcd_move_menu_axis 2015-04-09 19:33:16 -07:00
Richard Miles 4c3736ed43 Feature: Add RAMPS CNC Controller Board 
Created a new board to make using RAMPS as a CNC machine controller
easier. It maps pin 8 to the spindle and pin 9 to the controller fan.
 2015-04-09 16:32:56 +01:00
Scott Lahteine 9189cc66ab Fix moves for DELTA for MANUAL_BED_LEVELING 
- Use `line_to_current` in place of `plan_buffer_line`
 2015-04-09 04:32:14 -07:00
AnHardt 56fc3a4835 bgr -> bg 
+ update in documentation
 2015-04-09 13:09:18 +02:00
Scott Lahteine 7a1aef1450 Merge pull request #1877 from AnHardt/display-only 
Made encoderPosition and quick_feedback dependant on NEWPANEL
 2015-04-09 03:54:05 -07:00
Scott Lahteine 6096164d79 Merge pull request #1878 from thinkyhead/cold_extrude 
Cold extrude
 2015-04-09 03:41:54 -07:00
Scott Lahteine a488445cbe Fix spelling of "too" 2015-04-09 03:41:31 -07:00
Scott Lahteine b1950a7f25 Merge pull request #1875 from Natealus/Development 
Z Probe inverting not present in example configs, causes error
 2015-04-09 03:37:24 -07:00
AnHardt df50523605 Made encoderPosition and quick_feedback dependant on NEWPANEL 
where the hardware is available.
Fix for #1873
 2015-04-09 12:26:45 +02:00
Scott Lahteine 2ca099d1e7 Merge pull request #1876 from thinkyhead/cold_extrude 
Catch dangerous extrude before trying several
 2015-04-09 03:21:19 -07:00
Scott Lahteine 837ceb9abb Merge pull request #1867 from epatel/Development 
Added sanity check for MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS
 2015-04-09 02:29:47 -07:00
Scott Lahteine a95544f92a Spell adjustment 2015-04-09 02:04:06 -07:00
Scott Lahteine a00ebf03d4 Merge pull request #1868 from AnHardt/LCD_STR 
Moved the definitions of the LCD_STR_* to Conditionals.h
 2015-04-09 01:56:23 -07:00
Scott Lahteine 1269c445ab Catch dangerous extrude before trying several 2015-04-09 01:40:48 -07:00
Natealus 585eee6549 Z Probe inverting not present in example configs, causes error 
The line const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to
invert the logic of the endstop is in the main configuration.h but
wasn't present in the example configuration.h's. Causes a compiling
error with Z Probe enabled. Just added it to all the configs. :)
 2015-04-08 18:57:30 -06:00
AnHardt c5961892e3 Bulgarian for all the Configuration.h's 2015-04-09 01:52:13 +02:00
AnHardt 6248c93f37 Introduction of Bulgarian - language_bgr.h 
Thank you @Nprod!
 2015-04-09 01:26:48 +02:00
AnHardt 540dbb35e2 And an other MSG_BED in Marlin_main.cpp 2015-04-09 01:16:06 +02:00
AnHardt 14d4419e16 Replaced SERIAL_PROTOCOLPGM(MSG_BED) with SERIAL_PROTOCOLPGM("Bed") 
Resolved some warnings in Marlin_main.cpp regarding compares of signed and unsigned integers by replacing 'int' or 'uint16_t' with 'uint8_t'.
 2015-04-08 23:59:01 +02:00
AnHardt ea897654a4 Moved the definitions of the LCD_STR_* to Conditionals.h 
to avoid errors in Marlin_main.cpp. #1860

In the include tree of Marlin_main.cpp the decision between the display types is not made.
To include the right LCD_STR_* ether 'dogm_lcd_implementation.h' or 'ultralcd_implementation_hitachi_HD44780.h' with all their code.
A 'dogm_lcd_implementation.h.h' would be a curiosity.
So i moved both of the definition blocks to conditionals.h

On the long term it could make sense to use the same numbering for the u8glib and the hitachi symbols.
 2015-04-08 21:53:58 +02:00
Edward Patel 7dc64efe67 Added sanity check for MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS 2015-04-08 20:52:48 +02:00
AnHardt 6a514f3dc9 Aplied HAS_LCD_CONTRAST also to Marlin_main.cpp 
and cleaned typo.
 2015-04-08 13:26:29 +02:00
AnHardt a76fb42ca6 Merge https://github.com/MarlinFirmware/Marlin into contrast 2015-04-08 13:05:21 +02:00
AnHardt bcc04192fc Remove Contrast Menu for U8GLIB_ST7920 
The other two devices we use in u8glib have more than only dummy code.
Checked this in the library code.
 2015-04-08 12:56:38 +02:00
Scott Lahteine 4788b59300 Thermistor values for configurator 2015-04-08 03:12:21 -07:00
Scott Lahteine bb917ecda8 Merge pull request #1853 from thinkyhead/dev_version 
Set version to "1.0.3 dev"
 2015-04-08 01:57:51 -07:00
Scott Lahteine caa7734402 Merge pull request #1864 from thinkyhead/is_running 
IsStopped / IsRunning inline
 2015-04-08 01:10:36 -07:00
Scott Lahteine 3162971cd6 current_position not static 2015-04-08 01:05:39 -07:00
Scott Lahteine 27cb90da8b IsStopped / IsRunning inline 2015-04-08 00:56:19 -07:00
Max 07fc2b5b70 Update language_ru.h 2015-04-08 13:18:45 +06:00
Scott Lahteine 756bb5e268 Cleanup formatting in hitachi & dogm lcd 2015-04-07 22:04:10 -07:00
Scott Lahteine 7431ef7e2d Merge branch 'Development' into dev_version 
Latest upstream commits
 2015-04-07 21:14:00 -07:00
Scott Lahteine 43773ff735 Formatting and lcd contrast masking 2015-04-07 21:11:03 -07:00
Scott Lahteine eb6e3886f4 Set version to "1.0.3 dev" 2015-04-07 20:38:43 -07:00
Scott Lahteine cf9b58452c Minimum delay in menu click feedback 
Squished #1849
 2015-04-07 20:20:30 -07:00
Scott Lahteine 1d291be2ba Fix de after PREVENT_DANGEROUS_EXTRUDE 
- Set `de` to 0 when `position[E] = target[E]`
- Address regression mention in #1846
 2015-04-07 20:01:08 -07:00
Scott Lahteine e03da4805b Merge pull request #1774 from epatel/Development 
Mesh bed leveling: Added G29 S3 + finer display steps during manual input + bug fix
 2015-04-07 19:24:46 -07:00
Scott Lahteine f7c4e7e19f Fix G29 not deploying in some instances 2015-04-07 15:38:29 -07:00
Edward Patel a9ed39b12d Moved checks into SanityCheck.h + removed previous added checks. 2015-04-07 22:58:08 +02:00
Edward Patel 002340f32c Merge branch 'Development-Marlin' into Development 2015-04-07 22:49:12 +02:00
Scott Lahteine c379f17117 Encapsulate setting of homing_bump_feedrate 2015-04-06 23:21:33 -07:00
Scott Lahteine 7d2c2f1790 Updates for the configurator 
- Sections in all `Configuration_adv.h`
- Recognize JAPANESE/WESTERN/CYRILLIC options
- Better capturing of comments for tooltips
 2015-04-06 23:16:01 -07:00
Scott Lahteine 967db181d0 Latest upstream commits 2015-04-06 21:46:18 -07:00
Scott Lahteine e502144eda Fixup formatting of last commit 2015-04-06 21:28:14 -07:00
Scott Lahteine d05efa008d Merge pull request #1825 from shaggythesheep/bugfix_no_heaters 
Bugfix: Temperature checks when no heaters in use
 2015-04-06 21:25:22 -07:00
Scott Lahteine d20f42c883 Don't stow the probe until the last grid point! 
- Address Issue #1682 at hash #issuecomment-89756858
 2015-04-06 20:58:09 -07:00
Scott Lahteine 5c2bb05af3 Merge pull request #1839 from AnHardt/fix-statusmessage 
Fix lcd_status_message
 2015-04-06 19:08:25 -07:00
Scott Lahteine d70a4a3847 Merge pull request #1823 from AnHardt/splashscreen 
Disable splash-screen when done once
 2015-04-06 18:48:48 -07:00
Scott Lahteine 56aea5f8e5 Merge pull request #1829 from Natealus/Development 
Azteeg X3 Pro Pin fix ups
 2015-04-06 18:19:33 -07:00
Scott Lahteine 6a860b99dc Merge pull request #1828 from Wackerbarth/Configurator 
Update Configurator Files
 2015-04-06 18:09:26 -07:00
AnHardt ac843fbf3b Fix lcd_status_message 
Because we now can use utf8 with up to 3 bytes per symbol,
lcd_status_message[] must be 3*LCD_WIDTH wide.
Filling up the message, or cutting to length, are fixed to.

Fix for #1832 about at the end.
 2015-04-07 02:33:34 +02:00
Scott Lahteine 6d084c017f Fix typo in FWRETRACT handler 
Should be `retracting` and not `retract`
 2015-04-06 17:04:22 -07:00
Edward Patel d27c82a450 Added check for Delta printers in Mesh, #error not yet supported. 2015-04-06 23:03:06 +02:00
Edward Patel 9a093b2e8f Added #error + mention not to enable ABL and Mesh at the same time 2015-04-06 19:38:59 +02:00
AnHardt 6ae714894e Now the simplycistic solution. 
Just and only display splashscreen only once.
 2015-04-06 12:43:38 +02:00
AnHardt d521693641 Revert "Draw content in display loop only when needed" 
This reverts commit bf04a92cc0.
 2015-04-06 12:31:31 +02:00
Natealus b6f2bff461 Azteeg X3 Pro Pin fix ups 2015-04-05 23:34:56 -06:00
Scott Lahteine d867c18535 Fix compile error with Z_DUAL_ENDSTOPS 2015-04-05 20:48:08 -07:00
Richard Wackerbarth 46474cf2f2 Incorporate @section headers from configurator 2015-04-05 22:39:40 -05:00
Richard Wackerbarth cf66cb8808 Bring configurator up-to-date 2015-04-05 22:38:15 -05:00
Richard Miles 1a5293c2ce Prevents MINTEMP / MAXTEMP when no heaters present 
This commit checks whether or not HEATER_0 is in use, and if not, skips
the MIN / MAX temperature checks.
 2015-04-05 22:27:14 +01:00
Edward Patel 5360158545 Merge branch 'Development-Marlin' into Development 2015-04-05 20:28:44 +02:00
AnHardt bf04a92cc0 Draw content in display loop only when needed 
Example for splash screen.
 2015-04-05 12:53:20 +02:00
AnHardt 9865318f1c Disable splash-screen when done once 
Splash screen was shown with every display init.
That means every time the menus where entered.

Note the 2 in the initialisation.
The buffer is already written in two steps a 512 byte.
Without the 2 only the upper half is shown.
 2015-04-05 12:24:01 +02:00
Scott Lahteine 53eb662908 Have the configurator read from MarlinFirmware repo 2015-04-04 20:19:17 -07:00
Edward Patel d24ea7c03f Added Comment in hope of github seeing these updates 2015-04-05 05:14:06 +02:00
Edward Patel 61de6ecd54 Added change to example Configuration.h's 2015-04-05 04:26:35 +02:00
Edward Patel 2f0081bbb5 Compile error fix! Fix for merge artifacts. 2015-04-05 04:16:16 +02:00
Edward Patel 0e6514e7bd Bug fix! Missed putting z value back in right slot after zigzag mod. 2015-04-05 04:13:34 +02:00
Edward Patel ea10601406 Merge branch 'Development-Marlin' into Development 
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
 2015-04-05 04:06:02 +02:00
Scott Lahteine cb02bc6db4 Merge pull request #1817 from AnHardt/dogm_looptest 
Execute DOGM display-loop less often
 2015-04-04 17:29:56 -07:00
quillford b02a55e60f Fixed scara directions 
Config said for a delta instead of for a scara
 2015-04-04 15:26:35 -07:00
Scott Lahteine 6c5f07c5cb Merge pull request #1813 from thinkyhead/fixup_probing 
Fix bad thermal runaway trigger
 2015-04-04 14:41:43 -07:00
AnHardt 340d165a9c Reduce display updates for dogm displays 
In 'if (encoderPastThreshold || LCD_CLICKED)' lcdDrawUpdate was not set.

'lcd_status_update_delay'-loop was not effective in  function
lcd_status_screen().
The loop prevented the update of the status screen but not the displays
update.
Shifted the loop into lcd_update().
 2015-04-04 22:02:24 +02:00
AnHardt 418d22d7b3 Revert "Testloop cleanup" 
This reverts commit 6361404b91.
 2015-04-04 18:33:36 +02:00
AnHardt 6361404b91 Testloop cleanup 
Shifted condition should still be in.
 2015-04-04 17:56:13 +02:00
AnHardt 6d4b3f0d6a Move the condition before the loop 
Result see: https://youtu.be/AEnBzdu9_tk
Dot is moving not so fast -> less executed loops.
 2015-04-04 17:49:39 +02:00
AnHardt 4cb7dfc546 Move the 'alive dot' in every displayloop 
Result see: https://www.youtube.com/watch?v=tdu7J0i-c4g
Loop is executed several times per display update.
 2015-04-04 17:34:28 +02:00
Scott Lahteine b0f198c153 heater_index above its use 2015-04-04 06:18:08 -07:00
Scott Lahteine 60f8e0386f More thermal runaway states 2015-04-04 05:45:36 -07:00
Scott Lahteine f9dbd73652 Fix tr_target_temperature type - float! 2015-04-04 05:25:53 -07:00
Scott Lahteine c83faa9c5e Merge pull request #1811 from thinkyhead/fixup_probing 
Compare indices instead of floats for probe actions
 2015-04-04 05:14:59 -07:00
Scott Lahteine 61f8394361 Compare indices instead of floats for probe actions 2015-04-04 05:01:16 -07:00
Scott Lahteine a98183b463 Merge pull request #1809 from Wackerbarth/LanguageCleanup 
Deferring default definition made #undef unnecessary
 2015-04-04 04:37:20 -07:00
Scott Lahteine 41ded7e996 Merge pull request #1805 from thinkyhead/fixup_probing 
Optimize coordinate copying, fix EXTRUDER_RUNOUT_PREVENT
 2015-04-04 03:49:54 -07:00
Richard Wackerbarth 4119738e69 Deferring default definition made #undef unnecessary 2015-04-04 05:48:07 -05:00
Scott Lahteine 6f06d33be5 Fix missing refresh_cmd_timeout function 2015-04-04 03:47:25 -07:00
Scott Lahteine 2d099a2c70 Fix missing backslash in macro 2015-04-04 03:35:16 -07:00
Scott Lahteine 0f9b29e6c5 Merge pull request #1803 from Natealus/Development 
Z_PROBE_ENDSTOP Pin for Azteeg X3 Pro
 2015-04-03 23:45:05 -07:00
Scott Lahteine 0935084141 Fix manage_inactivity 
- Document `manage_inactivity` function
- Allow `EXTRUDER_RUNOUT_PREVENT` to work with all extruders
- Use faster `memcpy` for copying coordinates
 2015-04-03 23:42:50 -07:00
Scott Lahteine c065da52ec Spacing and spelling 2015-04-03 22:54:48 -07:00
Scott Lahteine a3e129e091 Merge pull request #1801 from thinkyhead/fixup_probing 
Minor optimizations
 2015-04-03 22:30:01 -07:00
Natealus ab11f90da0 Z_PROBE_ENDSTOP Pin for Azteeg X3 Pro 
Just a simple #ifdef Z_PROBE_ENDSTOP to define the pin for it. Also has
a couple commented lines for switching Z_MIN_PIN if needed.
 2015-04-03 23:14:03 -06:00
Scott Lahteine 8680b515b0 Fix missing tmp_extruder -> target_extruder 2015-04-03 22:12:49 -07:00
Natealus a6ba40ae48 Compiling error temperature.cpp with multiple extruders defined 
It wouldn't compile because of this line in temperature.cpp it turns out
it was just a stray ( that didn't line up with the previous lines so I
just made it in line with the rest and it compiled fine.
 2015-04-03 23:09:31 -06:00
Scott Lahteine fc3c76fc16 Fix #1800 2015-04-03 22:04:42 -07:00
Scott Lahteine c185912c19 Latest upstream commits, mostly 2015-04-03 21:58:48 -07:00
Scott Lahteine 1e5c18bb14 Add code_value_short and SERIAL_CHAR 2015-04-03 21:43:30 -07:00
Scott Lahteine e0d4368cb5 Minor code cleanup, move NUM_AXIS out of config 2015-04-03 20:45:24 -07:00
Scott Lahteine 4c7af484f8 Merge pull request #1787 from thinkyhead/fixup_tr 
Fix: thermal_runaway_protection triggered by target temperature increase
 2015-04-03 20:06:56 -07:00
Scott Lahteine c747becec1 Merge pull request #1796 from thinkyhead/pidbed_temp_eeprom 
Add PIDTEMPBED to EEPROM
 2015-04-03 20:03:38 -07:00
Scott Lahteine 84e4edaea7 Add M48 comment for #1794 2015-04-03 19:52:00 -07:00
Scott Lahteine 9ba55baa5b Track target temperature separately for each heater 2015-04-03 19:42:40 -07:00
Scott Lahteine 528e32a1d4 Fix timeout in thermal_runaway when temperature is set higher 2015-04-03 19:34:55 -07:00
Scott Lahteine b98ebd517e disable / enable_all_steppers functions 2015-04-03 19:25:22 -07:00
Scott Lahteine 713953d8c1 Upstream commits, allow no extruder in M105 2015-04-03 19:16:38 -07:00
Scott Lahteine 8f893eb8df Merge pull request #1798 from thinkyhead/fixup_probing 
Fix probe height at G28 start
 2015-04-03 19:03:00 -07:00
Scott Lahteine dde7e11f8e Merge branch 'Development' into fixup_tr 
Latest upstream commits
 2015-04-03 18:56:52 -07:00
Scott Lahteine abd7fc36b6 Fix probe height at G28 start 2015-04-03 18:54:55 -07:00
Scott Lahteine 610c8c5471 Merge pull request #1795 from thinkyhead/fixup_probing 
Finish pin tests
 2015-04-03 18:44:44 -07:00
Scott Lahteine e4934164e4 Merge pull request #1790 from Wurstnase/fix_home_z 
fix feedrate for homing z
 2015-04-03 18:35:09 -07:00
Scott Lahteine a469d796e1 Add cleanups needed for #1772 2015-04-03 18:14:57 -07:00
Scott Lahteine c0ca26cd50 Merge branch 'Development' into fixup_probing 
Latest upstream commits
 2015-04-03 18:05:17 -07:00
Scott Lahteine 5c1f08a35f Merge pull request #1772 from croadfeldt/Merge_cleanup 
Z_PROBE_ENDSTOP
 2015-04-03 18:04:31 -07:00
Scott Lahteine db7b0ea0cf Merge pull request #1569 from Wackerbarth/Development 
Incorporating Build Numbers
 2015-04-03 16:56:31 -07:00
Scott Lahteine 92119d0f7d Static delta[] for SCARA 2015-04-03 16:46:56 -07:00
Scott Lahteine 007a4bd421 Adjust spacing in view function 2015-04-03 16:41:58 -07:00
Scott Lahteine 424d5495e4 Add PIDTEMPBED to EEPROM 2015-04-03 16:38:05 -07:00
Scott Lahteine 6b919e14c1 Group all universal variables 2015-04-03 15:45:41 -07:00
Scott Lahteine 21cd2e4fae Merge branch 'Development' into fixup_probing 
Latest upstream commits
 2015-04-03 15:32:15 -07:00
Scott Lahteine 0e8182bbf2 Additional pin tests, cleanup 2015-04-03 15:31:35 -07:00
Wurstnase 45565b680d second wrong feedrate 2015-04-03 18:01:28 +02:00
Wurstnase 581b2aae04 fix feedrate for homing z 
max_feedrate is in mm/s. line_to_destination needs a feedrate in mm/min because there is feedrate/60.
 2015-04-03 16:11:32 +02:00
Edward Patel 48b1c3822f Merge branch 'Development-Marlin' into Development 2015-04-03 00:46:30 +02:00
Richard Wackerbarth ccdaea51ba Add KosselPro 2015-04-02 09:20:24 -05:00
Richard Wackerbarth f4599143eb Allow M115 to better reflect the build 2015-04-02 09:20:24 -05:00
Richard Wackerbarth 34c7d45879 Hook for Auto-generated Build Version 
The automatic versioning system extracts a
build version number from the SCM system

That versioning information is written to the file
_Version.h, a file that is NOT preserved in the SCM.

If such a file will be present,
we include it here to utilize the parameters
that are defined therein.
 2015-04-02 09:20:24 -05:00
Scott Lahteine c756b4cf07 Comment tweak 2015-04-02 06:11:03 -07:00
AnHardt 23cd54755f Fix typo in Marlin_main.cpp 
related to current_position[Z_AXIS] and retract_zlift.

'+ =' -> '+='

Fix for #1786
 2015-04-02 14:50:31 +02:00
Scott Lahteine e96df67630 Clarify thermal_runaway_protection 
- Add comments documenting `thermal_runaway_protection`
- Add an enum for the thermal runaway states
- Add macros for temperature helper functions
- Fix a glitch with the z probe sled in homeaxis
 2015-04-02 05:10:14 -07:00
Chris Roadfeldt 0afe6696f0 Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup 2015-04-01 19:31:20 -05:00
Chris Roadfeldt 59994bd519 Not doing network admin work, pin not ping... :) 2015-04-01 19:24:42 -05:00
Chris Roadfeldt 916f59e35f Spaces not tabs in language.h. 
Catch unlikely but possible error and head crash when using
Z_PROBE_REPEATABILITY_TEST
 2015-04-01 19:22:05 -05:00
Scott Lahteine 66b3b53e76 Merge pull request #1762 from AnHardt/MiMa 
Fix MIN&MAX temperatures again
 2015-04-01 16:52:07 -07:00
Edward Patel 6b91b7b411 Mesh bed leveling: Added G29 S3 + finer steps in manual probing. 
* Use "G29 S3 Xn Yn Zn.nn" to modify bad probed point manually
* Changed manual Z steps from 0.05 to 0.025 and made brought it to Configuration.h
 2015-04-01 21:18:51 +02:00
Chris Roadfeldt 26dc80bf2d Typo fixed... 2015-04-01 13:47:17 -05:00
Chris Roadfeldt 2966ae2022 Fix Z_PROBE_PING not declared, allows code to compile if Z_PROBE_ENDSTOP 
is not used.
 2015-04-01 13:32:25 -05:00
Wurstnase 67d5e7973e old bump_divisor for cartesian/corexy-printer 
some people are starting to ask why homing is so slow. this is the old standard hard-coded value.
 2015-04-01 20:17:49 +02:00
Chris Roadfeldt bb41edc2ef Fixed extra #endif 2015-04-01 12:13:25 -05:00
Chris Roadfeldt a57862e29f Cleaning up code in prep for merge with upstream. 2015-04-01 11:40:24 -05:00
Chris Roadfeldt 745d9fe1a4 Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup 
Conflicts:
	Marlin/Marlin_main.cpp
 2015-04-01 10:31:02 -05:00
AnHardt 488666832b Remove the previously introduced () 2015-04-01 13:40:05 +02:00
Scott Lahteine 443468df8d Merge pull request #1771 from AnHardt/iss1770 
Added new - changed entries from Fix up LCD_PROGRESS_BAR
 2015-04-01 02:13:30 -07:00
Scott Lahteine 9593f09b99 Merge pull request #1764 from thinkyhead/probe_leveling 
Fix homing and leveling
 2015-04-01 02:00:39 -07:00
Scott Lahteine 72c7de3570 Cleanup M48 2015-04-01 01:48:45 -07:00
Scott Lahteine 97a258b0b0 Clean up, document home_axis 2015-04-01 01:44:13 -07:00
AnHardt 831016b09f Added new - changed entries from Fix up LCD_PROGRESS_BAR 
for when no LCD is defined.
Fix for #1770.
 2015-04-01 10:17:17 +02:00
Chris Roadfeldt a508d835db Changed Z_PROBE_AND_ENDSTOP to Z_PROBE_ENDSTOP. 
Updated documentation in Configuration.h.
Cleaned up and commented some code relating to Z_PROBE_ENDSTOP.
Separated Z_MIN_ENDSTOP and Z_PROBE_ENDSTOP completely.
 2015-04-01 02:14:55 -05:00
Chris Roadfeldt fdb4ddbdea Merge remote-tracking branch 'MarlinFirmware/Development' into Development 2015-04-01 00:52:08 -05:00
atfield90 d273c90d53 Added support for Atmega 1281 chip 2015-04-01 05:15:27 +02:00
Scott Lahteine 1c7391717e Include sync_plan_position_delta for SCARA also 2015-03-31 19:58:03 -07:00
Scott Lahteine 8231fb166d Merge pull request #1758 from AnHardt/MENU_MULTIPLIER_ITEM 
Fix: Audio feedback for MENU_MILTIPLIER_ITEM click
 2015-03-31 19:29:48 -07:00
Scott Lahteine 0b57a2ab8b Merge pull request #1757 from bq/Translation-strings 
Added new trasnslatable labels.
 2015-03-31 18:56:25 -07:00
Scott Lahteine 18bb6be80e Fix homing and leveling 
- Include the current Z when raising the axis after and between probing
- Add `sync_plan_position_delta` for parity with `sync_plan_position`
- Clean up and clarify `M48`, `dock_sled`, and others
 2015-03-31 18:52:19 -07:00
AnHardt 3f2e863206 Improve conditions for HAS_TEMP 
and use them in temperuture.h

Flattened the if structure - the preprocessor is doing the work - not the Arduino. Arduino.
 2015-04-01 02:56:14 +02:00
AnHardt 85f8a26ba4 Fix MIN&MAX temperatures again 
replaced GE0 with th matching GEX in the second row.
added some ()
 2015-04-01 00:48:04 +02:00
AnHardt 19b11dfdd7 Fix can't enter MENU_MULTIPLIER_ITEM 2015-03-31 18:29:16 +02:00
Chris Roadfeldt c89b8368ee Merge remote-tracking branch 'MarlinFirmware/Development' into Development 
Conflicts:
	Marlin/Marlin_main.cpp
 2015-03-31 11:08:36 -05:00
Ivan Galvez Junquera d08782386b Added new trasnslatable labels. 
* Added MSG_END_HOUR and MSG_END_MINUTE labels to all language files.
* Available translations:
  EN, FR, DE, ES, IT, PT, PT-BR.
 2015-03-31 16:59:43 +02:00
Scott Lahteine 97a69d9b1c Correct XYZ after obtaining plan_bed_level_matrix 
The current position needs to be updated by using the inverse
`plan_bed_level_matrix` on X, Y, and Z. All moves in the planner are
transformed by the `plan_bed_level_matrix` from this point forward.
 2015-03-31 04:24:13 -07:00
Scott Lahteine 5f6962dd90 Merge pull request #1755 from thinkyhead/fixup_config 
Raise when not retracting
 2015-03-31 03:47:01 -07:00
Scott Lahteine ae89ccd2c7 Use Z_RAISE_BETWEEN_PROBINGS 2015-03-31 03:45:21 -07:00
Scott Lahteine 9a5a7a3f68 Raise when not retracting 
Code to raise the probe before retraction is good, but the code should
always raise the probe, not just when retracting
 2015-03-31 03:38:03 -07:00
Scott Lahteine 6ff1620fcb Merge pull request #1753 from thinkyhead/fix_extruder_offset 
Fix EXTRUDER_OFFSET compiler error
 2015-03-31 03:21:45 -07:00
Scott Lahteine cda4bd4ad9 Correct the comment about M206 2015-03-31 03:20:15 -07:00
Scott Lahteine 935592cf6a offsets off by default 2015-03-31 02:50:52 -07:00
Scott Lahteine 2a45922afe Restore extruder_offset, init more simply 2015-03-31 02:49:47 -07:00
Scott Lahteine 28792e5731 Fix typo in assignment 2015-03-31 02:10:49 -07:00
Scott Lahteine bb6174524f Fix EXTRUDER_OFFSET compiler error 
- Addressing issue #1741
 2015-03-31 02:08:57 -07:00
Scott Lahteine 571652c49b Fix LCD click 
- Make the default LCD click sound more pleasant
- Fix warnings about bed temperature runaway
 2015-03-31 01:41:24 -07:00
Chris Roadfeldt 45ece5afb1 Merge remote-tracking branch 'MarlinFirmware/Development' into Development 2015-03-31 03:07:57 -05:00
Chris Roadfeldt 17707e7479 Fixed Z_PROBE_PIN pullup bug. 
Documented some additional areas that should be addressed if Z_PROBE is
fully separated from Z_MIN or Z_MAX.
Fixed a documentation error in sanity checks. Servos start at 0 not 1.
 2015-03-31 02:56:41 -05:00
Scott Lahteine 21ab44cfa7 Merge pull request #1750 from thinkyhead/fixup_config 
Bring all configs up to date
 2015-03-30 23:49:04 -07:00
Scott Lahteine 50145266cd Merge pull request #1748 from thinkyhead/raise_before_homing 
Apply Z_RAISE_BEFORE_HOMING before homing XY
 2015-03-30 23:37:41 -07:00
Scott Lahteine a117b6bff6 Merge pull request #1747 from thinkyhead/progress_bar_tweak 
Fix up LCD_PROGRESS_BAR
 2015-03-30 23:37:28 -07:00
Scott Lahteine 3348b3bf0c Allow SD_FINISHED_RELEASECOMMAND to be undefined 2015-03-30 23:31:48 -07:00
Scott Lahteine 82794fa5f7 Add delta generic not renaming 2015-03-30 23:25:04 -07:00
Scott Lahteine ba2c7cb467 Update configs with all the latest 2015-03-30 23:24:33 -07:00
Chris Roadfeldt ec1d9c0b8f Use Z_PROBE_ENDSTOP_INVERTING when checking pin status. 2015-03-31 01:06:01 -05:00
Chris Roadfeldt 3175c70c79 Manually synching back up with MarlinFirmware/Development. 2015-03-31 00:11:11 -05:00
Chris Roadfeldt faac2af4af Merge remote-tracking branch 'origin/Development' into Development 2015-03-31 00:03:07 -05:00
Chris Roadfeldt 3be00cce6f Merge remote-tracking branch 'MarlinFirmware/Development' into Development 
Conflicts:
	Marlin/Configuration.h
 2015-03-30 23:59:01 -05:00
Chris Roadfeldt e08f8eed05 Revert 06f767d..cba5692 
This rolls back to commit 06f767d608.
 2015-03-30 23:51:36 -05:00
Scott Lahteine 5e82ed4f30 Restore ENDSTOPPULLUPS in Configuration.h 2015-03-30 21:15:16 -07:00
Chris Roadfeldt 992b07ca57 Don't disable Z_RAISE_BEFORE_HOMING when Z_PROBE_AND_ENDSTOP is enabled. 2015-03-30 22:58:10 -05:00
Chris Roadfeldt cba5692673 Merge remote-tracking branch 'MarlinFirmware/Development' into Development 
Conflicts:
	Marlin/Marlin_main.cpp
	Marlin/stepper.cpp
 2015-03-30 22:33:05 -05:00
Scott Lahteine 8500c80b33 Apply Z_RAISE_BEFORE_HOMING before homing XY 2015-03-30 20:22:21 -07:00
Scott Lahteine 92b54aa27e #define HAS_POWER_SWITCH 2015-03-30 19:44:53 -07:00
Scott Lahteine 5519882eea Fix up LCD_PROGRESS_BAR 
- Some messages should not expire with `PROGRESS_MSG_EXPIRE`.
- Simplify conditional for progress bar with sanity checks.
- Rename `messageTick` to `expireStatusMillis` and make it the expire
time.
 2015-03-30 18:00:54 -07:00
Scott Lahteine 6864280803 Use elif and parentheses in conditionals 2015-03-30 16:52:27 -07:00
Scott Lahteine 8c136a5ab5 Conditionals and comments for PS = 0 2015-03-30 16:50:05 -07:00
Scott Lahteine 2faed961ce Allow POWER_SUPPLY 0 for no power switch 2015-03-30 16:39:47 -07:00
Scott Lahteine baa6787393 Merge pull request #1740 from thinkyhead/fixup_homing 
Apply leveling for DELTA
 2015-03-30 15:45:33 -07:00
AnHardt 9ac7dc675e Make filament display on dogm_... same as hitachi... 
Thanks @MagoKimbra.
 2015-03-30 16:56:21 +02:00
AnHardt 50a732360a Replace extrudemultiply by extruder_multiply[active_extruder] 
Fix for #1460.

Seems to work with only one extruder. Can't test this myself with more.
 2015-03-30 13:35:03 +02:00
Scott Lahteine e63076504d Merge pull request #1733 from AnHardt/c20 
Get back folder symbols on Hitachi displays
 2015-03-30 01:57:00 -07:00
Scott Lahteine 41d258697a Pass the z for after probing to retract_z_probe 
A `z_before` value is passed to probe_pt, but the `retract_z_probe`
function assumes that Z is 0, doesn’t add `current_position[Z_AXIS]` as
other cases do. This may be superfluous, so this is a test, and will be
reverted if it has no effect.
 2015-03-30 00:45:02 -07:00
croadfeldt 06f767d608 Merge remote-tracking branch 'upstream/development' into development 2015-03-30 02:10:49 -05:00
Scott Lahteine b47fa8c064 Merge pull request #1735 from AnHardt/compilerCandy 
Remove some further warnings
 2015-03-29 23:55:19 -07:00
Scott Lahteine e96db1cd6c Make G29 shared function inline 2015-03-29 23:21:39 -07:00
Scott Lahteine d73b169de3 Apply leveling for DELTA, 
- Fix `prepare_move` function not calling `adjust_delta`
- Add more shorthand for plan_buffer_line.
- Fix wrong `federate` usage, assuming they are all mm/m
- Minor `stepper.cpp` cleanup
 2015-03-29 23:16:12 -07:00
Scott Lahteine 85b67e5223 Merge pull request #1738 from thinkyhead/fixup_homing 
Fix G29 E and M48 n
 2015-03-29 20:08:19 -07:00
Scott Lahteine ce44bee28b Small code reduction 2015-03-29 19:45:14 -07:00
Scott Lahteine 0213f7f016 Cleanup case for M666 2015-03-29 19:39:43 -07:00
Scott Lahteine 803425e12c Fix G29 E and M48 n 
- Users prefer `G29 E` to work like `M48 E` so fixed that
- `M48 n` replaced with `M48 P` (or `p`). `n` legacy support
- Shorten some strings to save precious bytes
- Smaller code for 3-point probing
 2015-03-29 18:56:09 -07:00
Scott Lahteine 1e9999711c Merge pull request #1736 from thinkyhead/fixup_homing 
Fix G28 homing Y with X
 2015-03-29 18:27:17 -07:00
Scott Lahteine d738b7acdd Merge pull request #1724 from Natealus/Development 
Viki 2 Pins from Manual and Azteeg X3 Pro Endstop Reswap
 2015-03-29 18:26:32 -07:00
Scott Lahteine e8ae51bfe3 Fix G28 homing Y with X 
- Fixed a typo causing G28 to home incorrectly
- Added documentation to G28
- Added homeXYZ bools to neaten the code
- Added a note about home_offsets being questionable
 2015-03-29 18:06:59 -07:00
AnHardt 7b2550a604 Times can't be negative. 
cardreader.cpp needs temperature.h for autotempShutdown() when
AUTOTEMP is defined but warns about unused variables.
Unpublished variables by putting them in to temperature.cpp.
 2015-03-30 01:58:46 +02:00
AnHardt 507efa771b Remove unused variable fan_rot 
and satisfy the compiler about the implicit compare.
 2015-03-30 01:46:38 +02:00
AnHardt 2b959a7752 Some additional {} to make the compiler happy. 2015-03-30 01:42:35 +02:00
AnHardt 0f1bd6e4a7 In ST7920_SWSPI_SND_8BIT(uint8_t val) parameter is unsigned 
therefor in macro ST7920_WRITE_BYTE(a) cast a to uint8_t
to make the compiler happy.
 2015-03-30 01:40:58 +02:00
AnHardt 81bab8739d Get back folder symbols on Hitachi displays 
and make use of column 20.
 2015-03-29 17:29:48 +02:00
Chris Roadfeldt a9802c95b3 Ensure Z_PROBE_PIN is defined if Z_PROBE_AND_ENDSTOP is. 2015-03-29 04:18:37 -05:00
Chris Roadfeldt 62834a1c43 Don't deploy probe on Z Axis homing if Z_PROBE_AND_ENDSTOP is enabled, 
unless Z_SAFE_HOMING is.
 2015-03-29 03:55:41 -05:00
Chris Roadfeldt 666fad3494 Typo fixed in sanity check. 2015-03-29 03:25:03 -05:00
Chris Roadfeldt 08a7aa16c5 Don't deploy Z Probe on Z homing if Z_PROBE_AND_ENDSTOP is defined. 2015-03-29 03:21:48 -05:00
Chris Roadfeldt 80285251cc More config cleanup work for Z_PROBE_AND_ENDSTOP. 2015-03-29 03:06:20 -05:00
Chris Roadfeldt fe4549cd83 Config file Z_PROBE_AND_ENDSTOP description clean up. 2015-03-29 03:04:59 -05:00
Chris Roadfeldt 82d2f11129 More additional sanity checks for Z_PROBE_AND_ENDSTOP 2015-03-29 02:53:55 -05:00
Chris Roadfeldt 05134f0807 Additional Sanity Checks for Z_PROBE_AND_ENDSTOP 2015-03-29 02:51:51 -05:00
Chris Roadfeldt c75a5e8c55 Fixed typo for Z_PROBE_AND_ENDSTOP support in pins_RAMPS.h. 
Confirmed Sanity checks are working.....
 2015-03-29 02:38:08 -05:00
Chris Roadfeldt a98ac4033b Added Z_PROBE_PIN to #define for Z_PROBE_AND_ENDSTOP support. 2015-03-29 02:36:26 -05:00
Chris Roadfeldt 6125124d6c Config file cleanup for Z_PROBE_AND_ENDSTOP support. 2015-03-29 02:29:16 -05:00
Chris Roadfeldt 324c14943b Bug fixes for Z_PROBE_AND_ENDSTOP. 
Code cleanup for Z_PROBE_AND_ENDSTOP.
Added Z_PROBE_PIN to pins_RAMPS_13.h
 2015-03-29 02:16:09 -05:00
Natealus ca5821aa57 Made #ifdef DELTA branch instead 
Another fellow here gave me the idea to do it this way
 2015-03-29 01:08:00 -06:00
Natealus 04fda6b3e9 Undesired behavior with endstops swapped 
Made my swap commented out so its the option not the default.
 2015-03-29 00:55:47 -06:00
Natealus ca1477d830 Revert "Undesired behavior with endstops swapped" 
This reverts commit 15028e9b08.
 2015-03-29 00:52:53 -06:00
Natealus 15028e9b08 Undesired behavior with endstops swapped 
I made my changes to swap MIN and MAX endstops on the Azteeg X3 Pro the
option rather than the default to fix unexpected reversal.
 2015-03-29 00:42:40 -06:00
Nate Stokes 18245c6cd2 Update pins_RAMBO.h 
Updated for the changes that Thinkyhead made before I submitted mine.
 2015-03-28 22:29:54 -06:00
Natealus 234a9d0b12 Viki 2 Pins from Manual 
I added in the pins into the new board files for the Azteeg X3, X3 Pro,
Printrboard, and Rambo. I'm sure it can be added for others too but
these are the manual specified pins. Just like many things here though,
I can't test for the boards other than the Azteeg X3 Pro. Hopefully it
works smoothly for everyone who happens on this nifty display. :)
 2015-03-28 22:11:12 -06:00
Scott Lahteine a22efc5f11 Merge pull request #1597 from Wurstnase/g29_auto_script 
G29 auto script
 2015-03-28 20:54:17 -07:00
Scott Lahteine 62a3da9618 Merge pull request #1723 from thinkyhead/tweak_g92 
Tweak G92
 2015-03-28 20:53:37 -07:00
Scott Lahteine afff968e88 ARRAY_BY_EXTRUDERS, shorthand to sync planner 
- Add some documentation to planner and stepper headers
- Patch up RAMBO pins with undefs
- Add `sync_plan_position` inline to set current XYZE
- Swap indices in `extruder_offset` to fix initialization values
 2015-03-28 20:33:21 -07:00
Scott Lahteine 2b0c25a091 Tweak G92 to call plan_set_position only once, yes? 2015-03-28 19:18:24 -07:00
Natealus 22bea37393 Azteeg X3 Pro Pin Revisions 
I added the fan pins in here and left them at -1 in configuration_adv.h
and it works fine. Pinned for a 4 extruder from 1-4 and HE5 being the
controller fan, HE6 being the Extruder Auto Fan/Water pump in the Kraken
case, and HE7 being for part cooling fan. Added in descriptions for the
MIN MAX pin swap and for servo motor additions.
 2015-03-28 20:14:42 -06:00
Scott Lahteine 93dc0d0518 Merge pull request #1718 from AnHardt/blink 
Move variable blink from ultralcd.h to dogm_lcd_implementation.h
 2015-03-28 16:20:33 -07:00
Scott Lahteine edb67ea165 Patch generic delta config 
- Addressing issue mentioned at #1699
 2015-03-28 14:13:25 -07:00
AnHardt c481c3b180 Move variable blink from ultralcd.h to dogm_lcd_implementation.h 
to avoid warnings about unused blink.

Concentrate definitions of variables in dogm_lcd_implementation.h to one place.

Make only local used variable currentfont static.
 2015-03-28 13:14:38 +01:00
Chris Roadfeldt 059052889f Further Sanity Checks for Z_PROBE_AND_ENDSTOP. 2015-03-28 06:08:04 -05:00
Chris Roadfeldt 8b81f20c61 Filling in more places where Z_PROBE_PIN and Z_PROBE_AND_ENDSTOP need to 
be.
Added Sanity Check for it.
Added hook so it's enabled.
 2015-03-28 05:55:42 -05:00
Chris Roadfeldt fd823449ad Added serial message for Z Probe trigger. 2015-03-28 05:42:38 -05:00
Chris Roadfeldt 92eb8109ab Fix declaration of old_z_probe_endstop. 2015-03-28 05:09:48 -05:00
Chris Roadfeldt 44b88b41a2 Added credit for code. 2015-03-28 05:01:04 -05:00
Chris Roadfeldt 2979b40a7a Fixed typo in Z Probe and Endstop section. 2015-03-28 04:41:03 -05:00
Chris Roadfeldt 9f3ff14008 Enabled separate Z Probe and Z Axis endstop use at same time. 
Typo fixes in comments in existing code.
 2015-03-28 04:31:51 -05:00
Scott Lahteine b14be7235e Merge pull request #1585 from galexander1/strtod_e_fix 
Fix `code_value` (so `G1X1E2` isn't evaluated as `G1 X100 E2`)
 2015-03-27 20:49:03 -07:00
Scott Lahteine ba871e46bf Fix compiler warnings 
- Patched up for most included configurations
 2015-03-27 20:29:05 -07:00
Scott Lahteine ffe0df4b36 Latest upstream commits 2015-03-27 18:30:56 -07:00
Scott Lahteine bc2f249cc6 Merge pull request #1622 from AnHardt/tm-utf-minus-kanji 
The big Language Pack
 2015-03-27 18:24:19 -07:00
Scott Lahteine abfcbd793f Merge pull request #1693 from chris-bo/rework_lcd_beeper 
use only one implementation for beeper feedback
 2015-03-27 17:03:38 -07:00
Scott Lahteine 55739a4efe Fix Z_APPLY_STEP 2015-03-27 17:02:11 -07:00
Scott Lahteine df02b992b0 Fix redundant_temperatrure_raw setting 2015-03-27 16:37:22 -07:00