bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
13,580 Commits 1 Branch 4 Tags
709d037b8ef421240f9ba597f9fa354169858bd5
Commit Graph

11558 Commits

Author SHA1 Message Date
Scott Lahteine
4b648793f2 Use ENABLED with DISABLE_[INACTIVE_][XYZ] 2016-03-13 22:15:45 -07:00
Scott Lahteine
73a59a4e45 Allow ENABLED(b) to work with "true" and "false" 2016-03-13 22:15:01 -07:00
Blue-Marlin
c73f1b2471 Extend stack_overflow_protection for lcd_move_e and _lcd_level_bed 
Extend stack_overflow_protection for lcd_move_e() and _lcd_level_bed() with
a refined method of 3050.
 2016-03-13 13:59:44 +01:00
Scott Lahteine
f4a3efd35e Merge pull request #3116 from thinkyhead/rc_fix_value_edit_bug 
Fix value edit click bug
 2016-03-13 04:08:43 -07:00
Scott Lahteine
3f5fbbd398 Merge pull request #3124 from jbrazio/bugfix/update-g29-auto-level-bed-topography 
Update the bed topography output done by G29
 2016-03-13 03:51:43 -07:00
Scott Lahteine
c16c47954c Merge pull request #3141 from esenapaj2/RCBugFix 
follow-up the PR #3131
 2016-03-13 03:37:39 -07:00
Scott Lahteine
30c3a21d1f Merge pull request #3112 from thinkyhead/rc_support_MAX31855 2016-03-13 03:30:48 -07:00
Scott Lahteine
81d759efb6 Merge pull request #3138 from jbrazio/bugfix/m109-r-could-wait-forever 2016-03-13 03:26:34 -07:00
Scott Lahteine
2179f598bf Merge pull request #3122 from thinkyhead/rc_group_filament_change 2016-03-13 03:25:38 -07:00
Scott Lahteine
62a9b9902d Merge pull request #3133 from thinkyhead/rc_machine_uuid_in_m115 2016-03-13 03:23:54 -07:00
Scott Lahteine
f928894c38 Merge pull request #3132 from thinkyhead/rc_heating_failed_err 2016-03-13 03:23:14 -07:00
esenapaj2
236a44c83b follow-up the PR #3131 
follow-up the commit 7326d63ce0
update Configration_adv.h of Hephestos2
delete unnecessary spaces
 2016-03-13 19:12:39 +09:00
Scott Lahteine
f9ded2a7c4 Wrap macros to prevent bad expansions 2016-03-12 22:38:55 -08:00
jbrazio
a645860431 All print timer related activity now uses print_job_start(), print_job_timer() or print_job_stop() 2016-03-12 07:16:39 +00:00
jbrazio
1981e53d68 M109 R option if misused could cause a wait-forever situation 2016-03-12 06:24:24 +00:00
Scott Lahteine
7976e29399 Use MACHINE_UUID in M115 
Addressing #2879. The M115 report should display `MACHINE_UUID` but it
always displays `UUID`.
 2016-03-11 05:34:48 -08:00
Scott Lahteine
81aab828e2 Fix a "Heating failed" error 
Addressing #3085. If the target_temperature is set directly it never invokes or disables the timer set in `start_watching_heater`, so after _stopping a print_ or turning off _all heaters_ you could get a “Heating failed” error.
 2016-03-11 05:07:48 -08:00
Scott Lahteine
0c48eaf3de Expose motor current in more configs, disable by default 2016-03-11 02:25:36 -08:00
Elijah Snyder
e8b10d2836 Adding PWM_MOTOR_CURRENT flag to help expose PWM_MOTOR_CURRENTS in Configuration_adv.h similar to DIGIPOT_MOTOR_CURRENT 2016-03-11 02:25:36 -08:00
João Brázio
4d4a842cfb Update the bed topography output done by G29 2016-03-10 13:24:17 +00:00
Scott Lahteine
89838cdb10 Move step macros to stepper_indirection.h 2016-03-10 04:34:55 -08:00
João Brázio
793cd0ae3b Clean up the code a bit 2016-03-10 11:52:43 +00:00
Scott Lahteine
27f244ba2c Support MAX31855 as Temperature Sensor -3 2016-03-10 02:49:54 -08:00
Scott Lahteine
ce639b8b03 Group FILAMENT_SENSOR options together 2016-03-10 02:41:37 -08:00
Scott Lahteine
3fd31976c3 Reduce code in stepper.cpp with macros 2016-03-10 01:42:58 -08:00
Scott Lahteine
b45a0c4c60 Fix bugs in edit submenus so they return to origin 
Expected behavior: After editing a value the menu should return to the
previous place with the edited item selected.
Actual behavior: Either the top (back) item from the previous screen is
selected, or the menu jumps up another level.
Solution: Pass the correct arguments to `lcd_goto_menu` on click when
editing a value.
 2016-03-09 21:06:56 -08:00
jbrazio
986b508ff7 Print timer now stops when it sees the last extruder temperature being shutdown 2016-03-08 18:11:02 +00:00
AnHardt
fd5414c6ea Z_RAISE_BEFORE_HOMING -> MIN_Z_HEIGHT_FOR_HOMING 
rebased
corrected spelling
changed to #elif for error

Still with MIN_Z_HEIGHT_FOR_HOMING but con be done with (folder wide) search-replace when we have a better name.
 2016-03-08 17:50:23 +01:00
Scott Lahteine
b7928a000a Merge pull request #3108 from AnHardt/M110+ 
M110 and M29 rework
 2016-03-08 03:54:07 -08:00
Scott Lahteine
5cba0b4187 Merge pull request #3111 from thinkyhead/rc_drop_old_condition 
Drop obsolete test for leading "N"
 2016-03-08 03:07:25 -08:00
Scott Lahteine
302d1bfbc4 Drop obsolete test for leading "N" 2016-03-08 02:25:11 -08:00
AnHardt
37b857e8ec M110 ang M29 rework 
Add 'ok' output for G29 actually closing the file.
Handle M110 when received without linenumber/checksumm.
 2016-03-07 22:27:01 +01:00
esenapaj2
29e09c7c3e update example configurations 
update old comments
update or delete deprecated definitions
complement forgotten updates
adjust spacing
some cosmetic changes
 2016-03-07 22:03:33 +09:00
Scott Lahteine
fac85f6fa1 Merge pull request #3102 from jbrazio/bugfix-g28-multiple-z-movements 
Bugfix: G28 was lifting Z-axis multiple times
 2016-03-07 03:52:00 -08:00
jbrazio
642e3699ce Z-axis was being lift multiple times if Z_SAFE_HOMING was enabled and Z_RAISE_BEFORE_HOMING was greater than zero 2016-03-07 03:49:11 +00:00
Scott Lahteine
501f63802a Merge pull request #3077 from Blue-Marlin/watchdogreset-in-kill 
Add Watchdog timer reset in kill()
 2016-03-06 16:21:39 -08:00
Scott Lahteine
1002eb67c8 Update name of st_get_axis_position_mm in stepper.h 2016-03-06 15:46:39 -08:00
Jaroslav Škarvada
d229c58df6 Fixed Makefile to work with Melzi2 boards on arduino-1.6.x 
- also by default use ${HOME}/Arduino as install directory which may be more
sane, especially with arduino packages provided by distributions
- bump arduino version to 106 (this seems to be useless)
- program firmware through the USB serial which is more comfortable way how
to program the firmware
- use 57600 programing speed by default which seems to be more reliable
with arduino bootloaders (at least with those shipped with the Melzi2 boards)

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
 2016-03-06 20:12:01 +01:00
Jaroslav Škarvada
7dde761aa6 Fix MELZI_MAKR3D to use correct motherboard 
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
 2016-03-06 19:33:33 +01:00
Scott Lahteine
eafbc5e0cc Add AJ4P pins and fix RAMBO pins 2016-03-06 05:52:01 -08:00
Scott Lahteine
cf792fd8d8 Update configurations to use RAMPS 1.4 2016-03-06 05:52:01 -08:00
Scott Lahteine
cacf04f8a7 Base RAMPS-like boards on RAMPS 1.4 2016-03-06 05:52:00 -08:00
Scott Lahteine
50e3482e0a Handle RAMPS 1.3 as the special case 2016-03-06 05:52:00 -08:00
Scott Lahteine
679be3294f Rename RAMPS 1.3 pins for RAMPS 1.4 2016-03-06 05:52:00 -08:00
Scott Lahteine
f18d3f451a Limit LCD move_to_x/y coordinates for deltas 
Related to MarlinFirmware/MarlinDev#270
 2016-03-06 05:52:00 -08:00
Scott Lahteine
988332c67a Cosmetic tweaks from dev 2016-03-06 05:52:00 -08:00
Scott Lahteine
2690d8568e DOGLCD width/height in Conditionals.h 2016-03-06 05:51:59 -08:00
Scott Lahteine
614febaaf3 Fix acceleration limits 
See: https://github.com/Ultimaker/Marlin/pull/7
 2016-03-06 05:51:59 -08:00
Scott Lahteine
13ef12ad3f Fix power calculations 
As suggested by @max-pau in #3073 - #3074
 2016-03-06 05:51:59 -08:00
Scott Lahteine
e2b022cce2 Include #3053 2016-03-06 05:51:59 -08:00