Bo Herrmannsen
3bb9b31515
changed boot logo a bit to test if fat wall goes away
2015-01-09 12:51:21 +01:00
Steffen Vogel
da192c521f
Merge pull request #1333 from andrewsil1/development
...
Fix grammar/typos in new Configuration.h option
2015-01-08 00:34:01 +01:00
Erik van der Zalm
3a30d45c2e
Revert "issue 968 for dev branch"
2015-01-07 23:40:17 +01:00
andrewsil1
269ec9f87f
Fix grammar/typos in new Configuration.h option
...
(For the SLOW_PWM_HEATERS option)
2015-01-07 12:41:09 -08:00
Todd Swindoll
506353892e
Rambo Pin documentation and servo support
...
Updated pins reference and servo support.
cross referenced between Rambo 1.1, 1.2, and 1.3
2015-01-07 11:02:05 -06:00
Steffen Vogel
8d7bfd03d8
moved/renamed documentation stuff to top-level directory
2015-01-07 15:33:50 +01:00
Bo Herrmannsen
3c9e6b7b62
added link for pic to hex converter
2015-01-07 14:28:51 +01:00
Bo Herrmannsen
0e760274bd
changed reprap logo to marlin logo
2015-01-07 14:27:51 +01:00
Bo Herrmannsen
b291a422e9
added square png version of logo
...
406*406 pixels
2015-01-07 13:00:37 +01:00
Luis E Alvarado
7ae548cf34
Update Marlin Firmware URL
2015-01-07 05:26:47 -06:00
Erik van der Zalm
8f9067faa6
Added marlin logos. (Designed by Ahmet Cem TURAN)
2015-01-07 12:21:16 +01:00
Bo Herrmannsen
addf52fd4a
Merge pull request #1328 from DinoMesina/development
...
Some corrections and new features
2015-01-06 23:52:32 +01:00
Dino Del Favero
5cfe13f240
Correct some mistakes
2015-01-06 21:55:08 +01:00
Dino Del Favero
c7e2d73039
Merge branch 'development'
...
ok
2015-01-06 20:18:03 +01:00
Alex Borro
422a958a34
Fix CoreXY speed calculation
...
For cartesian bots, the X_AXIS is the real X movement and same for
Y_AXIS.
But for corexy bots, that is not true. The "X_AXIS" and "Y_AXIS" motors
(that should be named to A_AXIS
and B_AXIS) cannot be used for X and Y length, because A=X+Y and B=X-Y.
So we need to create other 2 "AXIS", named X_HEAD and Y_HEAD, meaning
the real displacement of the Head.
Having the real displacement of the head, we can calculate the total
movement length and apply the desired speed.
2015-01-06 16:39:48 -02:00
Dino Del Favero
038fccd7a1
I have added some code in the "temperature.cpp" for have the possibility of control the time of the states with the heater drived by relays, with this feature now it is possible use PID function in conjunction with relay to control the temperature. I have made some tests and the temperature stay always in the range of +-1°C from the setted temp.
...
There is the possibility of turn on this features adding "#define SLOW_PWM_HEATERS" in Configuration.h
2015-01-06 18:32:17 +01:00
DinoMesina
6730335657
Update Configuration.h
2015-01-06 18:06:02 +01:00
Bo Herrmannsen
4ffecdbf7d
Merge pull request #1313 from wgm4321/Development
...
Re-enable filament menu with recalc fix when enabling/disabling mm3
2015-01-06 13:47:49 +01:00
Steffen Vogel
672f764b4d
replaced ASCII GPL v3 license by markdown version
...
moved new COPYING file to top-level directory to make it more visible and remove clutter from Marlin subduer
2015-01-06 11:49:05 +01:00
Steffen Vogel
f25e793cff
rename stepper lookup table scipt to be consistent with termistor lookup table script
2015-01-06 10:30:20 +01:00
Steffen Vogel
df17a6a1b4
fix #1305 by proposed workaround (thanks gaby64)
2015-01-06 10:29:26 +01:00
Steffen Vogel
f7e65935fb
make use of power operator
2015-01-06 10:28:43 +01:00
Steffen Vogel
4e02aff9b5
automatically determine min/max temp for terminator
2015-01-06 10:28:19 +01:00
Steffen Vogel
81363bc441
more cleanups
2015-01-06 10:27:40 +01:00
Steffen Vogel
95f4a55820
refactored termistor table calculation to be in line with wikipedia's article about Steinhart-Hart coefficients
2015-01-06 08:24:59 +01:00
Steffen Vogel
21205cc3d8
more cleanups in the termistorTable generation script
2015-01-06 08:23:51 +01:00
Steffen Vogel
fb0996b5db
improved output aligment and precision
2015-01-06 08:20:52 +01:00
Steffen Vogel
538231edfd
cosmetic whitespace cleanup and comments added/updated
2015-01-06 08:20:20 +01:00
wgm4321
067b509479
Re-enable filament menu with recalc fix when enabling/disabling mm3
2015-01-05 22:29:29 -05:00
wgm4321
a19f2f8ae7
Disable volumetric menu item due to missing recalc of of multipliers when enabled/disabled
2015-01-04 22:15:16 -05:00
wgm4321
f24dda9700
Revert "Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3"
...
This reverts commit dd7e4ee97f
.
2015-01-04 22:08:41 -05:00
wgm4321
ec4681ab6b
Revert "Add "Detailed Z Probe" menu item with ABL is defined."
...
This reverts commit 2b9722f387
.
2015-01-04 21:53:37 -05:00
wgm4321
dd7e4ee97f
Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3
2015-01-04 21:44:55 -05:00
wgm4321
2b9722f387
Add "Detailed Z Probe" menu item with ABL is defined.
2015-01-04 21:42:16 -05:00
Dan Royer
9472bbe51d
issue 968 for dev branch
...
try, try again.
If 'OK' is garbled on sending PC won't receive it. Both machines will
wait on each other forever. This resends OK if nothing is heard from PC
for a while to avoid this bad case.
2015-01-04 12:17:46 -08:00
alexborro
d2b6e62996
Merge pull request #1309 from philfifi/fix_temp_runaway
...
temp runaway: proper cast to prevent any overflow.
2015-01-04 12:55:58 -02:00
Philippe L
30248214c7
temp runaway: proper cast to prevent any overflow.
2015-01-04 14:23:31 +01:00
Bo Herrmannsen
c5f138ea07
Merge pull request #1291 from alhirzel/Development
...
Define analogInputToDigitalPin only if needed
2015-01-04 12:53:41 +01:00
odewdney
652895d656
try different proproc for CI failure
2015-01-04 11:15:23 +00:00
Bo Herrmannsen
3d9f4ac757
Merge pull request #1303 from wgm4321/Development
...
Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER ...
2015-01-04 01:29:26 +01:00
wgm4321
04fb34c7ff
Add English defines for filament menu to non-English to prevent compile errors until translated
2015-01-03 17:28:05 -05:00
wgm4321
f8aa5ff771
Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER defined
2015-01-03 17:10:13 -05:00
odewdney
39fae9e3a3
Fix progmem warning
...
Borrow code from https://github.com/arduino/Arduino/issues/1793
2015-01-03 21:30:16 +00:00
Alexander Hirzel
f36fd3ddec
Merge branch 'Development' of https://github.com/ErikZalm/Marlin into Development
2015-01-02 12:39:39 -05:00
Scott Lahteine
b5e50cdd4e
Move scripts and documentation to subfolders
2015-01-02 08:53:09 -08:00
Alexander Hirzel
eed451e034
rework analogInputToDigitalPin definition
2015-01-02 11:14:20 -05:00
Lane Roberts
1f520a5a8c
Due to the fix for #1248 , X and Y probe offsets must not be floats.
...
The compiler does not support comparing float values: "error: floating constant in preprocessor expression"
The loss in X/Y precision shouldn't matter for Z probes, as most microswitches or inductive sensors are larger than 1mm square anyway.
2015-01-02 11:12:16 -05:00
wgm4321
b32be2dc64
Fix syntax error caused by previous changes.
2015-01-02 11:12:16 -05:00
wgm4321
edac64e7d2
Add Filament menu and add Filament/Retract settings to config store.
2015-01-02 11:12:15 -05:00
Alexander Hirzel
ecda6cdc0a
Fix typo, PID_BED_POWER -> MAX_BED_POWER
2015-01-02 11:12:15 -05:00
David Forrest
f3e503e725
temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.
2015-01-02 11:12:15 -05:00
David Forrest
1d5d853c9a
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
2015-01-02 11:12:15 -05:00
Bo Herrmannsen
63da6900b0
Merge pull request #1282 from vandarin/Development
...
Due to the fix for #1248 , X and Y probe offsets must not be floats.
2015-01-02 15:35:40 +01:00
Bo Herrmannsen
a18b625534
Merge pull request #1261 from wgm4321/Development
...
Add Filament menu and add Filament/Retract settings to config store.
2015-01-02 15:35:29 +01:00
Alexander Hirzel
ae12ad0d6c
Fix typo, PID_BED_POWER -> MAX_BED_POWER
2015-01-02 01:38:03 -05:00
alexborro
80b17ab573
Merge pull request #1285 from drf5n/PID_CI_v2
...
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
2015-01-01 22:56:21 -02:00
David Forrest
625860f086
temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.
2015-01-01 19:24:42 -05:00
David Forrest
6583bb781d
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
2015-01-01 19:11:42 -05:00
Lane Roberts
2701dd8a17
Due to the fix for #1248 , X and Y probe offsets must not be floats.
...
The compiler does not support comparing float values: "error: floating constant in preprocessor expression"
The loss in X/Y precision shouldn't matter for Z probes, as most microswitches or inductive sensors are larger than 1mm square anyway.
2014-12-31 12:34:59 -06:00
Grogyan
6b82415c81
Update pins.h
...
Somehow the pin definitions for the MAX6675 Slave Select/Chip Select got changed back to the hardware SPI SS/CS.
Pin 49 cannot be used as that is used by the SD card socket to detect if an SD card is present.
Pin 53 is the Hardware SPI SS, which is dedicated, nicely, to the SD card SS and therefore cannot be used as the MAX6675 SS
Pin 66 is in Aux2 port adjacent to the Hardware SPI interface port on RAMPS 1.4, and is currently not used for anything.
2014-12-31 13:04:16 +13:00
Bo Herrmannsen
692a01b1c7
Merge pull request #1277 from thinkyhead/fix_regressions
...
Fix regressions affecting compilation
2014-12-30 16:49:08 +01:00
Scott Lahteine
2ec2bf1564
Fix regressions affecting compilation
...
This fixes two regressions, caused by #1167 and #1191 .
2014-12-30 07:36:18 -08:00
Scott Lahteine
e7db8ee9e5
ftostr32np > ftostr32sp
...
sp=space-padded, similar to: ns=no-sign
2014-12-30 07:26:25 -08:00
Scott Lahteine
10e1b6ef8b
Least stack-usage self-contained ftostr32np()
...
This is the optimal code for a self-contained formatter, although the
original code is crafty in being smaller and simpler, and can be
evaluated as using the original output as a scratch pad for state,
making the final formatter more straightforward. While this code is
longer, all code-paths are minimal.
2014-12-30 07:26:25 -08:00
Scott Lahteine
d1f21d1189
As it should be
2014-12-30 07:26:25 -08:00
Scott Lahteine
449dad71f2
Least stack-usage self-contained ftostr32np()
...
This is the optimal code for a self-contained formatter, although the
original code is crafty in being smaller and simpler, and can be
evaluated as using the original output as a scratch pad for state,
making the final formatter more straightforward. While this code is
longer, all code-paths are minimal.
2014-12-30 07:26:24 -08:00
Scott Lahteine
a2109cb492
Patch to make Z look more like X and Y on UltraLCD
2014-12-30 07:26:24 -08:00
Bernhard Kubicek
3d1da45f3e
Update Marlin.h
2014-12-30 08:30:37 +01:00
bkubicek
d02daec08f
fixed compilation
2014-12-30 08:04:06 +01:00
Caleb Anderson
991a74b75b
Move delta calibration menu to sample delta configuration.
...
Turn off by default.
2014-12-29 18:03:56 -07:00
Bo Herrmannsen
67fd8f0727
Merge pull request #1267 from RobotCaleb/LanguageFix
...
Language Fix - Using the new language implementation wasn't behaving as expected.
2014-12-29 19:49:11 +01:00
Caleb Anderson
236db44669
Fix spacing
2014-12-29 10:44:55 -07:00
Caleb Anderson
e6774fb7d2
Using the new language implementation wasn't behaving as expected.
...
No matter what LANGUAGE_CHOICE was set to it would always take the en branch.
I revamped it a bit to use a macro to create the language include file name. This required a slight tweak to the RU declaration since it's special-cased in a couple places in code.
This is an attempt to pull my changes from #1222 over.
2014-12-29 10:43:19 -07:00
Caleb Anderson
cb047e9070
Actual menu change. Moved menu logic to not be shown unless not currently printing. (untested but straight-forward, printer in a bad state currently)
2014-12-29 10:19:25 -07:00
Caleb Anderson
5b336a4cdb
Delta calibration menu based on http://minow.blogspot.com/index.html#4918805519571907051
...
To test/enable, uncomment the #define DELTA_CALIBRATION_MENU in Configuration.h
2014-12-29 10:13:00 -07:00
Bernhard Kubicek
10ad9f1062
Addes servo0 pin ultimaker
2014-12-29 17:27:14 +01:00
Bernhard Kubicek
f24c5d82e3
Update Marlin_main.cpp
...
fixed minor typo
2014-12-29 17:17:30 +01:00
Wurstnase
8a6f098cc6
Expand manage_inactivity #1264
...
void manage_inactivity(bool ignore_stepper_queue=false)
standard is false so it is not necessary to change additional code. this
change should be better, hopefully nophead like this :)
2014-12-29 17:07:22 +01:00
Wurstnase
d1995aec7a
Rename ignore_blocks_queued
...
more speaking name
2014-12-29 16:47:08 +01:00
Wurstnase
4122de9d17
change filament issue
...
make a more general solution
2014-12-29 16:31:00 +01:00
wgm4321
d60efc3b5d
Fix syntax error caused by previous changes.
2014-12-28 20:47:59 -05:00
wgm4321
cb12161191
Add Filament menu and add Filament/Retract settings to config store.
2014-12-28 20:43:14 -05:00
fmalpartida
ec33df0554
Merge branch 'SAV-MkI_merge' into Development
...
Tested for SAV MKI and SAV 3D LCD on lewihe.
2014-12-28 19:54:06 +01:00
Matthew Schick
0468f81950
Update for pull request #837
2014-12-28 11:22:44 -05:00
Matthew Schick
6e42c9e305
Add fwretract settings to M503 output
2014-12-28 11:22:44 -05:00
alexborro
3afe66bb0c
Fix issues #1248 , #1240
...
- Fixed issue when BAL area probing is shorter than it should be for
grid probing
- Warning when BAL activated with Delta Kinematics
- Fix XY_TRAVEL_SPEED when homing Z axis
2014-12-28 13:27:39 -02:00
Lukas Obermann
9eb6df17a7
Consider negative Z Offsets when auto bed leveling is active
2014-12-28 12:46:35 +01:00
Bo Herrmannsen
c9f60183a9
Merge pull request #1233 from NarimaanV/Development
...
Fixed BABYSTEPPING feature
2014-12-28 10:13:21 +01:00
Bo Herrmannsen
0d957872a0
Merge pull request #1234 from gregrebholz/issue_1069
...
Fixes #1069 . Added "auto fan" checks to PID_autotune.
2014-12-28 10:12:08 +01:00
Bo Herrmannsen
9c07d28bd6
Merge pull request #1249 from drf5n/PID_CI_v2
...
temperature.cpp: Add Conditional Integration to prevent excessive integral windup
2014-12-28 10:09:25 +01:00
Bo Herrmannsen
23e768dffa
Merge pull request #1250 from chertykov/Development
...
Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp
2014-12-28 10:09:08 +01:00
Scott Lahteine
2f467e2797
LCD Progress Bar
2014-12-27 22:26:14 -08:00
Denis Chertykov
050ca9ca13
Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp
2014-12-28 09:09:42 +03:00
David Forrest
cf52c48d19
Configuration.m: Set PID_INTEGRAL_DRIVE_MAX from PID_MAX from BANG_MAX.
...
Current defaults are all 255. If it makes sense to reduce them, they should come down together, and
be in a PID_INTEGRAL_DRIVE_MAX <= PID_MAX <- BANG_MAX relationship.
2014-12-27 15:26:09 -05:00
David Forrest
984177c40c
temperature.cpp:Add PID Conditional integration on heated bed.
2014-12-27 15:26:09 -05:00
David Forrest
c9b8435749
heater.c: Limit PID I term with conditional integration.
2014-12-27 15:26:09 -05:00
Greg Rebholz
7ecb7cbd46
Added "auto fan" checks to PID_autotune
2014-12-23 23:50:00 -05:00
NarimaanV
7667949aca
Fixed BABYSTEPPING feature
...
Moved PSTR() macro to correct place which was causing the " initializer fails to determine size of '__c' " when attempting to compile with BABYSTEPPING enabled.
2014-12-23 12:49:54 -05:00
alexborro
d74aabf259
Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation"
2014-12-21 10:06:05 -02:00
Bo Herrmannsen
60628864ca
Merge pull request #1167 from thinkyhead/sd_freemem
...
Use SdFatUtil::FreeRam() for freeMemory() if there
2014-12-20 18:31:21 +01:00
Bo Herrmannsen
889d7ba218
Merge pull request #1177 from martin-pr/probing_z_speed
...
Split do_blocking_move() to XY and Z sections
2014-12-20 18:30:35 +01:00
Bo Herrmannsen
5e7bd2dc87
Merge pull request #1200 from chertykov/Marlin_v1
...
Fix syntax errors in #ifdef
2014-12-20 18:29:39 +01:00
Denis Chertykov
b086394178
Fix syntax errors in #ifdef.
2014-12-20 19:33:43 +03:00
John Davis
39d28a9bbf
Update qr_solve.h
...
Changed level to compensation
2014-12-19 17:53:55 -05:00
John Davis
6325968a39
Update qr_solve.cpp
...
Changed leveling to compensation
2014-12-19 17:52:13 -05:00
John Davis
e99f24ff2f
Update planner.h
...
Changed level and leveling to compensation.
2014-12-19 17:51:14 -05:00
John Davis
ac204028e7
Update planner.cpp
...
Changed level and leveling to compensation
2014-12-19 17:49:22 -05:00
John Davis
4315c2547a
Update Marlin_main.cpp
...
Changed level and leveling to compensation (except with "verbose_level" and "lcd_reset_alert_level").
2014-12-19 17:41:29 -05:00
John Davis
f21c65918f
Update Servo.h
...
Changed AUTO_BED_LEVELING to AUTO_BED_COMPENSATION
2014-12-19 17:20:09 -05:00
John Davis
58c4473bea
Update Servo.cpp
...
Changed AUTO_BED_LEVELING to AUTO_BED_COMPENSATION
2014-12-19 17:18:55 -05:00
John Davis
825c46024d
Update vector_3.cpp
...
Changed AUTO_BED_LEVEL to AUTO_BED_COMPENSATION
2014-12-19 17:16:31 -05:00
John Davis
cfe80e1def
Update vector_3.h
2014-12-19 17:14:35 -05:00
John Davis
7464d3c96a
Update ConfigurationStore.cpp
...
Changed AUTO_BED_LEVEL to AUTO_BED_COMPENSATION
2014-12-19 17:08:43 -05:00
John Davis
81568c3c6d
Update Configuration.h
...
Changed Auto Bed Level to Auto Bed Compensation
2014-12-19 17:06:56 -05:00
Bo Herrmannsen
03e489aaad
Merge pull request #1197 from foosel/fix/issue_1147
...
Fixes commands not being acknowledged in the same order they are received in
2014-12-19 14:39:05 +01:00
Gina Häußge
acc0e75279
Fixes commands not being acknowledged in the same order they are received
...
in
G0 to G3 were previously acknowledged in the get_command method, causing
them to be possibly acknowledged before commands coming after them that
were acknowledged in process_commands.
This patch fixes this, moving the acknowledgement of G0 to G3 to the
process_commands method as well. These commands are therefore no
longer acknowledged when the enter the cmd_buffer but instead only
acknowledged when the enter the plan_buffer.
Guaranteeing that commands are acknowledged in the same order in which
they were received by the firmware allows host software to be able to
track the life cycle of commands and such a better management of the
firmware's serial buffers as well as better internal command processing
and response parsing without having to depend on throwing an epic
amount of regular expressions against each line received back from the
firmware.
Fixes ErikZalm/Marlin#1147
2014-12-19 14:20:36 +01:00
daid
17de96ace7
Merge branch 'Marlin_v1' into revert-1154-sd_sorting
...
Conflicts:
Marlin/cardreader.cpp
Marlin/cardreader.h
2014-12-18 23:13:50 +01:00
Scott Lahteine
6880e93b75
Happy configs
2014-12-18 14:02:47 -08:00
Scott Lahteine
3b1f186c0c
Clean up configs
2014-12-18 13:59:31 -08:00
Scott Lahteine
f83d0f2a68
Defines for electronics boards
...
Added boards.h which contains defines for all the board numbers, plus
some shorthand macros for less typing.
2014-12-18 13:59:31 -08:00
Bo Herrmannsen
bd25e7393b
Merge pull request #1192 from thinkyhead/split_language
...
Split up languages.h. Use ISO language codes.
2014-12-18 22:26:55 +01:00
Bo Herrmannsen
174f8d3631
Added example configs for printers from http://tvrrug.org.uk/
2014-12-18 20:34:24 +01:00
Scott Lahteine
e970461adb
Clean up, move unused to the bottom, add headings
2014-12-18 10:33:00 -08:00
Scott Lahteine
0c06e97e98
Split up languages.h, use ISO codes
...
Breaking up languages.h makes it easier to translate. Using language
codes makes it easier to select a language and sets the naming standard.
2014-12-18 09:31:19 -08:00
Bo Herrmannsen
a9c334e8bc
Merge pull request #1191 from thinkyhead/code_shrink
...
Shrink and Optimize
2014-12-18 17:23:11 +01:00
Bo Herrmannsen
842da54e68
Merge pull request #1187 from thinkyhead/fix_constants
...
A few constants where they belong
2014-12-18 17:21:46 +01:00
Scott Lahteine
07c6b5ab71
Using axis constants
2014-12-18 08:13:08 -08:00
Scott Lahteine
1857e611d3
Other small tweaks
2014-12-18 07:49:16 -08:00
Scott Lahteine
63e1665fa9
Reduce ultralcd.cpp redundancies
2014-12-18 07:30:05 -08:00
Scott Lahteine
e69313fc2b
Reduce dogm lcd code
2014-12-18 07:03:40 -08:00
Bo Herrmannsen
bd22405412
Merge pull request #1190 from thinkyhead/sd_sorting
...
Wrap call to flush_presort
2014-12-18 12:50:55 +01:00
Scott Lahteine
49791949af
Wrap call to flush_presort
2014-12-18 03:47:12 -08:00
Scott Lahteine
0450e83fa5
Use SdFatUtil::FreeRam() for freeMemory() if there
2014-12-17 23:26:52 -08:00
Scott Lahteine
f21cce0b28
Rebase to Marlin_v1
2014-12-17 23:07:36 -08:00
Scott Lahteine
e4b98011cf
And one more...
2014-12-17 23:01:24 -08:00
Scott Lahteine
60598b4cdd
A few constants where they belong
2014-12-17 23:01:24 -08:00
Bo Herrmannsen
280504e2e0
Merge pull request #908 from alromh87/Marlin_v1
...
Support for Gen3 Monolithic electronics
2014-12-17 22:28:07 +01:00
Bo Herrmannsen
31ca3de72f
Merge pull request #819 from neildarlow/Marlin_v1
...
Activate LiquidTWI2 device detection and space-pad LCD status line.
2014-12-17 21:42:53 +01:00
Bo Herrmannsen
e83cfc0a62
Merge pull request #1163 from thinkyhead/lcd_abort_message
...
LCD "Abort" Message
2014-12-17 21:30:19 +01:00
Bo Herrmannsen
0b310ab6c5
Merge pull request #1153 from xinfab/negative_values_in_menu
...
Negative values in menu
2014-12-17 20:58:01 +01:00
Bo Herrmannsen
91d740e128
Merge pull request #1141 from filipmu/Filament-Sensor
...
Display filament sensor data on a 20x4 LCD or Graphical LCD
2014-12-17 20:38:30 +01:00
alexborro
ab355a90d3
Revert "SD Sort and Buffer"
2014-12-17 14:50:59 -02:00
Scott Lahteine
d088b5f30f
Remove debug echo
2014-12-13 06:33:12 -08:00
Scott Lahteine
1fad8e6a81
Proper long file name var
2014-12-13 06:17:00 -08:00
Scott Lahteine
29e854c535
Disable SDCARD_SORT_ALPHA by default
...
For legacy boards it’s better if this option is disabled.
2014-12-13 06:12:34 -08:00
Scott Lahteine
6599adc184
Polish up a little...
2014-12-13 06:12:34 -08:00
Scott Lahteine
a12eec33e2
Completed SORT_USES_MORE_RAM implementation
...
For the MORE_RAM option we need to buffer both the short and long
names, even though long names are sometimes redundant. Worst case, all
the names are max length. We can save some RAM by not storing these. We
could save more RAM by only storing the visible part of the long name.
2014-12-13 06:12:34 -08:00
Scott Lahteine
c9486ebb85
Improvements, more SORT_USES_MORE_RAM
...
With this option, always keeps the dir in RAM, doubling as a cache for
getfilename. A board with only 8K of SRAM is cutting it very close.
2014-12-13 06:12:33 -08:00
Scott Lahteine
b6ffea612a
Expand on More RAM concept, address minor bugs
2014-12-13 06:10:44 -08:00
Scott Lahteine
8196b36ad9
SD Card Alpha Sorting
...
First iteration of alphabetical sorting for SD cards, both
slow+efficient and fast+rammy. Option for folders to sort first, last,
or not at all.
2014-12-13 06:07:52 -08:00
Scott Lahteine
cf749dbeda
Completed SORT_USES_MORE_RAM implementation
...
For the MORE_RAM option we need to buffer both the short and long
names, even though long names are sometimes redundant. Worst case, all
the names are max length. We can save some RAM by not storing these. We
could save more RAM by only storing the visible part of the long name.
2014-12-13 06:03:39 -08:00
Scott Lahteine
ae081d0fe0
Improvements, more SORT_USES_MORE_RAM
...
With this option, always keeps the dir in RAM, doubling as a cache for
getfilename. A board with only 8K of SRAM is cutting it very close.
2014-12-13 06:03:39 -08:00
Scott Lahteine
785143a013
Expand on More RAM concept, address minor bugs
2014-12-13 06:03:39 -08:00
Scott Lahteine
0cbbba08bd
SD Card Alpha Sorting
...
First iteration of alphabetical sorting for SD cards, both
slow+efficient and fast+rammy. Option for folders to sort first, last,
or not at all.
2014-12-13 06:03:39 -08:00
Scott Lahteine
3ebfd29312
Print a message when printing is aborted
...
Messages in gcode files like “M117 Printing…” were not being cleared on
Stop Print.
2014-12-13 06:01:46 -08:00
Martin Prazak
2ef0669b19
Split do_blocking_move() to XY and Z sections to make sure that the Z homing feedrate is not exceeded
2014-12-07 15:31:46 +00:00
Neil Darlow
64139f5e5a
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
2014-12-04 21:09:03 +00:00
Bo Herrmannsen
edfcf3b527
Toshiba Stepper Driver support
...
Tosh stepper drivers need to be driven slower, so the stepper code
was interleaved to separate the pin HIGH from the pin LOW. This adds
enough instructions to make it work, without needing nops.
2014-12-03 15:01:52 +01:00
Bo Herrmannsen
c429a4b3ec
Toshiba Stepper Driver support
...
Tosh stepper drivers need to be driven slower, so the stepper code
was interleaved to separate the pin HIGH from the pin LOW. This adds
enough instructions to make it work, without needing nops.
2014-12-03 14:37:16 +01:00
nothinman
1977b4490f
Merge pull request #1159 from thinkyhead/lcd_wait_better
...
M0/M1 Message Fix
2014-11-28 16:44:29 +00:00
Scott Lahteine
7562183efc
Skip over spaces first
2014-11-28 08:09:28 -08:00
nothinman
5a8b3a84ae
Merge pull request #1155 from thinkyhead/lcd_wait_better
...
M0-M1 Enhancements
2014-11-28 11:01:24 +00:00
elgambitero
433ac29d31
Updated a bit of spanish language
2014-11-27 22:02:49 +01:00
Scott Lahteine
12b51d6060
Ignore S and P if no value >0 is included.
2014-11-26 21:05:11 -08:00
Scott Lahteine
d12b24758a
Clear LCD to welcome_msg if not printing
...
The welcome message is more appropriate than “resuming print” if
nothing is printing.
2014-11-26 21:05:11 -08:00
Scott Lahteine
3f54c9ba33
Relocate click ignore code into info screen
2014-11-26 21:05:10 -08:00
Scott Lahteine
92e21d3ee2
M0-M1 Enhancements
...
Allow M0 and M1 to include a message string. Ignore clicks on “Wait for
user” so that the Info Screen stays up.
2014-11-26 21:05:10 -08:00
Lionello Lunesu
0d35b1d0b8
Allow negative values in menus
2014-11-25 18:34:02 +08:00
Jonas
0d97dec434
Adaption of LCD info screen
...
Here comes a compile-time operation to match the extruder symbols on the
info screen to the set number of extruders in configuration.h.
When only one extruder is selected, the "1" on the symbol will not be
displayed.
2014-11-12 17:10:48 +01:00
Filip Mulier
3b1ab84536
Display Filament Sensor data on graphic LCD
...
Added support to show the filament width on the status line of the
graphic LCD. The status will show for 5 sec and then switch over to
data. Status can be seen by clicking the button.
2014-11-10 21:46:37 -06:00
Filip Mulier
d84934d8c5
Display Filament Sensor data on 20x4 LCD
...
Changes to support displaying the real-time filament width and the
volume factor on a 20x4 LCD. The data is displayed on the 4th line.
First the status message is displayed for 5 seconds, and then the
filament data is displayed. The status message can be seen by
re-selecting the info screen in the menu.
2014-11-10 21:43:58 -06:00
Filip Mulier
5c8107bcdd
Commented out FILAMENT_SENSOR #define
...
Commented out the FILAMENT_SENSOR define so that it is not enabled by
default. Code does not work on all hardware variants.
2014-11-09 13:26:02 -06:00
David
377dfb182f
Updated example configurations for Delta printers
2014-11-02 21:04:54 +00:00
Neil Darlow
b81021f475
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
2014-10-21 12:06:56 +01:00
Erik van der Zalm
724197454c
Merge pull request #1104 from ch100/Marlin_v1
...
Fixed typo.
2014-10-11 23:10:00 +02:00
Erik van der Zalm
058e446531
Merge pull request #1037 from filipmu/Filament-Sensor
...
Support for a filament diameter sensor
2014-10-11 22:56:01 +02:00
Christian Inci
110c5dcf23
Fixed typo.
...
Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
2014-10-11 00:25:36 +02:00
Matt Stultz
ca30aee903
Fix "add_homeing" to "add_homing" to match changes
2014-10-07 00:16:27 -04:00
Erik van der Zalm
0733825fb1
Merge pull request #1099 from Fourmi/Marlin_v1
...
Update line 627 ,wrong number on thermistortables
2014-10-06 14:36:00 +02:00
Fourmi
af3e4d7510
Update line 627 ,wrong number on thermistortables
...
Wrong number on line 627 > i change number "12" by the correct number "13"
Soory
2014-10-06 14:21:44 +02:00
Erik van der Zalm
aaaf8fe8dd
Merge pull request #1068 from darkjavi/Marlin_v1
...
Added profile for RAMPS with 2 extruders and 1 fan, no heated bed
2014-10-06 13:41:38 +02:00
Erik van der Zalm
b360306881
Merge pull request #1073 from WingTangWong/wing-fix-float-delta
...
Wing fix float delta
2014-10-06 13:41:01 +02:00
Erik van der Zalm
ce85515428
Merge pull request #1082 from Fourmi/Marlin_v1
...
Add thermistor table
2014-10-06 13:39:36 +02:00
Erik van der Zalm
764921bdbf
Merge pull request #1091 from Aldert/patch-1
...
Update motion_control.cpp
2014-10-06 13:37:19 +02:00
Erik van der Zalm
c40c7b589b
Merge pull request #1095 from thinkyhead/codeclean
...
Simple code cleanup. Rename "homeing" to homing.
2014-10-06 13:36:48 +02:00
Erik van der Zalm
0f2e0525df
Merge pull request #1096 from thinkyhead/set-home
...
Proposed feature: Set Home Offsets
2014-10-06 13:36:11 +02:00
Erik van der Zalm
5ae02a361b
Merge pull request #1097 from thinkyhead/round-up-xyz
...
Adjust the Z display to hide float rounding errors
2014-10-06 13:35:00 +02:00
Matthew Schick
fb34265d75
Make hotend optional when compiling with lcd support
...
Signed-off-by: Matthew Schick <matthew.schick@gmail.com>
2014-10-06 00:19:07 -04:00
Scott Lahteine
6e343ef2f0
Adjust the Z display to hide float rounding errors
2014-10-05 18:34:54 -07:00
Scott Lahteine
2f6c57eadc
Proposed feature: Set Home Offsets
...
Add an item to the LCD menu that applies the current axis position to
the “add_homeing” offset.
2014-10-05 13:35:45 -07:00
Scott Lahteine
f989bd5435
Simple code cleanup. Rename "homeing" to homing.
2014-10-05 13:20:53 -07:00
Neil Darlow
6c5a460e65
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
2014-10-05 12:54:54 +01:00
Aldert
d1e4237e1d
Update motion_control.cpp
...
G03 Full circle did not work (G02 is working correct)
2014-10-04 09:24:09 +02:00
Fourmi
a664763e6f
Update thermistortables.h
...
Add another thermistor table (13),it's a cartridge thermistor up to +300°C,use with Hotend "Simple ONE" & "All In ONE"
Thx
2014-09-27 09:05:10 +02:00
Fourmi
b5dc228a7a
Update configuration.h
...
Add another comment for thermistor 13 ,use with Hotend "Simple ONE & All In ONE"
2014-09-27 09:02:58 +02:00
Fourmi
3cbb2f56c6
Update configuration.h
...
Add another comment on configuration.h for the value of thermistor.
I make a pull request on thermistortables.h with my thermistor (12),but y see there is a comment on configuration with number 12 but it's not present on thermistortables.h ?
Thx
2014-09-26 22:01:06 +02:00
Fourmi
c35736a140
Update thermistortables.h
...
Add another thermistor table,use with hotend "Simple ONE" & "All in ONE"
2014-09-26 21:49:07 +02:00
galexander1
cb4a6dd2dc
Merge pull request #1065 from oliasmage/Marlin_v1
...
Corrected retract() call for use of auto probe without sled enabled.
2014-09-19 15:12:09 -04:00
Bracken Dawson
01e9b536cb
Fix build for non-sled bed auto levelling
...
This function should only be used with sled, not all bed auto
levelling.
2014-09-19 19:42:32 +01:00
Wing Tang Wong
58eabd21fb
Added ifndef
2014-09-16 14:31:58 -07:00