Commit graph

1094 commits

Author SHA1 Message Date
Gabe Rosenhouse 8c5675c290 Use language.h instead of English literals for "bed" 2014-02-16 17:16:00 -08:00
Gabe Rosenhouse 0f7393a13e Refactor 'accurate' auto bed leveling to use probe_pt() 2014-02-16 10:44:15 -08:00
Gabe Rosenhouse c4fbb44d6d Refactor 3-point auto bed leveling to use probe_pt() 2014-02-16 10:44:08 -08:00
Gabe Rosenhouse ad2c6488c7 Add probe_pt(), useful for auto bed leveling 2014-02-16 10:38:29 -08:00
nothinman 7dcd350941 A few changes to Russian, changed LCD strings to be <=17 characters. 2014-02-13 11:58:14 +00:00
daid c31bb2b7ad Only show the ZProbe offset when auto-bed-leveling is enabled. 2014-02-13 11:48:55 +01:00
daid 46f5bea19f Add configurable beep for UltiPanel. 2014-02-13 11:17:33 +01:00
daid d16a770855 Ultimainboard 2.x does not has a PS_ON pin. 2014-02-13 10:57:03 +01:00
daid 71bb3a8133 Add comments for Ultimainboard 2.0 configuration. 2014-02-13 10:53:46 +01:00
daid 9b7d87e885 Remove duplicate contrast define. 2014-02-13 10:50:17 +01:00
daid 816f0a678a Merge pull request #768 from whosawhatsis/Marlin_v1
multiple FWretract fixes
2014-02-13 09:14:57 +01:00
whosawhatsis 6e43398509 G10/G11 bugfixes
Previous version was broken by using G92 E0 between retract and recover.
2014-02-12 13:03:00 -08:00
whosawhatsis d6c5c503d4 correct feedrate units in comments for M207/M208 2014-02-12 13:02:47 -08:00
nothinman 15d6116188 Merge pull request #689 from cajun-rat/tidy
Use C++ initialization list
2014-02-12 16:38:11 +00:00
Martin Lukasik 0b9ecf3824 Language cleanup, part 1. 2014-02-12 13:21:26 +00:00
whosawhatsis b5ba5c1465 Merge branch 'Marlin_v1' of https://github.com/whosawhatsis/Marlin into Marlin_v1 2014-02-11 19:06:03 -08:00
whosawhatsis 78e7654601 Keep FWRETRACT values in terms of millimeters when using M200
for volumetric E units
2014-02-11 19:05:35 -08:00
whosawhatsis 3f6d44d40b Keep FWRETRACT values in terms of millimeters when using M200 for volumetric E units 2014-02-11 18:50:11 -08:00
nothinman 5f797ca29f Updated Polish, changed default firmware URL to Marlin. 2014-02-11 22:38:01 +00:00
Mark Hanford 0778f5f028 Add missing entries to the new Aragonian language. 2014-02-11 14:40:53 +00:00
Mark Hanford 54bab3e0d0 Merge branch 'Marlin_v1' into localisation
Conflicts:
	Marlin/language.h
2014-02-11 14:35:28 +00:00
Mark Hanford bdd0211aeb Move strings in ultralcd.cpp into language.h. 2014-02-11 13:54:43 +00:00
Daniel Martinez c8e5a82d49 keep English as default lang. 2014-02-09 18:24:24 +01:00
Daniel Martinez f64592e362 Add Aragonese translation 2014-02-09 18:19:37 +01:00
ErikZalm ac74f45dc0 Merge pull request #752 from MatixYo/patch-3
Update language.h
2014-02-09 17:52:26 +01:00
MatixYo 36086d3ca4 Update language.h
Updated Polish translations.
2014-02-07 19:15:51 +01:00
Jim Morris d485988bec fix typo 2014-02-05 14:39:45 -08:00
Jim Morris 8a1fd25363 Default is to not define digipot_i2c 2014-02-05 14:28:23 -08:00
Jim Morris 5097c57d3a Added pins for Azteeg X3 Pro under motherboard 68 2014-02-05 14:25:42 -08:00
Jim Morris b819fc53ca Add Azteeg X3 Pro as motherboard 68
Add digipot i2c control for MCP4451
Allow M907 to set i2c digipot currents in amps
Fix Makefile to allow Azteeg motherboards
Fix Makefile to allow Wire libraries only
Add beeper pin for Azteeg X3 Pro
2014-02-05 01:47:12 -08:00
ErikZalm e1ae7952eb Merge pull request #743 from Opticalworm/Marlin_v1
Improved support for panelolu2 encoder and buzzer
2014-02-03 12:33:10 -08:00
David Forrest a5f53f0cf3 Heater wattage reporting for M105 using EXTRUDER_WATTS and BED_WATTS 2014-02-03 14:50:28 -05:00
Ronald 8d162e5bd7 Improved support for panelolu2 encoder and buzzer
I added #define for LCD_FEEDBACK_FREQUENCY_HZ and
LCD_FEEDBACK_FREQUENCY_DURATION_MS  which is used to alter the default
buzzer sound.

When selecting Panelolu2 in configuration.h:
- it automatically sets the correct ENCODER_PULSES_PER_STEP and
ENCODER_STEPS_PER_MENU_ITEM.
- if LCD_USE_I2C_BUZZER is defined it will also set the default
LCD_FEEDBACK_FREQUENCY_HZ and LCD_FEEDBACK_FREQUENCY_DURATION_MS

When selecting the sanguinololu 1284p the following is true:
- its now enables  LARGE_FLASH
- It enables the gcode M300 when the panelolu2 LCD_USE_I2C_BUZZER is
defined
2014-02-03 07:45:03 +00:00
whosawhatsis b2c11ba980 Change diameter code to 'D'
For some reason that I can’t figure out, the decimal is dropped when
using ’S’ for the code.

Also some minor code improvements to M200.
2014-02-01 18:49:25 -08:00
ErikZalm 61059385a3 Merge pull request #737 from whosawhatsis/M200
M200 implementation
2014-02-01 10:37:49 -08:00
whosawhatsis 856edfcc0d Fixed math
This is why I wanted to sleep on the code I wrote while falling asleep
rather than immediately submitting a pull request.
2014-01-31 08:43:11 -08:00
ErikZalm 0d81ae77bc Merge pull request #727 from drf5n/oversampling
temperature.cpp: Actually use OVERSAMPLENR in the oversampling calculation.
2014-01-31 07:09:10 -08:00
ErikZalm 84df13f7d1 Merge pull request #721 from drf5n/lcdOnly
Enable basic ULTRA_LCD screen w/o encoders and menus.
2014-01-31 07:07:12 -08:00
ErikZalm 4c7e9502ad Merge pull request #718 from drf5n/temptableRes
createTemperatureLookupMarlin.py: Add resolution comments and format for...
2014-01-31 07:06:02 -08:00
ErikZalm 652a0f6b5a Merge pull request #717 from drf5n/tpins2
fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/...
2014-01-31 07:05:20 -08:00
ErikZalm 96a0cdc541 Merge pull request #716 from drf5n/maketeensy
Makefile: Update for Arduino 1.0.5 and Teensyduino dependent boards (HAR...
2014-01-31 07:04:29 -08:00
whosawhatsis d24df7af2c M200 implementation 2014-01-31 00:54:19 -08:00
David Forrest f0b8d5ba3d createTemperatureLookupMarlin.py: Change comment to refer to actual program name. 2014-01-29 23:34:22 -05:00
David Forrest 50f44d9249 createTemperatureLookupMarlin.py: Truncate to short after application of OVERSAMPLENR for improved resolution. 2014-01-29 23:24:07 -05:00
David Forrest f5b5dd8038 createTemperatureLookupMarlin.py: Add output of Steinhart-Hart coefficients. 2014-01-29 22:59:47 -05:00
David Forrest 76cf07c3f7 Configuration.h: Use OVERSAMPLENR in dT_PID definition. 2014-01-21 23:25:51 -05:00
David Forrest 476c7193d8 temperature.cpp: Use OVERSAMPLENR in oversampling calculation. 2014-01-21 16:49:03 -05:00
whosawhatsis f08bb8bb6a Previous commit borked. 2014-01-19 22:06:45 -08:00
whosawhatsis b1f8f492c6 Remove previous_millis_cmd update from extruder runout prevention code
This seems to defeat the purpose of previous_millis_cmd, preventing the
time elapsed from previous_millis_cmd from ever reaching
max_inactive_time or stepper_inactive_time while the heat was on.
2014-01-19 19:22:08 -08:00
whosawhatsis 8a5eaa3c9b Fix crash after home bug
Fixes a bug in the Extruder Runout Prevention feature that caused the
extruder to move back to “current_position” after a move if it was
activated while the move was in progress. For long home moves (which
are longer than the dimensions of the machine’s working area), this
would cause the machine to crash into the far end of its travel after
homing. This usually occurred on the Z axis, which could result in
damage to the machine if you don’t hit the reset button in time.
2014-01-19 19:11:51 -08:00