Steffen Vogel
da192c521f
Merge pull request #1333 from andrewsil1/development
...
Fix grammar/typos in new Configuration.h option
10 years ago
Erik van der Zalm
3a30d45c2e
Revert "issue 968 for dev branch"
10 years ago
andrewsil1
269ec9f87f
Fix grammar/typos in new Configuration.h option
...
(For the SLOW_PWM_HEATERS option)
10 years ago
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
10 years ago
Steffen Vogel
8d7bfd03d8
moved/renamed documentation stuff to top-level directory
10 years ago
Bo Herrmannsen
3c9e6b7b62
added link for pic to hex converter
10 years ago
Bo Herrmannsen
0e760274bd
changed reprap logo to marlin logo
10 years ago
Bo Herrmannsen
b291a422e9
added square png version of logo
...
406*406 pixels
10 years ago
Luis E Alvarado
7ae548cf34
Update Marlin Firmware URL
10 years ago
Erik van der Zalm
8f9067faa6
Added marlin logos. (Designed by Ahmet Cem TURAN)
10 years ago
Bo Herrmannsen
addf52fd4a
Merge pull request #1328 from DinoMesina/development
...
Some corrections and new features
10 years ago
Dino Del Favero
5cfe13f240
Correct some mistakes
10 years ago
Dino Del Favero
c7e2d73039
Merge branch 'development'
...
ok
10 years ago
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.
10 years ago
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
10 years ago
DinoMesina
6730335657
Update Configuration.h
10 years ago
Bo Herrmannsen
4ffecdbf7d
Merge pull request #1313 from wgm4321/Development
...
Re-enable filament menu with recalc fix when enabling/disabling mm3
10 years ago
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
10 years ago
Steffen Vogel
f25e793cff
rename stepper lookup table scipt to be consistent with termistor lookup table script
10 years ago
Steffen Vogel
df17a6a1b4
fix #1305 by proposed workaround (thanks gaby64)
10 years ago
Steffen Vogel
f7e65935fb
make use of power operator
10 years ago
Steffen Vogel
4e02aff9b5
automatically determine min/max temp for terminator
10 years ago
Steffen Vogel
81363bc441
more cleanups
10 years ago
Steffen Vogel
95f4a55820
refactored termistor table calculation to be in line with wikipedia's article about Steinhart-Hart coefficients
10 years ago
Steffen Vogel
21205cc3d8
more cleanups in the termistorTable generation script
10 years ago
Steffen Vogel
fb0996b5db
improved output aligment and precision
10 years ago
Steffen Vogel
538231edfd
cosmetic whitespace cleanup and comments added/updated
10 years ago
wgm4321
067b509479
Re-enable filament menu with recalc fix when enabling/disabling mm3
10 years ago
wgm4321
a19f2f8ae7
Disable volumetric menu item due to missing recalc of of multipliers when enabled/disabled
10 years ago
wgm4321
f24dda9700
Revert "Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3"
...
This reverts commit dd7e4ee97f
.
10 years ago
wgm4321
ec4681ab6b
Revert "Add "Detailed Z Probe" menu item with ABL is defined."
...
This reverts commit 2b9722f387
.
10 years ago
wgm4321
dd7e4ee97f
Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3
10 years ago
wgm4321
2b9722f387
Add "Detailed Z Probe" menu item with ABL is defined.
10 years ago
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.
10 years ago
alexborro
d2b6e62996
Merge pull request #1309 from philfifi/fix_temp_runaway
...
temp runaway: proper cast to prevent any overflow.
10 years ago
Philippe L
30248214c7
temp runaway: proper cast to prevent any overflow.
10 years ago
Bo Herrmannsen
c5f138ea07
Merge pull request #1291 from alhirzel/Development
...
Define analogInputToDigitalPin only if needed
10 years ago
odewdney
652895d656
try different proproc for CI failure
10 years ago
Bo Herrmannsen
3d9f4ac757
Merge pull request #1303 from wgm4321/Development
...
Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER ...
10 years ago
wgm4321
04fb34c7ff
Add English defines for filament menu to non-English to prevent compile errors until translated
10 years ago
wgm4321
f8aa5ff771
Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER defined
10 years ago
odewdney
39fae9e3a3
Fix progmem warning
...
Borrow code from https://github.com/arduino/Arduino/issues/1793
10 years ago
Alexander Hirzel
f36fd3ddec
Merge branch 'Development' of https://github.com/ErikZalm/Marlin into Development
10 years ago
Scott Lahteine
b5e50cdd4e
Move scripts and documentation to subfolders
10 years ago
Alexander Hirzel
eed451e034
rework analogInputToDigitalPin definition
10 years ago
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.
10 years ago
wgm4321
b32be2dc64
Fix syntax error caused by previous changes.
10 years ago
wgm4321
edac64e7d2
Add Filament menu and add Filament/Retract settings to config store.
10 years ago
Alexander Hirzel
ecda6cdc0a
Fix typo, PID_BED_POWER -> MAX_BED_POWER
10 years ago
David Forrest
f3e503e725
temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.
10 years ago
David Forrest
1d5d853c9a
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
10 years ago
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.
10 years ago
Bo Herrmannsen
a18b625534
Merge pull request #1261 from wgm4321/Development
...
Add Filament menu and add Filament/Retract settings to config store.
10 years ago
Alexander Hirzel
ae12ad0d6c
Fix typo, PID_BED_POWER -> MAX_BED_POWER
10 years ago
alexborro
80b17ab573
Merge pull request #1285 from drf5n/PID_CI_v2
...
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
10 years ago
David Forrest
625860f086
temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.
10 years ago
David Forrest
6583bb781d
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
10 years ago
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.
10 years ago
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.
10 years ago
Bo Herrmannsen
692a01b1c7
Merge pull request #1277 from thinkyhead/fix_regressions
...
Fix regressions affecting compilation
10 years ago
Scott Lahteine
2ec2bf1564
Fix regressions affecting compilation
...
This fixes two regressions, caused by #1167 and #1191 .
10 years ago
Scott Lahteine
e7db8ee9e5
ftostr32np > ftostr32sp
...
sp=space-padded, similar to: ns=no-sign
10 years ago
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.
10 years ago
Scott Lahteine
d1f21d1189
As it should be
10 years ago
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.
10 years ago
Scott Lahteine
a2109cb492
Patch to make Z look more like X and Y on UltraLCD
10 years ago
Bernhard Kubicek
3d1da45f3e
Update Marlin.h
10 years ago
bkubicek
d02daec08f
fixed compilation
10 years ago
Caleb Anderson
991a74b75b
Move delta calibration menu to sample delta configuration.
...
Turn off by default.
10 years ago
Bo Herrmannsen
67fd8f0727
Merge pull request #1267 from RobotCaleb/LanguageFix
...
Language Fix - Using the new language implementation wasn't behaving as expected.
10 years ago
Caleb Anderson
236db44669
Fix spacing
10 years ago
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.
10 years ago
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)
10 years ago
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
10 years ago
Bernhard Kubicek
10ad9f1062
Addes servo0 pin ultimaker
10 years ago
Bernhard Kubicek
f24c5d82e3
Update Marlin_main.cpp
...
fixed minor typo
10 years ago
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 :)
10 years ago
Wurstnase
d1995aec7a
Rename ignore_blocks_queued
...
more speaking name
10 years ago
Wurstnase
4122de9d17
change filament issue
...
make a more general solution
10 years ago
wgm4321
d60efc3b5d
Fix syntax error caused by previous changes.
10 years ago
wgm4321
cb12161191
Add Filament menu and add Filament/Retract settings to config store.
10 years ago
fmalpartida
ec33df0554
Merge branch 'SAV-MkI_merge' into Development
...
Tested for SAV MKI and SAV 3D LCD on lewihe.
10 years ago
Matthew Schick
0468f81950
Update for pull request #837
10 years ago
Matthew Schick
6e42c9e305
Add fwretract settings to M503 output
10 years ago
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
10 years ago
Lukas Obermann
9eb6df17a7
Consider negative Z Offsets when auto bed leveling is active
10 years ago
Bo Herrmannsen
c9f60183a9
Merge pull request #1233 from NarimaanV/Development
...
Fixed BABYSTEPPING feature
10 years ago
Bo Herrmannsen
0d957872a0
Merge pull request #1234 from gregrebholz/issue_1069
...
Fixes #1069 . Added "auto fan" checks to PID_autotune.
10 years ago
Bo Herrmannsen
9c07d28bd6
Merge pull request #1249 from drf5n/PID_CI_v2
...
temperature.cpp: Add Conditional Integration to prevent excessive integral windup
10 years ago
Bo Herrmannsen
23e768dffa
Merge pull request #1250 from chertykov/Development
...
Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp
10 years ago
Scott Lahteine
2f467e2797
LCD Progress Bar
10 years ago
Denis Chertykov
050ca9ca13
Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp
10 years ago
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.
10 years ago
David Forrest
984177c40c
temperature.cpp:Add PID Conditional integration on heated bed.
10 years ago
David Forrest
c9b8435749
heater.c: Limit PID I term with conditional integration.
10 years ago
Greg Rebholz
7ecb7cbd46
Added "auto fan" checks to PID_autotune
10 years ago
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.
10 years ago
alexborro
d74aabf259
Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation"
10 years ago
Bo Herrmannsen
60628864ca
Merge pull request #1167 from thinkyhead/sd_freemem
...
Use SdFatUtil::FreeRam() for freeMemory() if there
10 years ago
Bo Herrmannsen
889d7ba218
Merge pull request #1177 from martin-pr/probing_z_speed
...
Split do_blocking_move() to XY and Z sections
10 years ago
Bo Herrmannsen
5e7bd2dc87
Merge pull request #1200 from chertykov/Marlin_v1
...
Fix syntax errors in #ifdef
10 years ago
Denis Chertykov
b086394178
Fix syntax errors in #ifdef.
10 years ago
John Davis
39d28a9bbf
Update qr_solve.h
...
Changed level to compensation
10 years ago
John Davis
6325968a39
Update qr_solve.cpp
...
Changed leveling to compensation
10 years ago
John Davis
e99f24ff2f
Update planner.h
...
Changed level and leveling to compensation.
10 years ago
John Davis
ac204028e7
Update planner.cpp
...
Changed level and leveling to compensation
10 years ago
John Davis
4315c2547a
Update Marlin_main.cpp
...
Changed level and leveling to compensation (except with "verbose_level" and "lcd_reset_alert_level").
10 years ago
John Davis
f21c65918f
Update Servo.h
...
Changed AUTO_BED_LEVELING to AUTO_BED_COMPENSATION
10 years ago
John Davis
58c4473bea
Update Servo.cpp
...
Changed AUTO_BED_LEVELING to AUTO_BED_COMPENSATION
10 years ago
John Davis
825c46024d
Update vector_3.cpp
...
Changed AUTO_BED_LEVEL to AUTO_BED_COMPENSATION
10 years ago
John Davis
cfe80e1def
Update vector_3.h
10 years ago
John Davis
7464d3c96a
Update ConfigurationStore.cpp
...
Changed AUTO_BED_LEVEL to AUTO_BED_COMPENSATION
10 years ago
John Davis
81568c3c6d
Update Configuration.h
...
Changed Auto Bed Level to Auto Bed Compensation
10 years ago
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
10 years ago
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
10 years ago
daid
17de96ace7
Merge branch 'Marlin_v1' into revert-1154-sd_sorting
...
Conflicts:
Marlin/cardreader.cpp
Marlin/cardreader.h
10 years ago
Scott Lahteine
6880e93b75
Happy configs
10 years ago
Scott Lahteine
3b1f186c0c
Clean up configs
10 years ago
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.
10 years ago
Bo Herrmannsen
bd25e7393b
Merge pull request #1192 from thinkyhead/split_language
...
Split up languages.h. Use ISO language codes.
10 years ago
Bo Herrmannsen
174f8d3631
Added example configs for printers from http://tvrrug.org.uk/
10 years ago
Scott Lahteine
e970461adb
Clean up, move unused to the bottom, add headings
10 years ago
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.
10 years ago
Bo Herrmannsen
a9c334e8bc
Merge pull request #1191 from thinkyhead/code_shrink
...
Shrink and Optimize
10 years ago
Bo Herrmannsen
842da54e68
Merge pull request #1187 from thinkyhead/fix_constants
...
A few constants where they belong
10 years ago
Scott Lahteine
07c6b5ab71
Using axis constants
10 years ago
Scott Lahteine
1857e611d3
Other small tweaks
10 years ago
Scott Lahteine
63e1665fa9
Reduce ultralcd.cpp redundancies
10 years ago
Scott Lahteine
e69313fc2b
Reduce dogm lcd code
10 years ago
Bo Herrmannsen
bd22405412
Merge pull request #1190 from thinkyhead/sd_sorting
...
Wrap call to flush_presort
10 years ago
Scott Lahteine
49791949af
Wrap call to flush_presort
10 years ago
Scott Lahteine
0450e83fa5
Use SdFatUtil::FreeRam() for freeMemory() if there
10 years ago
Scott Lahteine
f21cce0b28
Rebase to Marlin_v1
10 years ago
Scott Lahteine
e4b98011cf
And one more...
10 years ago
Scott Lahteine
60598b4cdd
A few constants where they belong
10 years ago
Bo Herrmannsen
280504e2e0
Merge pull request #908 from alromh87/Marlin_v1
...
Support for Gen3 Monolithic electronics
10 years ago
Bo Herrmannsen
31ca3de72f
Merge pull request #819 from neildarlow/Marlin_v1
...
Activate LiquidTWI2 device detection and space-pad LCD status line.
10 years ago
Bo Herrmannsen
e83cfc0a62
Merge pull request #1163 from thinkyhead/lcd_abort_message
...
LCD "Abort" Message
10 years ago
Bo Herrmannsen
0b310ab6c5
Merge pull request #1153 from xinfab/negative_values_in_menu
...
Negative values in menu
10 years ago
Bo Herrmannsen
91d740e128
Merge pull request #1141 from filipmu/Filament-Sensor
...
Display filament sensor data on a 20x4 LCD or Graphical LCD
10 years ago
alexborro
ab355a90d3
Revert "SD Sort and Buffer"
10 years ago
Scott Lahteine
d088b5f30f
Remove debug echo
10 years ago
Scott Lahteine
1fad8e6a81
Proper long file name var
10 years ago
Scott Lahteine
29e854c535
Disable SDCARD_SORT_ALPHA by default
...
For legacy boards it’s better if this option is disabled.
10 years ago
Scott Lahteine
6599adc184
Polish up a little...
10 years ago
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.
10 years ago
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.
10 years ago
Scott Lahteine
b6ffea612a
Expand on More RAM concept, address minor bugs
10 years ago
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.
10 years ago
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.
10 years ago
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.
10 years ago
Scott Lahteine
785143a013
Expand on More RAM concept, address minor bugs
10 years ago
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.
10 years ago
Scott Lahteine
3ebfd29312
Print a message when printing is aborted
...
Messages in gcode files like “M117 Printing…” were not being cleared on
Stop Print.
10 years ago
Martin Prazak
2ef0669b19
Split do_blocking_move() to XY and Z sections to make sure that the Z homing feedrate is not exceeded
10 years ago
Neil Darlow
64139f5e5a
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
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.
10 years ago
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.
10 years ago
nothinman
1977b4490f
Merge pull request #1159 from thinkyhead/lcd_wait_better
...
M0/M1 Message Fix
10 years ago
Scott Lahteine
7562183efc
Skip over spaces first
10 years ago
nothinman
5a8b3a84ae
Merge pull request #1155 from thinkyhead/lcd_wait_better
...
M0-M1 Enhancements
10 years ago
elgambitero
433ac29d31
Updated a bit of spanish language
10 years ago
Scott Lahteine
12b51d6060
Ignore S and P if no value >0 is included.
10 years ago
Scott Lahteine
d12b24758a
Clear LCD to welcome_msg if not printing
...
The welcome message is more appropriate than “resuming print” if
nothing is printing.
10 years ago
Scott Lahteine
3f54c9ba33
Relocate click ignore code into info screen
10 years ago
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.
10 years ago
Lionello Lunesu
0d35b1d0b8
Allow negative values in menus
10 years ago
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.
10 years ago
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.
10 years ago
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.
10 years ago
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.
10 years ago
David
377dfb182f
Updated example configurations for Delta printers
10 years ago
Neil Darlow
b81021f475
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
Erik van der Zalm
724197454c
Merge pull request #1104 from ch100/Marlin_v1
...
Fixed typo.
10 years ago
Erik van der Zalm
058e446531
Merge pull request #1037 from filipmu/Filament-Sensor
...
Support for a filament diameter sensor
10 years ago
Christian Inci
110c5dcf23
Fixed typo.
...
Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
10 years ago
Matt Stultz
ca30aee903
Fix "add_homeing" to "add_homing" to match changes
10 years ago
Erik van der Zalm
0733825fb1
Merge pull request #1099 from Fourmi/Marlin_v1
...
Update line 627 ,wrong number on thermistortables
10 years ago
Fourmi
af3e4d7510
Update line 627 ,wrong number on thermistortables
...
Wrong number on line 627 > i change number "12" by the correct number "13"
Soory
10 years ago
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
10 years ago
Erik van der Zalm
b360306881
Merge pull request #1073 from WingTangWong/wing-fix-float-delta
...
Wing fix float delta
10 years ago
Erik van der Zalm
ce85515428
Merge pull request #1082 from Fourmi/Marlin_v1
...
Add thermistor table
10 years ago
Erik van der Zalm
764921bdbf
Merge pull request #1091 from Aldert/patch-1
...
Update motion_control.cpp
10 years ago
Erik van der Zalm
c40c7b589b
Merge pull request #1095 from thinkyhead/codeclean
...
Simple code cleanup. Rename "homeing" to homing.
10 years ago
Erik van der Zalm
0f2e0525df
Merge pull request #1096 from thinkyhead/set-home
...
Proposed feature: Set Home Offsets
10 years ago
Erik van der Zalm
5ae02a361b
Merge pull request #1097 from thinkyhead/round-up-xyz
...
Adjust the Z display to hide float rounding errors
10 years ago
Matthew Schick
fb34265d75
Make hotend optional when compiling with lcd support
...
Signed-off-by: Matthew Schick <matthew.schick@gmail.com>
10 years ago
Scott Lahteine
6e343ef2f0
Adjust the Z display to hide float rounding errors
10 years ago
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.
10 years ago
Scott Lahteine
f989bd5435
Simple code cleanup. Rename "homeing" to homing.
10 years ago
Neil Darlow
6c5a460e65
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
Aldert
d1e4237e1d
Update motion_control.cpp
...
G03 Full circle did not work (G02 is working correct)
10 years ago
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
10 years ago
Fourmi
b5dc228a7a
Update configuration.h
...
Add another comment for thermistor 13 ,use with Hotend "Simple ONE & All In ONE"
10 years ago
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
10 years ago
Fourmi
c35736a140
Update thermistortables.h
...
Add another thermistor table,use with hotend "Simple ONE" & "All in ONE"
10 years ago
galexander1
cb4a6dd2dc
Merge pull request #1065 from oliasmage/Marlin_v1
...
Corrected retract() call for use of auto probe without sled enabled.
10 years ago
Bracken Dawson
01e9b536cb
Fix build for non-sled bed auto levelling
...
This function should only be used with sled, not all bed auto
levelling.
10 years ago
Wing Tang Wong
58eabd21fb
Added ifndef
10 years ago
Wing Tang Wong
88d12a762a
Added #ifndef DELTA wrapper to float delta
10 years ago
alexborro
bf0ecedf60
Merge pull request #1051 from fsantini/EZ_fix935
...
Fix issue 935: error in matrix calculation
10 years ago
Javi
40ba644bb4
Added profile for RAMPS with 2 extruders and 1 fan.
...
modified: Marlin/Configuration.h
modified: Marlin/pins.h
10 years ago
Charles Bell
3b8216bdd1
Corrected #endif and ifdef for Z_PROBE_SLED code.
10 years ago
Charles Bell
37799f70ba
Corrected retract() call for use of auto probe without sled enabled.
10 years ago
Neil Darlow
1632e5e38a
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
Filip Mulier
fe3a09bbcf
Correct analog sampling time for additional A to D sample
...
Adjusted the #define PID_dT to reflect 10 A to D sample steps, vs
original 8.
10 years ago
Gina Häußge
1e9dc85148
Do not use translations for the serial console messages
...
The serial protocol has to stay machine readable, without having
to cope with a ton of different human language variants. So
just leave it at the original english version.
Should fix ErikZalm/Marlin#1052
10 years ago
fsantini
cf325ba240
Fix issue 935: error in matrix calculation
10 years ago
Erik van der Zalm
018b68a5c4
Merge pull request #976 from cocktailyogi/SCARA_by_Yogi
...
Implemented SCARA-Maths
10 years ago
Erik van der Zalm
dde61d8886
Merge pull request #977 from OskarLinde/Marlin_v1
...
Fix lcd itostr3() to handle negative numbers
10 years ago
Erik van der Zalm
0fbfb1bf82
Merge pull request #991 from bonm014/patch-1
...
Leapfrog controller board support
10 years ago
Erik van der Zalm
8340ca6e05
Merge pull request #992 from Grogyan/patch-1
...
temperature.cpp fixes for SD card and MAX6675
10 years ago
Erik van der Zalm
9887555192
Merge pull request #998 from darconeous/pull-requests/fwretract
...
FWRETRACT fixes
10 years ago
Erik van der Zalm
105571ec68
Merge pull request #1005 from midopple/Marlin_v1
...
With option DISABLE_INACTIVE_EXTRUDER the extruder is disable to early
10 years ago
Erik van der Zalm
68dd5e635e
Merge pull request #1024 from oliasmage/Marlin_v1
...
Adding Z Probe via sled mounted endstop
10 years ago
Erik van der Zalm
25069ed4e9
Merge pull request #1031 from Roxy-3DPrintBoard/Z_PROBE_REPEATABILITY-with-correct-Defaults
...
Z probe repeatability with correct defaults
10 years ago
Filip Mulier
75b3a68b65
Revert "Change pinMode to SET_INPUT or SET_OUTPUT"
...
This reverts commit 1d0fe035f3
.
11 years ago
Filip Mulier
e3c88a5120
Filament sensor changes to config file
...
Update the config file for improvements and clarifying what diameter to
use in the slicer software.
11 years ago
Filip Mulier
62db9848d3
Improvements and bug fixes in sensor delay buffer for filament sensor code
...
Improvement to avoid reinitializing delay buffer with every print. Fixed
issues in buffer indexing and memory out of bounds due to floating point
imprecision. Simplified the code by avoiding conversion to standard
diameter and 1cu mm extrusion, which caused complications in determining
mm extruded.
11 years ago
Florian Baumann
5908fd5cec
Fix reseting CHDK pin to LOW
...
chdkActive was set to false regardless of (millis() - chdkHigh) being bigger than the CHDK_DELAY or not. So if (millis() - chdkHigh) wasn't bigger than the delay the first time, the CHDK would never be set back to LOW.
Also, don't return from the function, as there might be other stuff to do, after the CHDK check.
11 years ago
Roxy-3DPrintBoard
0adbc79571
Fix Default Configuration so Auto Bed Leveling is off
...
This snapshot has the Auto Bed Leveling turned off because most Marlin
users do not have that feature.
11 years ago
Roxy-3DPrintBoard
0091865583
Z_PROBE_REPEATABILITY test
...
Z_PROBE_REPEATABILITY test for Auto Bed Leveling.
Implemented as M48 with extra user specified options.
Full support at
http://3dprintboard.com/showthread.php?2802-Auto_Bed_Leveling-Z-Probe-Repeatability-code
11 years ago
Filip Mulier
85649a4549
Real-time filament diameter measurement and control
...
This feature allows the printer to read the filament diameter
automatically and adjust the printer in real time. Added code to read
an analog voltage that represents a filament diameter measurement. This
measurement is delayed in a ring buffer to compensate for sensors that
are a distance away from the extruder. The measurement is used to
adjust the volumetric_multiplier for the extruder. Some additional g
codes (M404, M405, M406, M407) are used to set parameters and turn
on/off the control. g code M221 is updated. Pins for RAMPS1.4, RAMBO,
and Printrboard are identified for analog input. The configuration file
is updated with relevant user parameters.
11 years ago
Filip Mulier
1d0fe035f3
Change pinMode to SET_INPUT or SET_OUTPUT
...
Original code is using WRITE from fastio, but original used pinMode to
set pin direction and did not use the fastio SET_INPUT or SET_OUTPUT.
This caused an issue with the rotary encoder interface to boards based
on teensyduino, since for teensyduino pin numbers for fastio and the
usual Arduino IO are different.
11 years ago
Charles Bell
e7707aedbc
Commented out new #defines in Configuration.h.
11 years ago
Charles Bell
0a8dc0e96b
Added documentation to the README.md for the sled Z probe option. CAB
11 years ago
Charles Bell
d2fcb3ee56
CAB: Added code for Z-probe with Z endstop mounted on a sled.
11 years ago
Neil Darlow
3cd7dbcc45
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
daid
c13a831ea1
Merge pull request #1017 from foosel/fix/checksum_truncation_bug
...
Fix for a wrong checksum truncation for certain commands
11 years ago
Gina Häußge
2d22902d08
Fix for a wrong checksum truncation for certain commands
...
Positioning of string terminator to truncate checksum from the commands
M23, M28, M30, M32, M928 and M117 was off by one, causing the last
letter of the actual command to be truncated instead of just the
checksum.
In case of the SD commands this caused checksummed commands targeting
existing files to fail since the last letter of the filename was
truncated.
In case of M117 this caused the last given letter not to be displayed.
This patch fixes the off-by-one error and sets the null terminator
on the exact position of the * starting the checksum instead of the
character before that.
11 years ago
cocktailyogi
ad3b770c1a
updated examples
11 years ago
cocktailyogi
2f4a20257c
imported last Marlin changes
11 years ago
daid
aacff0d361
Merge pull request #948 from Dim3nsioneer/Marlin_v1
...
Implementation of FW extruder change retract
11 years ago
midopple
17aa67e4ea
If the option DISABLE_INACTIVE_EXTRUDER ist active the extruder switch to early to inactive because there are some moves in the buffer. So the planner wait 32 moves to disable the unused extruder.
11 years ago
Robert Quattlebaum
1fd9a7d476
Fix for FWRETRACT on DELTA printers.
...
Fixes #817
11 years ago
Neil Darlow
3f2c771d90
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
Grogyan
bcd039aa81
Update pins.h
11 years ago
Grogyan
82606354dd
Update temperature.cpp
...
Enables both SD card and MAX6675 to talk with each other
Fixes also issue #750
11 years ago
bonm014
32a6451ad8
Add leapfrog and dual Y/Z
...
I have added the pin set for the leapfrog and the support of dual Y and Z
11 years ago
bonm014
b5417be109
Update Configuration.h
...
Leapfrog added to the board list
11 years ago
bonm014
f244045245
Update pins.h
...
Leapfrog board added to the pin list
11 years ago
Pablo Clemente
2242a84218
Changed the declaration of the variable to Marlin_main.cpp to fix issue on commit #965
11 years ago
Neil Darlow
6e3406d228
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
alexborro
43c298a7a9
Add "Thermal Runaway Protection" feature
...
This is a feature to protect your printer from burn up in flames if it
has a thermistor coming off place (this happened to a friend of mine
recently and motivated me writing this feature).
The issue: If a thermistor come off, it will read a lower temperature
than actual. The system will turn the heater on forever, burning up the
filament and anything
else around.
After the temperature reaches the target for the first time, this
feature will start measuring for how long the current temperature stays
below the target minus _HYSTERESIS (set_temperature -
THERMAL_RUNAWAY_PROTECTION_HYSTERESIS).
If it stays longer than _PERIOD, it means the thermistor temperature
cannot catch up with the target, so something *may be* wrong. Then, to
be on the safe side, the system will he halt.
Bear in mind the count down will just start AFTER the first time the
thermistor temperature is over the target, so you will have no problem
if your extruder heater takes 2 minutes to hit the target on heating.
11 years ago
Pablo Clemente
d86c3cf43c
Changed the type of variable to bool, the name to "cancel_heatup", flags implementation and added this fix to M190 gcode too.
11 years ago
cocktailyogi
f0cab611db
optimised some math-code
11 years ago
Oskar Linde
269a068032
Fix lcd itostr3() to handle negative numbers
11 years ago
cocktailyogi
fae7d08698
fixed wrong compiler-option
11 years ago
cocktailyogi
512f2a3136
restore Branch from Backup
...
sorry for that
11 years ago
Pablo Clemente
cd3220d055
Inverted state logic for forced_heating_stop variable
11 years ago
Pablo Clemente
86b4b805d2
Fixed stop print LCD function on M104
11 years ago
Greg Tan
6e6e4e2143
Added thermistor table for the 500C thermistor shipped with the Pico hot end.
11 years ago
Neil Darlow
9d11b70436
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
Gina Häußge
0de826160e
M30 response is missing linefeed, "ok" therefore not on own line
...
This leads to the command not being acknowledged properly
by the firmware, leading to consecutive issues in host software
waiting for an acknowledgement.
11 years ago
Dim3nsioneer
3c927901a4
Implementation of FW extruder change retract
...
FW retraction is extended onto swap retraction invoked by 'G10 S1'.
Bookkeeping of the retract state of all extruders allows for having one
extruder fw standard retracted while another extruder is swap retracted.
An LCD menu item for the swap retract and recover length was added.
11 years ago
Dim3nsioneer
8a32c5395b
renaming the disable inactive extruder feature
11 years ago
Dim3nsioneer
29e7639933
Add switch unused feeder(s) off
...
Having the non-active feeder motors powered on all the time is not
necessary. A feature to deactivate the unused feeder motors has been
implemented. The feature is enabled on default but can be switched off
in the configuration.
11 years ago
Justin Nesselrotte
07c0eeee99
Fixed a comment in the planner
11 years ago
David Forrest
09b84faa00
Configuration.h, pins.h: Add MOTHERBOARD 84 for Teensy++2.0
11 years ago
neildarlow
efb6d61413
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
nothinman
38192cb5f3
Add M112 description to Marlin_main
11 years ago
nothinman
aed5ec008a
Merge pull request #851 from DanNixon/estop
...
Implemented M112
11 years ago
Erik van der Zalm
cfb98ef682
More coverity fixes
11 years ago
zaubara
92e14298b0
Fixes typo for lcd backlighting on I2C PCF8575
...
When using LCD_I2C_TYPE_PCF8575T (like Sainsmart I2C), the backlight
won't come on; the incorrect ifdef blocks the evocation of the backlight
functions.
11 years ago
Erik van der Zalm
9db9842aea
Fixed error found by the free coverity tool ( https://scan.coverity.com/ )
...
===================================================
Hi,
Please find the latest report on new defect(s) introduced to ErikZalm/Marlin found with Coverity Scan.
Defect(s) Reported-by: Coverity Scan
Showing 15 of 15 defect(s)
** CID 59629: Unchecked return value (CHECKED_RETURN)
/Marlin_main.cpp: 2154 in process_commands()()
** CID 59630: Operands don't affect result (CONSTANT_EXPRESSION_RESULT)
/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/cores/arduino/Tone.cpp: 319 in tone(unsigned char, unsigned int, unsigned long)()
** CID 59631: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1187 in process_commands()()
** CID 59632: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1193 in process_commands()()
** CID 59633: Out-of-bounds write (OVERRUN)
/temperature.cpp: 914 in disable_heater()()
** CID 59634: Out-of-bounds write (OVERRUN)
/temperature.cpp: 913 in disable_heater()()
** CID 59635: Out-of-bounds read (OVERRUN)
/temperature.cpp: 626 in analog2temp(int, unsigned char)()
** CID 59636: Out-of-bounds read (OVERRUN)
/temperature.cpp: 620 in analog2temp(int, unsigned char)()
** CID 59637: Out-of-bounds write (OVERRUN)
/temperature.cpp: 202 in PID_autotune(float, int, int)()
** CID 59638: Out-of-bounds read (OVERRUN)
/temperature.cpp: 214 in PID_autotune(float, int, int)()
** CID 59639: Out-of-bounds write (OVERRUN)
/Marlin_main.cpp: 2278 in process_commands()()
** CID 59640: Out-of-bounds read (OVERRUN)
/Marlin_main.cpp: 1802 in process_commands()()
** CID 59641: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 51 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
** CID 59642: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 45 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
** CID 59643: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 32 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
________________________________________________________________________________________________________
*** CID 59629: Unchecked return value (CHECKED_RETURN)
/Marlin_main.cpp: 2154 in process_commands()()
2148 }
2149 #endif
2150 }
2151 }
2152 break;
2153 case 85: // M85
CID 59629: Unchecked return value (CHECKED_RETURN)
Calling "code_seen" without checking return value (as is done elsewhere 66 out of 67 times).
2154 code_seen('S');
2155 max_inactive_time = code_value() * 1000;
2156 break;
2157 case 92: // M92
2158 for(int8_t i=0; i < NUM_AXIS; i++)
2159 {
________________________________________________________________________________________________________
*** CID 59630: Operands don't affect result (CONSTANT_EXPRESSION_RESULT)
/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/cores/arduino/Tone.cpp: 319 in tone(unsigned char, unsigned int, unsigned long)()
313 else
314 {
315 // two choices for the 16 bit timers: ck/1 or ck/64
316 ocr = F_CPU / frequency / 2 - 1;
317
318 prescalarbits = 0b001;
CID 59630: Operands don't affect result (CONSTANT_EXPRESSION_RESULT)
"ocr > 65535U" is always false regardless of the values of its operands. This occurs as the logical operand of if.
319 if (ocr > 0xffff)
320 {
321 ocr = F_CPU / frequency / 2 / 64 - 1;
322 prescalarbits = 0b011;
323 }
324
________________________________________________________________________________________________________
*** CID 59631: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1187 in process_commands()()
1181 case 2: // G2 - CW ARC
1182 if(Stopped == false) {
1183 get_arc_coordinates();
1184 prepare_arc_move(true);
1185 return;
1186 }
CID 59631: Missing break in switch (MISSING_BREAK)
The above case falls through to this one.
1187 case 3: // G3 - CCW ARC
1188 if(Stopped == false) {
1189 get_arc_coordinates();
1190 prepare_arc_move(false);
1191 return;
1192 }
________________________________________________________________________________________________________
*** CID 59632: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1193 in process_commands()()
1187 case 3: // G3 - CCW ARC
1188 if(Stopped == false) {
1189 get_arc_coordinates();
1190 prepare_arc_move(false);
1191 return;
1192 }
CID 59632: Missing break in switch (MISSING_BREAK)
The above case falls through to this one.
1193 case 4: // G4 dwell
1194 LCD_MESSAGEPGM(MSG_DWELL);
1195 codenum = 0;
1196 if(code_seen('P')) codenum = code_value(); // milliseconds to wait
1197 if(code_seen('S')) codenum = code_value() * 1000; // seconds to wait
1198
________________________________________________________________________________________________________
*** CID 59633: Out-of-bounds write (OVERRUN)
/temperature.cpp: 914 in disable_heater()()
908 WRITE(HEATER_0_PIN,LOW);
909 #endif
910 #endif
911
912 #if defined(TEMP_1_PIN) && TEMP_1_PIN > -1
913 target_temperature[1]=0;
CID 59633: Out-of-bounds write (OVERRUN)
Overrunning array "soft_pwm" of 1 bytes at byte offset 1 using index "1".
914 soft_pwm[1]=0;
915 #if defined(HEATER_1_PIN) && HEATER_1_PIN > -1
916 WRITE(HEATER_1_PIN,LOW);
917 #endif
918 #endif
919
________________________________________________________________________________________________________
*** CID 59634: Out-of-bounds write (OVERRUN)
/temperature.cpp: 913 in disable_heater()()
907 #if defined(HEATER_0_PIN) && HEATER_0_PIN > -1
908 WRITE(HEATER_0_PIN,LOW);
909 #endif
910 #endif
911
912 #if defined(TEMP_1_PIN) && TEMP_1_PIN > -1
CID 59634: Out-of-bounds write (OVERRUN)
Overrunning array "target_temperature" of 1 2-byte elements at element index 1 (byte offset 2) using index "1".
913 target_temperature[1]=0;
914 soft_pwm[1]=0;
915 #if defined(HEATER_1_PIN) && HEATER_1_PIN > -1
916 WRITE(HEATER_1_PIN,LOW);
917 #endif
918 #endif
________________________________________________________________________________________________________
*** CID 59635: Out-of-bounds read (OVERRUN)
/temperature.cpp: 626 in analog2temp(int, unsigned char)()
620 if(heater_ttbl_map[e] != NULL)
621 {
622 float celsius = 0;
623 uint8_t i;
624 short (*tt)[][2] = (short (*)[][2])(heater_ttbl_map[e]);
625
CID 59635: Out-of-bounds read (OVERRUN)
Overrunning array "heater_ttbllen_map" of 1 bytes at byte offset 1 using index "e" (which evaluates to 1).
626 for (i=1; i<heater_ttbllen_map[e]; i++)
627 {
628 if (PGM_RD_W((*tt)[i][0]) > raw)
629 {
630 celsius = PGM_RD_W((*tt)[i-1][1]) +
631 (raw - PGM_RD_W((*tt)[i-1][0])) *
________________________________________________________________________________________________________
*** CID 59636: Out-of-bounds read (OVERRUN)
/temperature.cpp: 620 in analog2temp(int, unsigned char)()
614 if (e == 0)
615 {
616 return 0.25 * raw;
617 }
618 #endif
619
CID 59636: Out-of-bounds read (OVERRUN)
Overrunning array "heater_ttbl_map" of 1 2-byte elements at element index 1 (byte offset 2) using index "e" (which evaluates to 1).
620 if(heater_ttbl_map[e] != NULL)
621 {
622 float celsius = 0;
623 uint8_t i;
624 short (*tt)[][2] = (short (*)[][2])(heater_ttbl_map[e]);
625
________________________________________________________________________________________________________
*** CID 59637: Out-of-bounds write (OVERRUN)
/temperature.cpp: 202 in PID_autotune(float, int, int)()
196 {
197 soft_pwm_bed = (MAX_BED_POWER)/2;
198 bias = d = (MAX_BED_POWER)/2;
199 }
200 else
201 {
CID 59637: Out-of-bounds write (OVERRUN)
Overrunning array "soft_pwm" of 1 bytes at byte offset 1 using index "extruder" (which evaluates to 1).
202 soft_pwm[extruder] = (PID_MAX)/2;
203 bias = d = (PID_MAX)/2;
204 }
205
206
207
________________________________________________________________________________________________________
*** CID 59638: Out-of-bounds read (OVERRUN)
/temperature.cpp: 214 in PID_autotune(float, int, int)()
208
209 for(;;) {
210
211 if(temp_meas_ready == true) { // temp sample ready
212 updateTemperaturesFromRawValues();
213
CID 59638: Out-of-bounds read (OVERRUN)
Overrunning array "current_temperature" of 1 4-byte elements at element index 1 (byte offset 4) using index "extruder" (which evaluates to 1).
214 input = (extruder<0)?current_temperature_bed:current_temperature[extruder];
215
216 max=max(max,input);
217 min=min(min,input);
218 if(heating == true && input > temp) {
219 if(millis() - t2 > 5000) {
________________________________________________________________________________________________________
*** CID 59639: Out-of-bounds write (OVERRUN)
/Marlin_main.cpp: 2278 in process_commands()()
2272 tmp_extruder = code_value();
2273 if(tmp_extruder >= EXTRUDERS) {
2274 SERIAL_ECHO_START;
2275 SERIAL_ECHO(MSG_M200_INVALID_EXTRUDER);
2276 }
2277 }
CID 59639: Out-of-bounds write (OVERRUN)
Overrunning array "volumetric_multiplier" of 1 4-byte elements at element index 1 (byte offset 4) using index "tmp_extruder" (which evaluates to 1).
2278 volumetric_multiplier[tmp_extruder] = 1 / area;
2279 }
2280 break;
2281 case 201: // M201
2282 for(int8_t i=0; i < NUM_AXIS; i++)
2283 {
________________________________________________________________________________________________________
*** CID 59640: Out-of-bounds read (OVERRUN)
/Marlin_main.cpp: 1802 in process_commands()()
1796 int pin_status = code_value();
1797 int pin_number = LED_PIN;
1798 if (code_seen('P') && pin_status >= 0 && pin_status <= 255)
1799 pin_number = code_value();
1800 for(int8_t i = 0; i < (int8_t)sizeof(sensitive_pins); i++)
1801 {
CID 59640: Out-of-bounds read (OVERRUN)
Overrunning array "sensitive_pins" of 28 2-byte elements at element index 55 (byte offset 110) using index "i" (which evaluates to 55).
1802 if (sensitive_pins[i] == pin_number)
1803 {
1804 pin_number = -1;
1805 break;
1806 }
1807 }
________________________________________________________________________________________________________
*** CID 59641: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 51 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
45 }
46
47 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable,
48 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3)
49 {
50 init(1, rs, 255, enable, d0, d1, d2, d3, 0, 0, 0, 0);
CID 59641: Uninitialized scalar field (UNINIT_CTOR)
Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls.
51 }
52
53 void LiquidCrystal::init(uint8_t fourbitmode, uint8_t rs, uint8_t rw, uint8_t enable,
54 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
55 uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
56 {
________________________________________________________________________________________________________
*** CID 59642: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 45 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
39 }
40
41 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable,
42 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3)
43 {
44 init(1, rs, rw, enable, d0, d1, d2, d3, 0, 0, 0, 0);
CID 59642: Uninitialized scalar field (UNINIT_CTOR)
Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls.
45 }
46
47 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable,
48 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3)
49 {
50 init(1, rs, 255, enable, d0, d1, d2, d3, 0, 0, 0, 0);
________________________________________________________________________________________________________
*** CID 59643: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 32 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
26
27 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable,
28 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
29 uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
30 {
31 init(0, rs, rw, enable, d0, d1, d2, d3, d4, d5, d6, d7);
CID 59643: Uninitialized scalar field (UNINIT_CTOR)
Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls.
32 }
33
34 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable,
35 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
36 uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
37 {
________________________________________________________________________________________________________
To view the defects in Coverity Scan visit, http://scan.coverity.com/projects/2224?tab=overview
11 years ago
Neil Darlow
e541323741
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
Alejandro Romero
1c9a70cee9
Support for Gen3 Monolithic electronics
...
Techzone Monotronics support, ignoring the tip manager and using fan connector as on Sprinter FW
TODO: Add support for tipmanager
11 years ago
daid
2acd3792fc
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
11 years ago
daid
8b4c4aa5c3
Add feature to check&retry CRC read errors on SD.
11 years ago
nothinman
ce76843dc3
Merge pull request #897 from Makible/5DPrint_D8_Board_Support
...
5DPrint D8 Controller Board Support
11 years ago
Cameron Lai
ad5c8cbba9
Add safety limit for hot bed power in example configuration
11 years ago
Cameron Lai
6460709d92
Fix bug in PID Autotune report
11 years ago
Cameron Lai
105bebb466
Fix for pin mapping for SDSS pin and Fan pin, so Arduino library can be used
11 years ago
Cameron Lai
97ead2eccb
Fix for microstepping pin mapping, not using Teensy pin mapping, but Arduino's default pin mapping so Arduino library can be used
11 years ago
Cameron Lai
d85411f13a
Revert "Fix for stepper microstepping"
...
This reverts commit eea3ba5588
.
11 years ago
Cameron Lai
7c7f2d094e
Revert "Fix for reading microstepping resolution"
...
This reverts commit 2715f6ddbf
.
11 years ago
Cameron Lai
e2d703377a
Enable EEPROM by default for 5DPrint D8 Controller Board in example configuration
11 years ago
Cameron Lai
2715f6ddbf
Fix for reading microstepping resolution
11 years ago
Cameron Lai
39e9b133f3
Add example configuration for Makibox printer, which uses the 5DPrint D8 Driver Board
11 years ago
Cameron Lai
da6b536182
Add 5DPrint D8 Driver Board info and temperature table for Makibox hot bed
11 years ago
Cameron Lai
3a8e36f19e
Add Digipot config for 5DPrint D8 Driver Board
11 years ago
Cameron Lai
eea3ba5588
Fix for stepper microstepping
11 years ago
Cameron Lai
1cbcbb0971
Add makibox machine information
11 years ago
Cameron Lai
2fa514e88a
Add port for 5DPrint D8 Driver board
11 years ago
nothinman
b9126ab497
Merge pull request #894 from MyMakibox/Marlin_v1
...
Update Marlin_main.cpp
11 years ago
MyMakibox
21ec6b88c3
Update Marlin_main.cpp
...
Added description of autotemp flags to M109
11 years ago
MyMakibox
e4dc80d3d3
Update Configuration_adv.h
...
Corrected error in AUTOTEMP instructions
11 years ago
Neil Darlow
6adbdf42e0
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
whosawhatsis
27d544ac25
Speed up QUICK_HOME feedrate for diagonal move
...
Speed up the diagonal move while still keeping each individual axis at
or below its homing feedrate.
11 years ago
nothinman
013793bbe9
Merge pull request #878 from koldoartola/Marlin_v1
...
Added new language (Basque-Euskera)
11 years ago
koldo artola
e5b70237c7
Added new language (Basque-Euskera)
...
Added:
* new language (Basque-Euskera)
* some minor corrections for Spanish
* added 2 new constants for every language (required for a minor change
I am preparing to ultralcd.cpp)
11 years ago
Nutz95
ed6f4a71c5
fix wrong temptable index
11 years ago
Nutz95
3161740df9
This table is made for thermistor 3950 (can be found on ebay for cheap)
...
it's caracteristics are :
R25℃ ;100KΩ±1%
B Value(R25/50℃):3990K 1%
Dissipation Factor(mW/℃):1.1~1.6 In still Air
Thermal Time Constant(S):10~17 In Still Air
Operating temperature range: (-50~+260°C)
Dimension: 1.8mm Dia X4.1mm
Lead Length :30mm
This table was found on the following blogs:
http://cae2100.wordpress.com/2014/03/08/beta3950-thermistor-table-for-marlin/
and
http://microfabricator.com/articles/view/id/531ad7e59aad9d3131000000/beta-3950-thermistor-table-for-marlin
11 years ago
nothinman
086ff1644f
Merge pull request #852 from pixatintes/patch-1
...
Update language.h
11 years ago
nothinman
3ffc9651b1
Merge pull request #845 from DerSchultze/Sanguinololu-servo
...
Added servo pin assignments to Sanguinololu
11 years ago
nothinman
357b87b498
Merge pull request #826 from paciotti/patch-1
...
Configuration_adv.h
11 years ago
neildarlow
95ad6ec9a1
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
Gabe Rosenhouse
27a7cf9fcf
use existing strings
11 years ago
Gabe Rosenhouse
d3f305332a
Allowable range now includes default value
11 years ago
Gabe Rosenhouse
b0aeac117f
Adjustable Z probe offset, via custom M-code
11 years ago
Neil Darlow
73b380d8d2
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
nothinman
c23376f2e7
Merge pull request #837 from whosawhatsis/fwretract
...
FWRETRACT in mm/s
11 years ago
nothinman
dfb98101e4
Change CONTROLLERFAN_PIN for board 35 to -1, as it would conflict with board's 33 extruder pin, causing burnout (it's the same board, just different number of fans/extruders, therefore should be pin-compatible)
11 years ago
nothinman
f1501317ca
Merge pull request #860 from drf5n/therm3950
...
thermistortables.h: Add comments that table 60 uses beta=3950.
11 years ago
nothinman
9a5d23d96f
Merge pull request #866 from sakunamary/Marlin_v1
...
fix bug for dual extruders not working
11 years ago
nothinman
303ee67896
Merge pull request #864 from whosawhatsis/M200
...
fix bug in M200 with multiple extruders
11 years ago
Tim
8759508319
fix bug for dual extruders not working
...
some guy find that marlin not working good for dual extruders delta .
when type T0 or T1 to active extruder and E0 or E1 move causing XYZ
motion . so i locales the bugs and fix it , I have dry run the fix.
11 years ago
whosawhatsis
a65564eef6
fix bug in M200 with multiple extruders
11 years ago
whosawhatsis
aeaf9b9312
fix bug in M200 with multiple extruders
11 years ago
Neil Darlow
89f78b0b80
Allow use of either SD Card slot when LCD Panel is configured.
...
Preference is for Controller SD slot before LCD Panel slot when both are occupied.
11 years ago
David Forrest
b0093a1513
thermistortables.h: Add comments that table 60 uses beta=3950.
11 years ago
pixatintes
a3530d1141
Update language.h
...
Updated to latest version.
11 years ago
pixatintes
990e770e15
Update language.h
...
Added catalan language
11 years ago
Dan Nixon
f643f4d674
Test and refactor
11 years ago
neildarlow
bbe8fbe13d
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
Dim3nsioneer
c8cdd1fc6f
Bugfixes for language option 6 (russian)
11 years ago
Dim3nsioneer
7395dafc1e
semantic changes in language.h
11 years ago
Dim3nsioneer
fad2a60ce6
Corrections for preheat extension in language.h
11 years ago
Ralf Schultz
eecda434fb
Sanguinololu servo pins set default disabled
11 years ago
Dim3nsioneer
944ced87c5
Extended Preheat options
...
Preheat LCD menus base on code by D-Base
11 years ago
Ralf Schultz
06709ad60e
Added servo pin assignments to Sanguinololu
11 years ago
Dim3nsioneer
3906f27c46
Individual extruder flow rate
...
Extension of M221, Tune menu
11 years ago
Dan Nixon
a38c90ee84
Added estop handling
11 years ago
ErikZalm
a00cec8b71
Merge pull request #833 from mattsch/optional_feedrate_multiplier
...
Add support for disabling encoder control for feedrate multiplier
11 years ago
neildarlow
af8be9013b
Merge branch 'lcd_detected' of https://github.com/whosawhatsis/Marlin into Marlin_v1
11 years ago
whosawhatsis
0ddee3c7db
Prevent SD card insertion from causing a hang when using LiquidTWI2 device detection
11 years ago
Dan Nixon
272072fa20
Added M112
11 years ago
whosawhatsis
aab61e63c3
FWRETRACT in mm/s
...
Firmware retraction now stores the retract and recover speeds in mm/s
instead of mm/min. This makes it match the units of the maximum
feedrate, and fixes problems with modifying the value via LCD control
panel. From gcode, the values are still taken in mm/min to match the
units of G1 and similar, and they are converted to mm/s before they are
stored.
I also lowered the default retract feedrate to make it less likely to
cause problems for geared extruders when the user hasn’t bothered to
set a reasonable maximum feedrate, though users should be setting both
of these values to suit their hardware.
11 years ago
Matthew Schick
6cd85e6008
Add support for disabling encoder control for feedrate multiplier
...
Signed-off-by: Matthew Schick <matthew.schick@gmail.com>
11 years ago
blddk
09af1b90b8
Added CHDK support
...
Added CHDK support to take pictures instead of doing an IR command, see more about how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
11 years ago
blddk
765b2da3d4
Added CHDK support
...
Added so M240 can be used to trigger CHDK instead of sending an IR signal, see more about CHDK here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
11 years ago
paciotti
881e348eed
Update Configuration_adv.h
...
Increase Z_HOME_RETRACT_MM to 2mm default to avoid end stop not switching during retract.
11 years ago
neildarlow
5a332df47e
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
Tommi Lamberg
15d1b8d719
Fixed finnish translation
...
- Fixed Few finnish transalations
- Removed duplicate contrast define
11 years ago
neildarlow
7325d7102e
Activate LiquidTWI2 device detection and space-pad LCD status line.
11 years ago
ErikZalm
7f76a0e064
Merge pull request #813 from drf5n/PID_DEBUG
...
temperature.cpp: Fix PID_DEBUG compile error.
11 years ago
Erik van der Zalm
fcd8524b6e
Only increase EEPROM version for DELTA printers.
11 years ago
Jim Morris
8ea5665ee2
Merge remote-tracking branch 'origin/Marlin_v1' into add/M665-set-delta-configuration
...
Conflicts:
Marlin/Marlin_main.cpp
11 years ago
David Forrest
8c4377dd63
temperature.cpp: Fix PID_DEBUG compile error.
11 years ago
ErikZalm
fde8c2c310
Merge pull request #807 from Cylindric3D/typofixes_upstream5
...
Various typo fixes #5 - only in comments, no code changes.
11 years ago
Cylindric
fdce91192e
Various typo fixes - only in comments, no code changes.
11 years ago
Cylindric
d819c55395
Various typo fixes - only in comments, no code changes.
11 years ago
ErikZalm
fd4542f33a
Merge pull request #805 from whosawhatsis/M200
...
autretract fix
11 years ago
ErikZalm
e8291ed728
Merge pull request #802 from Makers-Tool-Works/Marlin_v1
...
Clarify which PID values to enter
11 years ago
ErikZalm
465b654d24
Merge pull request #797 from Cylindric3D/update_menu_plan
...
Update menu plan
11 years ago
ErikZalm
88506a80c3
Merge pull request #789 from smiler/Marlin_v1
...
Fixed typo.
11 years ago
ErikZalm
b514d3c87f
Merge pull request #781 from Cylindric3D/typofixes_upstream
...
Various typo fixes #3 - only in comments, no code changes.
11 years ago
whosawhatsis
77df0d689a
autretract fix
...
I made these changes previously, but I can’t find the commit now. This
reapplies the changes to get auto retract working again.
Conflicts:
Marlin/Configuration_adv.h
Marlin/Marlin_main.cpp
11 years ago
ErikZalm
cc5f1d475c
Merge pull request #772 from ellensp/Marlin_v1
...
Updated gen3+ board pins names to current convention
11 years ago
Cylindric
91759dede6
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
11 years ago
Cylindric
557217fc05
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan
11 years ago
RoyOnWheels
aee63afccd
Clarify which PID values to enter
...
Users can be confused as to which values to enter after a PID tune. Updating the message to help clarity it.
New message: "PID Autotune finished! Put the last Kp, Ki and Kd constants from above into Configuration.h"
Old message: "PID Autotune finished! Put the Kp, Ki and Kd constants into Configuration.h"
11 years ago
Gabe Rosenhouse
99f6326544
Remove unnecessary dependency on time.h from qr_solve.cpp
...
Fixed compiler errors on Ubuntu using arduino-core
11 years ago
Cylindric
ea669cb504
Fix some extra and some missing tabs, to make the file consistent.
11 years ago
Cylindric
b46a1b6360
Update the menu plan document with the current menu as per ultralcd.cpp.
11 years ago
Cylindric
3cc7626d1f
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan
11 years ago
Gabe Rosenhouse
174b8d99d5
Simplify 3-point probing using new code only
11 years ago
Gabe Rosenhouse
3b718b816c
better documentation
11 years ago
Gabe Rosenhouse
34fd59c370
ABL at any points
11 years ago
Cylindric
541155ea87
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
11 years ago
alexborro
9fa328e5c8
Merge pull request #793 from MissionSt/use_axis_enums
...
Use constants instead of numeric literals
11 years ago
Gabe Rosenhouse
f308a8af91
update comment
11 years ago
Gabe Rosenhouse
357e31270a
Prevent G29 without first homing in X and Y
...
If position is unknown, then G29 can be dangerous.
11 years ago
Gabe Rosenhouse
d2d7d186b5
Use descriptive constants, more
11 years ago
Gabe Rosenhouse
2ccdf4f36d
Use descriptive constants instead of numeric literals
11 years ago
Christian Axelsson
c00383f286
Fixed typo.
11 years ago
Cylindric
60f72a78a9
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
11 years ago
nothinman
abba7a0003
Merge pull request #782 from marcovannoord/Marlin_v1
...
Added dutch to language.h
11 years ago
Cylindric
b868d668fa
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
11 years ago
Marco
8212d8d543
Revert "Fixed small typo that would prevent compiling"
...
This reverts commit 51ae4881ab
.
11 years ago
daid
46bae30573
Merge pull request #776 from whosawhatsis/fwretract
...
Fwretract fixes, cleanup
11 years ago
Marco
51ae4881ab
Fixed small typo that would prevent compiling
11 years ago
Marco
498d76fd79
Fixed some messages where the text shown on the screen was more than 17 characters
11 years ago
Jim Morris
af9395ac2e
Add M605 to dynamically set delta configuration
...
Save above configs in eeprom
fix docs in createTemperatureLookupMarlin.py
add missing azteegX3pro digipot settings in delta example config
11 years ago
nothinman
fd42f0d226
Merge pull request #783 from MissionSt/fix/syntax-error
...
Fix compile error
11 years ago
nothinman
96217bf36a
Merge pull request #777 from PxT/M114
...
Add whitespace to M114 output
11 years ago
Marco
cf5c3b6610
Added dutch to language.h
11 years ago
Gabe Rosenhouse
d1c64b9dc4
Fix syntax error introduced in 477b6fa1d
11 years ago
Cylindric
5d50819791
Various typo fixes - only in comments, no code changes.
11 years ago
nothinman
3f455889d0
Merge pull request #769 from Cylindric3D/typofixes_1
...
Various typo fixes - only in comments, no code changes.
11 years ago
nothinman
4ddedb3b27
Merge pull request #780 from Cylindric3D/typofixes_2
...
Various typo fixes #2 - only in comments, no code changes.
11 years ago
nothinman
d4ba23bc28
Merge pull request #770 from josefpavlik/Marlin_v1
...
Marlin v1
11 years ago
nothinman
bbb424bd2f
Merge pull request #779 from MissionSt/makefile-fix-abl
...
Makefile fixes
11 years ago
Cylindric
8f0cee2a14
Various typo fixes - only in comments, no code changes.
11 years ago
Cylindric
08263ae66e
Merge branch 'Marlin_v1' into typofixes_1
11 years ago
Gabe Rosenhouse
5bd09d26e2
Makefile works with auto bed leveling
11 years ago
Gabe Rosenhouse
b45beeffd6
typo fix in Makefile
11 years ago
Paul Telford
306588925d
Add whitespace to M114 output
11 years ago
whosawhatsis
c43838bb1e
disable auto retract by default
...
This should make it safe to enable FWRETRACT by default, with
autoretract (which should now be fixed) only enabled by M209. FWRETRACT
should probably now default to enabled (to make G10/G11 and M207-209
available, without changing functionality when they are not used), but
I’ll save that for another pull request/discussion.
11 years ago
whosawhatsis
99f0e44864
Move FWRETRACT defaults to configuration_adv.h
11 years ago
whosawhatsis
66e3869138
Fix autoretract
...
This takes the (now working) G10/G11 code and moves it to a function,
which is called by G10 and G11, and also called by G1 if autoretract is
enabled and a retract/recover move is detected.
11 years ago
whosawhatsis
2f2459c0db
Fix G10/G11 Z-lift
11 years ago
Gabe Rosenhouse
8c5675c290
Use language.h instead of English literals for "bed"
11 years ago
Gabe Rosenhouse
0f7393a13e
Refactor 'accurate' auto bed leveling to use probe_pt()
11 years ago
Gabe Rosenhouse
c4fbb44d6d
Refactor 3-point auto bed leveling to use probe_pt()
11 years ago
Gabe Rosenhouse
ad2c6488c7
Add probe_pt(), useful for auto bed leveling
11 years ago
Peter
c9c83a4560
Updated gen3+ board pins names to current convention
11 years ago
Mark Hanford
ab0d3c4fb3
Various typo fixes - only in comments, no code changes.
11 years ago
Josef Pavlik
477b6fa1df
move engaged from lcd console refreshes power off timeout
11 years ago
Josef Pavlik
831fc2a952
Pt100 and Pt1000 temperature sensors handling
11 years ago
nothinman
7dcd350941
A few changes to Russian, changed LCD strings to be <=17 characters.
11 years ago
daid
c31bb2b7ad
Only show the ZProbe offset when auto-bed-leveling is enabled.
11 years ago
daid
46f5bea19f
Add configurable beep for UltiPanel.
11 years ago
daid
d16a770855
Ultimainboard 2.x does not has a PS_ON pin.
11 years ago
daid
71bb3a8133
Add comments for Ultimainboard 2.0 configuration.
11 years ago
daid
9b7d87e885
Remove duplicate contrast define.
11 years ago
daid
816f0a678a
Merge pull request #768 from whosawhatsis/Marlin_v1
...
multiple FWretract fixes
11 years ago
whosawhatsis
6e43398509
G10/G11 bugfixes
...
Previous version was broken by using G92 E0 between retract and recover.
11 years ago
whosawhatsis
d6c5c503d4
correct feedrate units in comments for M207/M208
11 years ago
nothinman
15d6116188
Merge pull request #689 from cajun-rat/tidy
...
Use C++ initialization list
11 years ago
Martin Lukasik
0b9ecf3824
Language cleanup, part 1.
11 years ago
whosawhatsis
b5ba5c1465
Merge branch 'Marlin_v1' of https://github.com/whosawhatsis/Marlin into Marlin_v1
11 years ago
whosawhatsis
78e7654601
Keep FWRETRACT values in terms of millimeters when using M200
...
for volumetric E units
11 years ago
whosawhatsis
3f6d44d40b
Keep FWRETRACT values in terms of millimeters when using M200 for volumetric E units
11 years ago
Cylindric
363dc2f0e8
Merge branch 'Marlin_v1' into update_menu_plan
11 years ago
nothinman
5f797ca29f
Updated Polish, changed default firmware URL to Marlin.
11 years ago
Mark Hanford
0778f5f028
Add missing entries to the new Aragonian language.
11 years ago
Mark Hanford
54bab3e0d0
Merge branch 'Marlin_v1' into localisation
...
Conflicts:
Marlin/language.h
11 years ago
Mark Hanford
bdd0211aeb
Move strings in ultralcd.cpp into language.h.
11 years ago
Daniel Martinez
c8e5a82d49
keep English as default lang.
11 years ago
Daniel Martinez
f64592e362
Add Aragonese translation
11 years ago
ErikZalm
ac74f45dc0
Merge pull request #752 from MatixYo/patch-3
...
Update language.h
11 years ago
MatixYo
36086d3ca4
Update language.h
...
Updated Polish translations.
11 years ago
Cylindric
1781031f2d
Update LCD Menu Tree with current options, based on ultralcd.cpp and language.h.
11 years ago
Jim Morris
d485988bec
fix typo
11 years ago
Jim Morris
8a1fd25363
Default is to not define digipot_i2c
11 years ago
Jim Morris
5097c57d3a
Added pins for Azteeg X3 Pro under motherboard 68
11 years ago
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
11 years ago
ErikZalm
e1ae7952eb
Merge pull request #743 from Opticalworm/Marlin_v1
...
Improved support for panelolu2 encoder and buzzer
11 years ago
David Forrest
a5f53f0cf3
Heater wattage reporting for M105 using EXTRUDER_WATTS and BED_WATTS
11 years ago
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
11 years ago
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.
11 years ago
ErikZalm
61059385a3
Merge pull request #737 from whosawhatsis/M200
...
M200 implementation
11 years ago
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.
11 years ago
ErikZalm
0d81ae77bc
Merge pull request #727 from drf5n/oversampling
...
temperature.cpp: Actually use OVERSAMPLENR in the oversampling calculation.
11 years ago
ErikZalm
84df13f7d1
Merge pull request #721 from drf5n/lcdOnly
...
Enable basic ULTRA_LCD screen w/o encoders and menus.
11 years ago
ErikZalm
4c7e9502ad
Merge pull request #718 from drf5n/temptableRes
...
createTemperatureLookupMarlin.py: Add resolution comments and format for...
11 years ago
ErikZalm
652a0f6b5a
Merge pull request #717 from drf5n/tpins2
...
fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/...
11 years ago
ErikZalm
96a0cdc541
Merge pull request #716 from drf5n/maketeensy
...
Makefile: Update for Arduino 1.0.5 and Teensyduino dependent boards (HAR...
11 years ago
whosawhatsis
d24df7af2c
M200 implementation
11 years ago
David Forrest
f0b8d5ba3d
createTemperatureLookupMarlin.py: Change comment to refer to actual program name.
11 years ago
David Forrest
50f44d9249
createTemperatureLookupMarlin.py: Truncate to short after application of OVERSAMPLENR for improved resolution.
11 years ago
David Forrest
f5b5dd8038
createTemperatureLookupMarlin.py: Add output of Steinhart-Hart coefficients.
11 years ago
David Forrest
76cf07c3f7
Configuration.h: Use OVERSAMPLENR in dT_PID definition.
11 years ago
David Forrest
476c7193d8
temperature.cpp: Use OVERSAMPLENR in oversampling calculation.
11 years ago
whosawhatsis
f08bb8bb6a
Previous commit borked.
11 years ago
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.
11 years ago
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.
11 years ago
David Forrest
61a7256d42
Enable basic ULTRA_LCD screen w/o encoders and menus.
11 years ago
l.lefebvre
fdac8f6cec
Update ConfigurationStore.cpp
...
Unable to compile if ENABLE_AUTO_BED_LEVELING is not set (not set by default).
11 years ago
Alex Borro
05932e4458
Add Z Probe Offset to EEPROM and Ultra LCD
11 years ago
David Forrest
7216583b8b
createTemperatureLookupMarlin.py: Add resolution comments and format for Marlin.
11 years ago
David Forrest
e8e0697e48
fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/Printrboard compatibility.
11 years ago
David Forrest
75f39fadfc
Makefile: Update for Arduino 1.0.5 and Teensyduino dependent boards (HARDWARE_MOTHERBOARD=={8,81,82,83,84})
11 years ago
daid
df194f75e1
Added PT100 support for Ultiboard2
11 years ago
daid
380144c20f
Add Ultiboard2 electronics. With PWM current settings. For the few people that have this new board as experiment in their UM-Original.
11 years ago
fsantini
6ae7f7870d
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into ErikZalm
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
11 years ago
Phil Wise
17d6d965dc
Use C++ initialization list
...
This is the recommended approach for object initialization. The change
doesn't affect binary size (although in theory it could make it smaller).
11 years ago
Joseivaldo Benito Junior
ce8b9c4fc5
Correct missing parameter from last upmerge
...
Signed-off-by: Joseivaldo Benito Junior <jrbenito@benito.qsl.br>
11 years ago
Joseivaldo Benito Junior
8e48e24c7f
Update Delta example files
...
Signed-off-by: Joseivaldo Benito Junior <jrbenito@benito.qsl.br>
11 years ago
ErikZalm
46d2443c7d
Merge pull request #676 from IVI053/Marlin_v1
...
Minor improvements for encoder configuration, LCD entry for PSU controll and thermistor pins on RAMPS
11 years ago
-
eed053dffb
Revert "Made numbering of heat bed thermistor more logical as D8 is bed, D9 is Extruder 2 and D10 is Extruder 1, so T0 should be E1, T1 E1 and T2 bed to be sequential as MOSFET-Outputs"
...
This reverts commit b7eadb9f37
.
11 years ago
Erik van der Zalm
8349fc89a4
Fixed planner bug
11 years ago
Francesco Santini
da2a6f9a31
Accurate bed leveling: x loop inside y and zigzag motion
11 years ago
RicardoGA
d29615dc0c
Z and Y dual stepper drivers error
...
if you try to enable Z_DUAL_STEPPER_DRIVERS the error "You cannot have dual drivers for both Y and Z" shows even if you don't have defined Y_DUAL_STEPPER_DRIVERS and don't let you compile the firmware
to solve this problem i change this line:
#ifdef Z_DUAL_STEPPER_DRIVERS && Y_DUAL_STEPPER_DRIVERS
to:
#if defined (Z_DUAL_STEPPER_DRIVERS) && defined (Y_DUAL_STEPPER_DRIVERS)
now the error only show if you define both Z_DUAL_STEPPER_DRIVERS and Y_DUAL_STEPPER_DRIVERS
11 years ago
fsantini
5bde7fcb28
Minor code and comment polishing
11 years ago
-
20faff5935
Incorporate PS_DEFAULT_OFF for starting state on LCD menu entry
11 years ago
-
e5d3044801
Added posibility to set ENCODER_STEPS_PER_MENU_ITEM in Configuration.h like ENCODER_PULSES_PER_STEP as it depends on it for usability
11 years ago
-
b7eadb9f37
Made numbering of heat bed thermistor more logical as D8 is bed, D9 is Extruder 2 and D10 is Extruder 1, so T0 should be E1, T1 E1 and T2 bed to be sequential as MOSFET-Outputs
11 years ago
Michal Dyntar
e8786bf110
Added support for Cheaptronic v1 electronic
11 years ago
fsantini
cc2925b705
Implemented a least squares fit of the bed equation for auto bed leveling.
...
The code for the LSQ solver (qr_solve) is copyrighted by John Burkardt and released under LGPL here:
http://people.sc.fsu.edu/~%20jburkardt/c_src/qr_solve/qr_solve.html
(see qr_solve.cpp for further copyright information)
11 years ago
fsantini
b64661070e
Fixed the plane vector equation to a simpler one (only dependent on the normal)
...
Removed the calculation of the inverse matrix since the rotation matrix is orthogonal, therefore inverted == transposed.
Much simpler and mathematically robust.
11 years ago
Alex Borro
5c44f6c434
Bed Heater monitoring in Controller Fan
...
In some cases the Bed Heater FET heats up more then stepper drivers, so
this change add the bed monitoring to the controller fan. As soon as the
bed heater is turned on, the controller fan will run as well.
11 years ago
Alex Borro
b33375d438
Z Axis Safe Homing when using Z Probe
...
Recommended for those who are using the Z Probe for Z Homing (as
Z-Endstop)
This feature has two changes:
1) Allow user to choose where the Z Probe will touch the bed when homing
all axis together (G28) by setting below defines:
Z_SAFE_HOMING_X_POINT
Z_SAFE_HOMING_Y_POINT
2) Prevents the user to perform Z Axis Homing when the Z Probe is
outsite bed.
11 years ago
Alex Borro
35905ea4f9
Allow heaters to stay full On when PWM=127
...
In previous version, even with PWM = 127, the system turns the FET off
and then on in the next cycle. This bevavior may increase the FET heat
dissipation.
It was fixed keeping the FET always On when PWM=127.
11 years ago
Erik van der Zalm
a94e588765
Changed slow buttons behavior.
11 years ago
Erik van der Zalm
69af392554
Added HEATERS_PARALLEL (Request from reifsnyderb)
...
This allows a hot end with two heaters and a FET for each heater. This is useful if the FET is not capable of heating two heaters.
11 years ago
Erik van der Zalm
48a185d004
Fixed compile errors from bad commits.
11 years ago
ErikZalm
24d1f480b6
Merge pull request #647 from shaggythesheep/newfeature-M226
...
Implement M226 - GCode Initiated Pause
11 years ago
ErikZalm
95b41413e6
Merge pull request #641 from hugokernel/master
...
M80 - ATX Power On related modification
11 years ago
ErikZalm
59b96e323e
Merge pull request #640 from fmalpartida/SAV-MkI
...
Added support for BT on AT90USB devices, corrected LCD bug, added new board and LCD
11 years ago
ErikZalm
2433ee6fc8
Merge pull request #637 from justuswilhelm/Marlin_v1
...
Fix servo control for Melzi v2.0
11 years ago
ErikZalm
3455a2bac2
Merge pull request #636 from PrintToPeer/Marlin_v1
...
Add UUID support to M115 responses.
11 years ago
Richard Miles
dc887ef99b
Implement M226 - GCode Initiated Pause
...
Implemented M226 as described here:
http://reprap.org/wiki/G-code#M226:_Gcode_Initiated_Pause
Waits for pin to be become either HIGH, LOW or the inverse of what it
was before. Allows printing to pause until user interaction
11 years ago
Charles R
c244eb860c
If you have a switch on suicide pin, this is useful if you want to
...
start another print with suicide feature after a print without
suicide...
11 years ago
fmalpartida
7b556d2e96
Added BT support on AT90USB devices
...
Added AT90USB device BT connectivity support using second UART.
11 years ago
Kaz Walker
a5e8575829
Add UUID support to M115 responses.
11 years ago
Daniel Benamy
cab84e0e5b
Add (correct) missing pin definitions for Y2
...
I tested this and it works.
11 years ago
fmalpartida
5b3f60ea2e
Corrected LCD only error
...
If only an LCD is defined and no menu or keyboard defined, there is a
compilation error.
Added conditional compilation.
11 years ago
Justus Perlwitz
62d0b79023
Fix servo control for Melzi
11 years ago
fmalpartida
b5a964fcc5
Initial SAV MkI (RepRap CloneWars board) integration.
...
Included support for BT dongle on AT90USB boards.
Added LCD Shift Register LCD control
Included support for RepRap Clone Wars project board (SAV MKI).
11 years ago
dumle29
f941203172
PS_ON configurable boot state
...
Allows the user to select wheter or not the PSU should be turned on or
kept in standby when marlin boots
11 years ago
whosawhatsis
c79e3967b3
Make G11 not horribly broken
11 years ago
bkubicek
d69822ed51
Fix '#'
...
since it can occure in comments.
11 years ago
bkubicek
2fb2a0a119
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
bkubicek
39d88bcccb
preparation for hibernation
...
If a print is stopped, it would be nice in the future to write a file with the printer state, the filename of the print, and the position within the print.
this file could be read, to continue a previously stopped print.
not finished yet.
11 years ago
bkubicek
ab965376ff
Sub-file calls.
...
by overloading M32 it is now possible to execute gcode files from other gcode files, with a fixed recursion level.
This can be used e.g. for having a real start.g and end.g somewhere on the sd card, which are then called from the normal print file.
Another usecase would be to have macro-files for nozzle-change and layerchange.
I have not tested the speedwise performance. The testing was done with pronterface.
syntax:
normal call from sd card will open the new file and continue executing there.
M32 !/path/filename#
this however will call the new file and return to the caller file.
M32 P !/path/filename#
with the optional "S<position>" the file starting position can be set.
this is for continuing prints from a previous location.
11 years ago
bkubicek
b2cc27e5ea
Added a magic character for sd buffering.
...
if a '#' is read now the buffer will be emptied before reading ahead.
This is so one can execute files from within gcode files, without messing the buffer with preread characters from the caller file.
# can not occure in sd files imho, because it should only occure within checksums in ther serial communication.
Yes, thats a lame argument. If you have a better idea please tell me. It has to be a character that one can type
on a keyboard manually.
11 years ago
Erik van der Zalm
8a08cca0f2
Added temperature status less.
...
Hopefully fixed viky button handling without braking other boards
11 years ago
Erik van der Zalm
667d278f54
Revert "Fix for Viki display"
...
This reverts commit 314fd13c39
.
11 years ago
Erik van der Zalm
bf27e79e74
Small BlinkM fix
11 years ago
Erik van der Zalm
87e28c0599
Added ifdefs to blinkm
11 years ago
Erik van der Zalm
24c6b2ab35
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
ErikZalm
6a803ba9c5
Merge pull request #590 from timkoster/Marlin_v1
...
Added BlinkM support over i2c
11 years ago
Erik van der Zalm
457d8a0acb
Fixed merge conflicts
11 years ago
Alex Borro
6f85a8c7aa
Bed auto Leveling change: Raise Z before homing
...
- Added "Z_RAISE_BEFORE_HOMING" for raising Z the defined distance
before homing. This is useful to avoid Z-Probe collision when hotend is
near bed.
- Fixed the issue of Z not going bellow Z_PROBE_OFFSET when
"min_software_endstops" is true.
Now the Z_PROBE_OFFSET is not set in Z_MIN_POS, it is added after
homing.
11 years ago
Alex Borro
dd3086d3f2
Show Temperature ADC values
...
If "SHOW_TEMP_ADC_VALUES" is defined in Configuration_adv.h, the M105
command will present, after tradicional temperatures, the ADC value read
from temp sensors. This is great for adjusting thermistor tables with
thermocouple.
From Pronterface you can see the ADC value and compare with a
thermocouple reading.. then you just need to create your own thermistor
table.
Since this merge doesnt change the original information, it doesnt mess
with PC software parsing (tested under Pronterface and Repetier-Host).
11 years ago
bkubicek
7fad13a1e2
Reverse SD card file name order.
...
This is _not_ automatically the cronological, since deleting a file will free
the filesystem descriptor for it, which then will be used by the next file copied on it.
Since this makes the auto0.g file very inaccessible, I put the option back, to have it in the prepare menu.
this should satisfy https://github.com/ErikZalm/Marlin/pull/373
as a reminder, auto0.g will be executed every time after a boot with sd card present and file present.
thereafter, if there is a file auto1.g this will be done. Thats IMHO the best place to put settings, and prepare heating.
I also execute again after each (now again via the prepare menu) before starting a new print/ after a failed one.
It for me 100% replaces any start.gcode form the slicers.
11 years ago
bkubicek
b832f5b9f6
added delta tower babystepping. Its untested, but hopefully florian horsch will be able to try.
...
also, removed some trouble for compilation with corexy.
I think that babystepping is only possible in z for a delta tower.
not sure if it would be usefull to step individual motors on a delta, i don't own one
11 years ago
bkubicek
c38b0855c8
I think that filament change is ready for the masses. I have tested very often with my ultimaker.
...
I strongly vote for it being a single gcode, because otherwise the triggering from the menu is terrible.
11 years ago
bkubicek
d147a057ac
Add the socalled "Babystepping" feature.
...
It is a realtime control over the head position via the LCD menu system that works _while_ printing.
Using it, one can e.g. tune the z-position in realtime, while printing the first layer.
Also, lost steps can be manually added/removed, but thats not the prime feature.
Stuff is placed into the Tune->Babystep *
It is not possible to have realtime control via gcode sending due to the buffering, so I did not include a gcode yet. However, it could be added, but it movements will not be realtime then.
Historically, a very similar thing was implemented for the "Kaamermaker" project, while Joris was babysitting his offspring, hence the name.
say goodby to fuddling around with the z-axis.
11 years ago
Erik van der Zalm
bca353cc12
Fixed duplicate define in fastio.h
11 years ago
Alex Borro
253dfc4bc1
Bed Auto Leveling feature
...
Check the Readme for instruction how to enable and configure the feature
11 years ago
ErikZalm
1bda6bf862
Merge pull request #609 from phq1910/patch-1
...
Update Configuration.h
11 years ago
ErikZalm
c80aac1518
Merge pull request #610 from phq1910/patch-2
...
Update pins.h
11 years ago
Erik van der Zalm
314fd13c39
Fix for Viki display
11 years ago
phq1910
4f7c6dfe35
Update pins.h
...
Include Pins cpu Sethi 3D
11 years ago
phq1910
57173739a1
Update Configuration.h
...
Include CPU Sethi 3D
11 years ago
Erik van der Zalm
0dca49a7c0
Added Azteeg X3 board.
11 years ago
Erik van der Zalm
d8c2c810b4
Added info to the delta configuration files in the configuration.h file
11 years ago
Erik van der Zalm
9bc88f8bab
Placed optional ENCODER_PULSES_PER_STEP in the configuration.h file
11 years ago
Erik van der Zalm
3ca1ca6869
Fixed missing ENCODER_PULSES_PER_STEP
11 years ago
Tim Koster
97b0da0c2e
Removed #ifndef BLINKM
11 years ago
Tim Koster
61db046b32
Added #ifdef BLINKM around new code. Also refined BlinkM.h.
11 years ago
Richard Miles
77df2ab0e7
Make Y_DUAL_STEPPER_DRIVERS disabled by default
11 years ago
Richard Miles
ed1ab42186
Added Y_DUAL_STEPPER_DRIVERS
...
Enables two stepper drivers to be used for the Y axis (useful for
Shapeoko style machines)
Each Y driver can be stepped in either the same way or in opposite
directions, accounting for different hardware setups (leadscrew vs. belt
driven)
11 years ago
Richard Miles
f4a59e4ce5
Revert "Added Y_DUAL_STEPPER_DRIVERS"
...
This reverts commit 7ee275b620
.
11 years ago
Richard Miles
7ee275b620
Added Y_DUAL_STEPPER_DRIVERS
...
Enables two stepper drivers to be used for the Y axis (useful for
Shapeoko style machines)
Each Y driver can be stepped either the same way or in opposite
directions, accounting for different hardware setups (leadscrew vs. belt
driven)
11 years ago
ErikZalm
6a1e980c6d
Merge pull request #600 from xoan/Encoder_Pulses_Per_Step
...
add ENCODER_PULSES_PER_STEP
11 years ago
ErikZalm
20076a8bd3
Merge pull request #598 from GDV0/Marlin_v1
...
FIx compilation error when enabling SERVO_ENDSTOPS (#591 )
11 years ago
Erik van der Zalm
3626b5ad8b
Removed Delta from the default config file.
...
Changed EEPROM CHITCHAT behavior. M503 is always enabled.
11 years ago
Xoan Sampaiño
bf7007d02f
add ENCODER_PULSES_PER_STEP
11 years ago
GDV0
f17506c504
FIx compilation error when enabling SERVO_ENDSTOPS ( #591 )
11 years ago
Martin Lukasik
acd8619809
Fan fix for Panelolu2+Sanguinololu.
11 years ago
George Roberts
595580556c
Fixed bug that makes ulticontroller knob backwards introduced Feb 28 2013 by Robert.
...
Bug introduced in version 6beb42cdf6
.
Robert did a good job of simplifying but messed up this chunk of code.
Looking at working version: 839bef6d5d
it seems there is no case where encrot3 should be defined as 2
because if ULTICONTROLLER is defined then NEWPANEL is also defined.
11 years ago
Tim Koster
88dfeefca3
Define BlinkM default disabled
11 years ago
Tim Koster
5350faf2a2
Merge https://github.com/timkoster/MarlinBlinkM into Marlin_v1
11 years ago
Tim Koster
7016cc9511
Added BlinkM support over i2c
11 years ago
Tim Koster
3b315b3da0
Added BlinkM support over i2c
11 years ago
Jim Morris
f26f26b7bd
Fix the example delta configuration as someone forgot to do it.
11 years ago
Peter Hercek
9aa2229077
add command M666 for adjusting delta printer endstop position
12 years ago
Robert F-C
9547fb9dfb
Add duplication and auto-park mode for dual x-carriage support.
12 years ago
Steve Kelly
53614e5144
add pins for rambo lcd
12 years ago
Steve Kelly
b42d24e31e
add additional pins to avr2560 for rambo lcd
12 years ago
Nicolas Rossi
b0c8120fcc
Added feedrate setting in exemple config for manual moves from panel
12 years ago
Nicolas Rossi
a54fe2d73c
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1
...
Conflicts:
Marlin/Marlin_main.cpp
12 years ago
ErikZalm
7ea63d08df
Merge pull request #565 from iXce/avrdudeconfpath
...
Detect OS in Makefile to use the correct avrdude.conf path
12 years ago
ErikZalm
4187b637a5
Merge pull request #570 from hg42/separate-INVERTING-macros-for-MIN-and-MAX-endstops
...
separate INVERTING for MIN and MAX endstops (6 #defines instead of 3)
12 years ago
ErikZalm
07e7de3600
Merge pull request #569 from hg42/convert-PROTOCOL-macros-from-statements-to-expressions
...
convert PROTOCOL macros from statements to (multiple, comma separated) expressions
12 years ago
Guillaume Seguin
c0c4c97db6
Detect OS in Makefile to use the correct avrdude.conf path
12 years ago
hg42@gmx.net
2ca983568d
separate INVERTING for MIN and MAX endstops (6 #defines instead of 3)
12 years ago
hg42@gmx.net
3700f688f5
convert PROTOCOL macros from statements to (multiple, comma separated) expressions
12 years ago
daid
a504c88346
Fix a bug where the PID controllers D action kicks in hard as soon as the PID controller starts.
12 years ago
Nicolas Rossi
394ed08f88
Added feedrate setting for manual moves from panel
12 years ago
Nicolas Rossi
9bf1cf1b22
Pre-calculate diagonal rod length squared
12 years ago
Nicolas Rossi
4623e78ce0
Added Honeywell thermistor 135-104LAF-J01
12 years ago
Brendan-csel
d7f384f680
Skip SD menu refresh if nothing has changed
12 years ago
Brendan-csel
abc8320a68
Save LCD_CLICKED before it is cleared
...
The SD card menu was refreshing so slowly that the button interrupt was clearing LCD_CLICKED before the menu items could check it.
12 years ago
Guillaume Seguin
f4c3135c6d
Add Panelolu2 pins for RAMPS1.3
12 years ago
Guillaume Seguin
aae42c68f9
Update French translation in language.h
12 years ago
Guillaume Seguin
4d435c38a6
Add support of LiquidTWI2-based panels to Makefile
...
Use LIQUID_TWI2=1 as make argument to enable this support
12 years ago
Guillaume Seguin
6c42a3a339
Woops, fix logic
12 years ago
Guillaume Seguin
376d8af2c8
Report temperatures for all extruders
12 years ago
ErikZalm
434b6a05c1
Merge pull request #552 from iXce/Marlin_v1
...
Report temperatures for all extruders in reply to M105
12 years ago
ErikZalm
bdc2621119
Merge pull request #561 from Brendan-csel/Marlin_v1
...
Fix for Viki LCD issues printing from SD card
12 years ago
ErikZalm
6965bd4e15
Merge pull request #560 from njprossi/Marlin_v1
...
Fixed move from panel for delta bot #557
12 years ago
ErikZalm
a55b33e613
Merge pull request #559 from iXce/panelolupinsramps13
...
Add Panelolu2 pins for RAMPS1.3
12 years ago
ErikZalm
8b34351537
Merge pull request #558 from iXce/frenchupdate
...
Update French translation in language.h
12 years ago
ErikZalm
735e556724
Merge pull request #555 from iXce/liquidtwi2_makefile
...
Add support of LiquidTWI2-based panels to Makefile
12 years ago
Brendan-csel
d80aecda0a
Skip SD menu refresh if nothing has changed
12 years ago
Brendan-csel
be2dea1dc6
Save LCD_CLICKED before it is cleared
...
The SD card menu was refreshing so slowly that the button interrupt was clearing LCD_CLICKED before the menu items could check it.
12 years ago
Nicolas Rossi
55c287a69e
Fixed move from panel for delta bot #557
12 years ago
Guillaume Seguin
1902d339b0
Add Panelolu2 pins for RAMPS1.3
12 years ago
Guillaume Seguin
eb23a68e92
Update French translation in language.h
12 years ago
ErikZalm
1561c6df51
Merge pull request #547 from wolfmanjm/delta-configuration
...
Setup Default configuration for Deltas if DELTA is defined
12 years ago
Guillaume Seguin
374bc99fa3
Add support of LiquidTWI2-based panels to Makefile
...
Use LIQUID_TWI2=1 as make argument to enable this support
12 years ago
Jim Morris
ab624eac2a
revert COnfiguratiuon to the same as head
12 years ago
Jim Morris
52f79ffeca
add an example default configuration for delta style bots
12 years ago
Jim Morris
b9d7ccf1cd
Merge remote-tracking branch 'upstream/Marlin_v1' into delta-configuration
...
Conflicts:
Marlin/Marlin_main.cpp
12 years ago
Guillaume Seguin
d4d1540727
Use -fno-use-cxa-atexit to override gcc --enable-cxa_atexit
12 years ago
Guillaume Seguin
01ed99143c
Woops, fix logic
12 years ago
Guillaume Seguin
76841450c8
Only display poweron/poweroff if PS_ON_PIN > -1
12 years ago
Guillaume Seguin
44f327d738
Uniformly reindent language.h
12 years ago
Guillaume Seguin
326d2db025
Update language.h so that all languages compile
...
Some strings still need translation, but at least everything compiles.
12 years ago
Guillaume Seguin
2cb716f513
Run Marlin/language.h through dos2unix
12 years ago
Guillaume Seguin
34da3a0a3f
Merge github.com:ErikZalm/Marlin into Marlin_v1
...
Conflicts:
Marlin/language.h
12 years ago
Guillaume Seguin
18199ff960
Merge github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
Robert F-C
fb5334f428
Fixed compile error when QUICK_HOME is defined.
...
As well a couple of minor changes to handling of extruder offset for
dual x-carriage mode.
12 years ago
Robert F-C
c3568398b5
Disable DUAL_X_CARRIAGE by default
12 years ago
Robert F-C
39cd3dbdbe
Remove dual x-carriage functionality that could/should be implemented in slicer
...
Also added a couple of missed merge lines in homeaxis() from previous
commit.
12 years ago
Jim Morris
fb20ceabce
enable soft endstops for delta
...
disable delta by default
12 years ago
Jim Morris
d01ee7e7b5
fix zjerk being the same for delta as xy jerk
...
add more delta defaults
on delta make second home even slower
12 years ago
Robert F-C
d7390e13d9
Support dual x-carriage printers
...
Dual x-carriage designs offer some substantial improvements for dual
extruder printing.
12 years ago
Jim Morris
f3aa2a48e7
update max pos
12 years ago
Jim Morris
460751503e
Added default configurations for deltas when DELTA is defined
12 years ago
Maik Stohn
9da94c247a
fixed bad lcd commit from makr3d
...
#elsif does not exist #elif is correct
12 years ago
Erik van der Zalm
59004023fd
Fixed typo
12 years ago
Erik van der Zalm
461dad6e05
Added : M32 - Select file and start SD print (Can be used when printing from SD card)
...
Untested
12 years ago
Erik van der Zalm
c4a2077951
M109 and M190 now wait when cooling down if R is used instead of S.
...
M109 S180 waits only when heating.
M109 R180 also waits when cooling.
12 years ago
ErikZalm
8a2a3ef91d
Merge pull request #531 from iXce/Marlin_v1_lcd
...
Only clamp panel movements if software endstops are enabled
12 years ago
Erik van der Zalm
6397b3339c
restored configuration.h defaults
12 years ago
Erik van der Zalm
cdaaad3df1
Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1
12 years ago
Erik van der Zalm
e3bdefd873
fixed missing #endif
12 years ago
Erik van der Zalm
a5be0c52c6
no message
12 years ago
Michael Mayer
e509cdbeb0
added contrast control function for gLCDs
12 years ago
Michael Mayer
99b7e926e7
added MaKr3d Melzi board
12 years ago
Gabino Lopez
68be33b1fc
Update language.h
...
I update the spanish Messages, now this compile for spanish language.
12 years ago
daid
acb3271c9a
Merge pull request #534 from xifle/Marlin_v1
...
Fixes compiler warning for feedrate deadzone
12 years ago
xifle
61fe430d4f
Should fix compiler warning for feedrate deadzone
12 years ago
Gord Christmas
fde17d5720
Fix for ugly code compilation errors in SERVO_ENDSTOP checks
12 years ago
Guillaume Seguin
aa65c20d1f
Only clamp panel movements if software endstops are enabled
12 years ago
Erik van der Zalm
ecf3ab5de4
Added thermistor 60 to configuration.h
12 years ago
Nicolas Rossi
2daa85918e
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
Marlin/language.h
Marlin/pins.h
Marlin/ultralcd.cpp
12 years ago
Erik van der Zalm
2015989f84
Added DISABLE_MIN_ENDSTOPS
12 years ago
Christian Inci
648d45cfb2
Fix Pin Description Typo
...
Reverse 'Bed' and 'Fan' at the RAMPS 33 Description.
Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
12 years ago
ErikZalm
171719f18c
Merge pull request #525 from lajos/ultralcd_pid
...
ultralcd.cpp compile errors when !defined(PIDTEMP)
12 years ago
lajos
b519af4f05
fixed another !defined(PIDTEMP) compile in ultralcd.cpp
12 years ago
lajos
7d03c52511
fixed compile error in ultralcd.cpp when PIDTEMP undefined
12 years ago
lajos
02dee80fa5
added Azteeg X1 motherboard
12 years ago
Henrik Brix Andersen
47dc70e3ec
Fix location of avrdude.conf
12 years ago
Henrik Brix Andersen
1d258903bb
Allow command line compilation when using BEEPER.
12 years ago
Erik van der Zalm
e34c9981ab
Delta disabled by default
12 years ago
Erik van der Zalm
26a441fc7d
More 3Drag controller patches.
12 years ago
Erik van der Zalm
ac975ed8c2
Merge branch 'deltabot' into Marlin_v1
12 years ago
Jim Morris
caa848f943
fix homing for deltas
12 years ago
Erik van der Zalm
7ad12be763
Merge branch 'Marlin_v1' of https://github.com/codexmas/Marlin into codexmas-Marlin_v1
...
Conflicts:
Marlin/Configuration.h
README.md
12 years ago
Erik van der Zalm
408169aef4
Merge branch 'Marlin_v1' of https://github.com/BorisLandoni/Marlin into BorisLandoni-Marlin_v1
...
Conflicts:
Marlin/Configuration.h
Marlin/language.h
Marlin/pins.h
12 years ago
Erik van der Zalm
bd96d22bfb
Merge branch 'Marlin_v1' into thinkyhead
...
Conflicts:
Marlin/Configuration.h
Marlin/Configuration_adv.h
Marlin/Marlin.h
Marlin/Marlin_main.cpp
Marlin/Servo.cpp
Marlin/language.h
Marlin/pins.h
Marlin/planner.cpp
Marlin/ultralcd_implementation_hitachi_HD44780.h
README.md
12 years ago
Erik van der Zalm
73f21cd5d6
Spanish updated so far.
12 years ago
Erik van der Zalm
6f4a6e531c
Merge branch 'deltabot' into Marlin_v1
12 years ago
Erik van der Zalm
01edf22a10
Fix home_all_axis to make QUICK_HOME work with Repetier-Host which sends G28 X0 Y0 Z0 instead of G28. Thanks to Matt Schoenholz for reporting this issue.
12 years ago
Erik van der Zalm
ff6fa09ecf
Moved corexy implementation from stepper to planner
...
(Thanks iquizzle)
12 years ago
Erik van der Zalm
c8dcc7c208
Allow increasing the software PWM frequency.
12 years ago
Erik van der Zalm
8b0d82e9db
Removed "awaiting translation" for french
12 years ago
Erik van der Zalm
1e05d192ab
Make the beep tone less offensive
12 years ago
Erik van der Zalm
373f3ecab3
Merge branch 'deltabot' of https://github.com/jcrocholl/Marlin into deltabot
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
Marlin/pins.h
12 years ago
kiyoshigawa
f295712008
Trying to fix weird diff on ultralcd_implementation_hitachi_HD44780.h
12 years ago
kiyoshigawa
69b02031ca
Fixed small error in lcd define statements.
12 years ago
kiyoshigawa
6a81291c57
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
...
This should fix issues with pull request 467, I hope.
Conflicts:
Marlin/Configuration.h
Marlin/Marlin.pde
Marlin/ultralcd_implementation_hitachi_HD44780.h
12 years ago
BorisLandoni
c1cb5977ee
Update Configuration.h
12 years ago
BorisLandoni
8a5bd8a808
Update Configuration.h
12 years ago
BorisLandoni
c1d7cf939e
Update language.h
12 years ago
BorisLandoni
4c7d1436e9
Update pins.h
12 years ago
BorisLandoni
6588933c04
Update Configuration.h
12 years ago
Scott Lahteine
5dabc95409
Apply all changes from latest Marlin_V1
...
Diffed and merged, preserving my updates
12 years ago
Gord Christmas
a733537ddd
Missed some variable declarations
...
Integrated fixes from henrikbrixandersen pull request #504
12 years ago
Gord Christmas
f4f30c9d64
Added servo actuated enstop coding to allow G28 command to engage and retract a servo to specified angles.
12 years ago
Erik van der Zalm
79374f0b93
Merge branch 'reisnyderb' of https://github.com/ErikZalm/Marlin into Marlin_v1
12 years ago
Maik Stohn
da05b3ba94
faster GLCD (ST7920 SW-SPI) implementation / fixes
...
- fixed long menu entries (>14 or >18 chars) caused overrun in dogm lcd
implementation
- fixed pin set problem when in interrupt
- much faster ST7920 SW-SPI implementation
- increased ST7920 framebuffer size for more speed
12 years ago
kiyoshigawa
4b19c8552e
Fixing changed Configuration.h settings to be default values per ErikZalm Request.
12 years ago
Erik van der Zalm
971ec35135
Expanded M302 to allow setting the temp
12 years ago
Erik van der Zalm
5090c56651
More redundant temp sensor changes. (After testing and debugging by reifsnderb)
12 years ago
Guillaume Seguin
16b9239a26
Report temperatures for all extruders
12 years ago
ErikZalm
a964b3cf3d
Merge pull request #495 from Gatulibu/Marlin_v1
...
Added support for Megatronics v2.0 and Minitronics v1.0
12 years ago
Maik Stohn
e8572c5239
Fix: Long menu entries (>14 or >18 chars) caused overrun in hitachi display implementation
12 years ago
Maik Stohn
7ee70c2248
Fix: removed wrong ; at end of define
12 years ago
Gatulibu
b78fa6bb70
Added support for Megatronics v2.0 and Minitronics v1.0
...
merged from code downloaded from reprapworld.com
12 years ago
Erik van der Zalm
9be61cdc02
Added redundant temp sensor
12 years ago
Erik van der Zalm
7231a20dba
Put #ifdef around servo pins in pins.h. This allows the pins to be used for M42.
12 years ago
Alexander Kasimir
e2ff536b03
Fixed typo in Comment
12 years ago
Robert F-C
40eb07bad4
Revert and extend previous change pin check change
...
Reviert previous change of #if BLAH_PIN > 0 to #if defined(BLAH_PIN) &&
BLAH_PIN > -1. Unfortunately some times pin 0 is used. For my sins I've
gone through and replaced all unsafe checks of #if BLAH_PIN > -1 with
the safe version.
12 years ago
Maik Stohn
bd33cf4a9f
fixed typo / added "const" to defines for newer gcc compatibility
12 years ago
ErikZalm
567291e734
Merge pull request #485 from Banjer/Panelolu2_Melzi
...
Add Panelolu2 support for Melzi
12 years ago
Maik Stohn
8d80cbbf4c
fix broken LCD commit #dfa549f268 from buildrob - GLCD/DOGM implementation was ignored
12 years ago
xifle
98d0d48191
fixed merge
12 years ago
xifle
bbe67fca5a
soft tab correction
12 years ago
xifle
9eeb711c96
Merged from Upstream Master
12 years ago
Bas Spaans
424101110c
Add Panelolu2 support for Melzi
12 years ago
Robert F-C
0d4a9444c4
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
Erik van der Zalm
86cce025f4
Added #ifdef NUM_SERVOS to servo.cpp
12 years ago
xifle
03141a5ef4
LCD: Added Deadzone at 100% Feedrate
...
This adds a deadzone at 100% Feedrate when changing it at the status
screen/main menu. Prevents from unwanted feedrate-changing when
navigating back to the main menu and makes it easier to return to 100%.
12 years ago
Gord Christmas
28ada096e2
Adding servo documentation
12 years ago
Robert F-C
4121311b9d
Change to LCD status indicators
...
The I2C LCD status indicators now indicate when the hotends or bed are
turned on at all (rather than just when they are in their heating phase)
12 years ago
Robert F-C
dfa549f268
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
ErikZalm
64360164ad
Merge pull request #482 from codexmas/Marlin_v1
...
servosupport
12 years ago
ErikZalm
86405cdd11
Merge pull request #479 from MStohn/thermocouple
...
BUGFIXES for temperature.cpp / add RUMBA thermocouple support
12 years ago
Erik van der Zalm
6c45c3f4e7
BariCUDA changes
12 years ago
Gord Christmas
96624f0f31
Forgot to include reference to Servo in makefile
12 years ago
Gord Christmas
dc59f07d24
First attempt at refactoring of original servo code. Only adding servo support as a start to keep things simple.
12 years ago
Gord Christmas
b668cb0516
Adding in clean copies of Servo library from Arduino 1.0.4
12 years ago
MaikStohn
95dff34b73
fixed wrong compare for min temp check of heater 1 and heater 2
12 years ago
MaikStohn
4cc6f9f6de
fixed wrong pin initialization when using temperature 2 pin input
12 years ago
MaikStohn
61a48cc662
Add support for RUMBA thermocouple add on
12 years ago
MaikStohn
9cc15876be
Add support for RUMBA thermocouple add on
12 years ago
ErikZalm
c9cf2174dd
Merge pull request #474 from xifle/Marlin_v1
...
Fixed "Cooldown" Selection not reseting bed temp
12 years ago
Erik van der Zalm
bd2cd4903e
Added #ifdef BARICUDA around the BariCUDA changes
12 years ago
Jordan Miller
37f3199df3
fixed problems in planner with solenoids for BariCUDA when set to 0
12 years ago
Jordan Miller
fbd899a37d
Support for BariCUDA Paste Extruder derived from MakerBot Frostruder. Using Ultimachine RAMBo board. M126/M127 and M128/M129.
12 years ago
xifle
29bb8d7d4f
Fixed "Cooldown" Selection not reseting bed temp
...
- enquecommand with multiple lines "\n" doesn't work -> M140 S0 didn't
get processed. So I wrote a new func for the cooldown which uses
setTargetHotend. In addition this does return to status page after
selection.
- Added setWatch() to preheat-functions (Temperatur sanity check
would never have worked when preheating from the lcd panel)
12 years ago
Robert F-C
015d0594b0
Optimize menu selection for Viki rotary encoder.
...
The Viki LCD rotary encoder uses a different number of steps per
rotation. This fixes the seeming "missed" steps when selecting a menu.
12 years ago
gregor
2739c26c4f
changes:
...
- changed the variables from keypad to reprapworld_keypad
- added a missing ifdef check
12 years ago
gregor
6fb9573157
added support for the reprapworld keypad
12 years ago
Tim Anderson
594193c908
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
Tim Anderson
1fa61c297e
Turning off Control Panel by Default and Updating the link to the LiquidCrystal_I2C library to avoid confusion.
12 years ago
kiyoshigawa
b27a59f41e
Added support for Elefu RA Board and Elefu Control Panel
12 years ago
midopple
a65a26d6b4
If CORE_XY is in use X and Y Axis had to be activated at the same time
12 years ago
midopple
db2f157a22
Replace the <= to < in the Command M907, M350 and M351.
...
The for loop for Axis count over the Array.
Add a break after M907
12 years ago
Scott Lahteine
a5cd582665
Support for 10 level deep SD folder hierarchy
12 years ago
Arnoud
fc4ab05157
Solved minor bug in controllerFan()
...
Extruder 2 was checked where extruder 1 should be checked.
12 years ago
Scott Lahteine
0ef54f2f85
Make M303 silent when "S0" is sent
...
If S is left out perhaps it should be silent, but check the spec for
this M code.
12 years ago
Scott Lahteine
a200521eab
Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h
...
Also cosmetic comment changes and spelling corrections in printed
messages
12 years ago
Martin Renold
1a397825f9
fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error
12 years ago
Robert F-C
289c02eda4
Remove unnecessary pin initialization in stepper.cpp
...
(duplicates initialization in Marlin_main.cpp)
12 years ago
Robert F-C
d5ad7a0814
Rework change to incorporate CONTROLLERFAN
...
Also refactor extruder auto fan logic to simplify further and now only
check every 2.5 seconds
12 years ago
Robert F-C
c3cdaceab3
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
Robert F-C
1c127217df
Make DOGLCD merge neater.
12 years ago
Robert F-C
7f57f28ccc
Add lcd_buzz function to ultralcd.h so that non-LCD code can make use of lcd's buzzer.
...
Argument order of lcd_buzz was set to mirror that on tone(). Change
default M300 frequency to something audible.
12 years ago
Robert F-C
788d62bcc4
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
...
Conflicts:
Marlin/Marlin.pde
Marlin/ultralcd.cpp
Marlin/ultralcd_implementation_hitachi_HD44780.h
12 years ago
Lukasz Stefanowicz
d71f1e9bf6
Add (as an option) slower SD transfer mode
12 years ago
ErikZalm
db5bb8546d
Merge pull request #452 from MStohn/Marlin_v1
...
128x64 RepRapDiscount Full Graphic Smart Controller support
12 years ago
daid
4b2ece159b
Merge pull request #453 from brackendawson/Marlin_v1
...
Make Gen7 1.4+ heater temp sensort pins match silkscreen.
12 years ago
Bracken Dawson
d5ee2a5a62
Make Gen7 1.4 heater pins match silkscreen
12 years ago
MaikStohn
7ac6d7f78e
FIX: Speedup - no explicit display clear needed in u8glib
12 years ago
MaikStohn
13596e8722
Added RepRapDiscount FULL GRAPHIC Smart Controller
12 years ago
MaikStohn
3a6abe1d6e
Removed STB custom font hack from u8glib library and moved to marlin project
12 years ago
MaikStohn
16afbf9bfa
FIX: adopted latest changes from hitachi implementation
12 years ago
daid303
34bca48b98
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
daid303
ac52dcc174
Updated the card menu and watch messages to make it more informative.
12 years ago
Stefanowicz
31bb3fb297
Fix: Build error when EEPROM_SETTINGS is defined and PIDTEMP is undefined
12 years ago
daid303
c80a78bb70
Lower the default max E feedrate a bit. With the stepper fix this is much to high.
12 years ago
Simon Oliver
5d5909fc25
Fix failure to compile with heated bed: remove call to non-existant scaleBedPID().
12 years ago
Simon Oliver
93f0463b21
Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values
...
Add new 'callback' edit-menu types that call a function after the edit is done. Use this to display and edit Ki and Kd correctly (removing the scaling first and reapplying it after). Also use it to reset maximum stepwise acceleration rates, after updating mm/s^2 rates via menus. (Previously, changes did nothing to affect planner unless saved back to EEPROM, and the machine reset).
Add calls to updatePID() so that PID loop uses updated values whether set by gcode (it already did this), or by restoring defaults, or loading from EEPROM (it didn't do those last two). Similarly, update the maximum step/s^2 accel rates when the mm/s^2 values are changed - whether by menu edits, restore defaults, or EEPROM read.
Refactor the acceleration rate update logic, and the PID scaling logic, into new functions that can be called from wherever, including the callbacks.
Add menu items to allow the z jerk and e jerk to be viewed/edited in the Control->Motion menu, as per xy jerk.
Conflicts:
Marlin/language.h
12 years ago
Bart K
4fa2260a59
Fixed cardreader.h to resolve issue #440 (Pull Request #425 missing file)
12 years ago
Erik van der Zalm
038d405254
Corrected #endif in language.h
12 years ago
Dirk Eichel
443aaa30bf
Removed GIT fragments
...
Seems that there was something wrong while merging
12 years ago
ErikZalm
7f622467fc
Merge pull request #425 from kefir-/m928_logging
...
M928 logging
12 years ago
ErikZalm
86867928ac
Merge pull request #434 from DDRBoxman/Marlin_v1
...
Add support for M300: Play beep sound
12 years ago
ErikZalm
9a38cad6f0
Merge pull request #430 from STB3/GLCD_128x64_dots
...
Final task of the 128x64dots GLCD implementation
12 years ago
ErikZalm
7a5c474d91
Update Configuration.h
12 years ago
Dirk Eichel
4e448b700a
Merged fetched files from Marlin_v1 branch
...
Pull requests: #414 #433 #432 #428
12 years ago
ErikZalm
9f2862ce48
Merge pull request #414 from whosawhatsis/Marlin_v1
...
regenerated thermistor table 7
12 years ago
ErikZalm
9fb8bd5685
Merge pull request #433 from whosawhatsis/bang-mode
...
Separate PID_MAX from BANG_MAX
12 years ago
Colin Edwards
0d075378d5
Add LARGE_FLASH define and enable it for some of the beefier boards
...
The LARGE_FLASH flag allows superfluous features to be excluded
on boards with less memory
12 years ago
Colin Edwards
9a1c90471f
Ignore unused beeper pins
12 years ago
Colin Edwards
1a0f889803
Add support for M300: Play beep sound
12 years ago
Robert F-C
9322c408c6
Updated for LiquidTWI2 library version 1.2.3
...
The new version of the library means that PANELOLU no longer needs to be
defined in LiquidTWI.h (the library file can be used as is) and the new
version of the library also enables the buzzer on the Panucatt VIKI
panel.
12 years ago
whosawhatsis
fd5b7e0cec
Separate PID_MAX from BANG_MAX
...
This allows PID_FUNCTIONAL_RANGE to use a maximum duty cycle higher
than PID_MAX. This is useful for powerful heaters to heat quickly in
bang-bang mode, but use a lower duty cycle that is easier to stabilize
in PID mode.
12 years ago
blddk
e5a853a3d0
Added automated extruder fan function
12 years ago
blddk
72419f69a9
Added rumba
12 years ago
blddk
91bea43332
Added rumba pinout
12 years ago
blddk
d2b00fe486
Removed html and added rumba
...
Found some unwanted html at the bottom of the file which caused it to not be able to compile.
Also added rumba as machine.
12 years ago
Dirk Eichel
6c66cae694
GLCD init screen cosmetics
12 years ago
Dirk Eichel
f3e0e5184d
Add include selector between char. LCD and GLCD
12 years ago
Dirk Eichel
5d3862f9d1
Modified u8glib logo on welcome screen
12 years ago
Dirk Eichel
0b320f75e9
Removed debug code, add some comments
12 years ago
Dirk Eichel
5f1cd70122
Add code to lcd_update() for GLCD
...
This code selects between the routines for the GLCD or the char.
display.
12 years ago
Dirk Eichel
a49c09a776
Add variable for animated fan, add float conversion w/o sign
...
A new variable was introduced to allow fan animation on the GLCD.
Add additional float to string conversion routine without sign
character. This is used for the coordinates visualisation on the GLCD.
12 years ago
Dirk Eichel
26d8863111
Add library selection between GLCD and char. LCD
12 years ago
Dirk Eichel
4a141a694f
Marlin code for GLCD display
...
This contains the menues, status screen etc...
12 years ago
Dirk Eichel
83c790a020
Add bitmap graphics for GLCD
...
1. Marlin welcome screen
2. Status screen symbols 3 Extruders, heated bed, animated fan logo 1
3. Status screen symbols 3 Extruders, heated bed, animated fan logo 2
12 years ago
Dirk Eichel
233df9cca0
Add missing LF at the end of the file
12 years ago
Dirk Eichel
bb0de75a92
Removed umwanted HTML code ath the end of the file
...
Sorry for that. This does not lead to compile errors. I removed the
unwanted code to make it clean.
12 years ago
Ryan Turner
7c47e7162d
Adding Maker's Tool Works heated bed thermistor
12 years ago
daid
af78d0cbfa
Merge pull request #1 from illuminarti/Fix_E_Speed
...
Fix step rate bug (especially for retraction)
12 years ago
Dirk Eichel
9a78f321a4
Add pins for Motherboard variant 64
...
These definition contain also the definition for the graphics LCD.
12 years ago
Dirk Eichel
5de25ccd20
Add Motherboard variant 64 - STB V1.1
...
Definition for the graphic LCD are already in it, they will not harm the
configuration as they are only defined constants
12 years ago
daid
d6ce63c49c
Merge pull request #411 from STB3/Marlin_w_STB_Board_support
...
Add STB board support to Marlin (next step towards graphic LCD implementation)
12 years ago
Ketil Froyn
f036be7c4e
Clean up tab/whitespace from last commit
12 years ago
Ketil Froyn
07e11c7cf5
Add command M928 to enable logging to file of received gcode commands
12 years ago
daid
92782f9252
Merge pull request #1 from illuminarti/Fix_E_Speed
...
Fix step rate bug (especially for retraction)
12 years ago
whosawhatsis
6a61a3c0b4
missing comma in last commit
12 years ago
whosawhatsis
f0aee4101a
regenerated thermistor table 7
...
Generated with createTemperatureLookup.py. The old table crapped out at
270C, which was a problem for polycarbonate.
12 years ago
Nicolas Rossi
aba67e2449
No bed config for RAMPS
...
The motherboard 35 is a config without bed with this pins setting :
D8 Extruder
D9 Fan
D10 Controller Fan
12 years ago
Nicolas Rossi
6504e96165
Turn off power supply off-load
...
Disable the high current output and wait a little before to turn off,
because the interrupting capacity of the PSU is unknown.
Could be a function if needed by other.
12 years ago
Nicolas Rossi
86bf911139
Toggle menu for PSU from LCD pannel
...
From the prepare menu, accessible when is not printing, you have the
possibility to turn off the PSU when is on et vice versa.
From the host, you can turn off or turn on the PSU then the menu is
updated accordingly.
From the LCD message, the printer status is reported ready or off
respectively when the PSU is on or off.
12 years ago
Robert F-C
7bad72359c
Support encoder click on PANELOLU2 being read through I2C
...
This change also handles the case where the pause/stop/restart button on
the VIKI is not used. Make LCD I2C buzz sound the same as the normal
buzz (300ms is too long for quick feedback).
12 years ago
Robert F-C
1daf2f3256
Number of extruders is not an advanced configuration - it is a basic property.
12 years ago
Robert F-C
f1263d3f88
Further reduce code by using precompiler logic
12 years ago
Dirk Eichel
140e095c6e
Add pins for Motherboard variant 64
...
These definition contain also the definition for the graphics LCD.
12 years ago
Dirk Eichel
b2c1c64fb1
Add Motherboard variant 64 - STB V1.1
...
Definition for the graphic LCD are already in it, they will not harm the
configuration as they are only defined constants
12 years ago
Dirk Eichel
ceb5ee38af
Replaced corrupted language.h file on local PC with current from ErikZalm/Marlin
12 years ago
Dirk Eichel
8efd4cfd73
fixed merge conflict
12 years ago
Robert F-C
372e12f83f
Implement automatic extruder/cold-end fan control based on temperature
...
This change allows fan outputs to automatically turn on/off when the
associated nozzle temperature of an extruder is above/below a threshold
temperature.
Multiple extruders can be assigned to the same pin in which case the fan
will turn on when any selected extruder is above the threshold.
It also makes the M42 command compatible with the M106/M107 command.
The majority of the logic in this change will be evaluated by the
compiler at build time (i.e, low code space requirements).
12 years ago
Robert F-C
6beb42cdf6
Attempt to address Bernhard's comments
...
Refactor configuration to try to make items clearer (what defines a
panel vs what is user changeable).
12 years ago
Robert F-C
839bef6d5d
Fix Configuration.h file to not define LCDs be default.
...
Also fix compile time check in Marlin.pde
12 years ago
Robert F-C
1292d735ba
Converge all I2C LCD branches (PANELOLU2, VIKI & PCF8575)
...
This includes refactoring the buttons code to remove a large amount of
non-pin dependent duplication from pins.h.
12 years ago
daid303
4eb81a69e6
Only compile the new extruder offset code if you have multiple extruders.
12 years ago
daid
3e9cd334a4
Merge pull request #383 from dob71/jeff
...
Hotend offset handling for multi-extruder machines
12 years ago
MendelMax
67710df9f3
Made i2c mode wok with the hardware I am able to test (ywrobot / sainsmart i2c LCD 2004)
...
Removed incorrect LiquidCrystal_I2C Library
12 years ago
Bob Clough
b6209c86dd
Added import of Wire Library to make I2C LCD support compilable
12 years ago
Bob Clough
2b567d1df5
Added I2C port expander support to HD44780
12 years ago
Bob Clough
06272f463d
Added Config variables for activating I2C LCDs and setting type and address
12 years ago
daid303
de3dec7215
Also show the tune menu when USB printing.
12 years ago
Denis Bakin
73d41c10b9
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into jeff
...
Conflicts:
Marlin/language.h
Marlin/thermistortables.h
12 years ago
daid
63da4dc59a
Merge pull request #398 from DanieleSdei/Marlin_v1
...
Marlin v1, alignment of the Italian language
12 years ago
Daniele Sdei
82e28851bd
Italian language: SD-Card change and SD-Card init
12 years ago
Daniele Sdei
aed5965ad8
Italian language: remove space and some fix
12 years ago
codenamepawel
d360846dd4
Update Marlin/language.h
...
Update Polish language #define MSG_RESUMING "Wznawiam drukowanie"
12 years ago
daid303
2f60e324dc
Fixed #394
12 years ago
daid
5e2abfcdcd
Merge pull request #391 from STB3/Marlin_with_SD-Card_Change_Menu
...
Add SD-Card change and SD-Card init. for electronics equipped with LCD Display
12 years ago
Dirk Eichel
a0d4e8e78e
Add Messages for SD Card init. & change
12 years ago
mfeherpataky
bbf0cc1379
Update Marlin/ultralcd_implementation_hitachi_HD44780.h
...
Fix to a bug that I just introduced - sorry. Forgot about offset of string length.
12 years ago
Dirk Eichel
c8f1fbd9d8
Add SD-Card change and SD-Card init.
...
Add SD-Card change and SD-Card init. for reprap electronics without
SD-Chard change detect pin.
12 years ago
mfeherpataky
71ddb8dc60
Update Marlin/ultralcd_implementation_hitachi_HD44780.h
...
Use all available characters in narrow LCDs < 20 characters.
12 years ago
mfeherpataky
d2c547c407
Update Marlin/ultralcd_implementation_hitachi_HD44780.h
...
Fix to a minor bug with hardcoded LCD_WIDTH that draws edited values outside of the 16 characters width LCDs.
12 years ago
Denis B
70871715e4
Added support for extruder offset handling
...
The extruder offset can be specified in the configuration
file or adjusted on the fly using the "M218 T# X# Y#" command.
The EEPROM support is not yet merged in.
The "T#" command can take option "F#" that specifies the feedrate
at which the printing head should be re-positioned. If not
specified the re-positioning move is not preformed immediately,
but the coordinates are adjusted for the printer to properly
position the head when the next movement happens.
12 years ago
Denis B
49b2ddc8c1
Cleaned up non-standard characters
12 years ago
Bernhard Kubicek
f8876a7958
Merge pull request #376 from kintel/skip_longfilenames
...
Also skip .files and _files with long filenames. I think its better than before. If somebody dislikes it, or wants additional configuration, it can be done in a future step. Thanks, Marius, and nice to have you helping!
12 years ago
daid
18fcc367d2
Merge pull request #371 from Banjer/Melzi_LED_PIN
...
Chenged LED_PIN for Melzi boards, added comment about broken versions of...
12 years ago
Bas Spaans
19ce90fe02
Added comment about M42 usage (clean)
12 years ago
Bas Spaans
00fed0a703
Revert "Extended comment explaining M42 usage"
...
This reverts commit 01541ee64c
.
12 years ago
Marius Kintel
e06d820909
Also skip .files and _files with long filenames
12 years ago
Bas Spaans
01541ee64c
Extended comment explaining M42 usage
12 years ago
Marius Kintel
f24f02e212
compile fix: quickStop() needs stepper.h
12 years ago
Bas Spaans
12c41423ad
Fixed typo in comment
12 years ago
Bas Spaans
0995eaa492
Chenged LED_PIN for Melzi boards, added comment about broken versions of the Sanguino libraries
12 years ago
Bernhard
1d06b10962
Added a feature to have filament change by gcode or display trigger.
...
[default off for now]
syntax: M600 X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal]
if enabled, after a M600, the printer will retract by E, lift by Z, move to XY, retract even more filament.
Oh, and it will display "remove filament" and beep like crazy.
You are then supposed to insert a new filament (other color, e.g.) and click the display to continue.
After having the nozzle cleaned manually, aided by the disabled e-steppers.
After clicking, the printer will then go back the whole shebang, and continue printing with a fancy new color.
12 years ago
daid303
408b349a84
Fixed #368 . Commented out the wrong pin definition, but explained why it is there.
12 years ago
Daniele Sdei
9ecb267b63
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
Daniele Sdei
3cf59f6f9a
add RepRapPro Huxley thermistor tables
12 years ago
daid
c1730e2b08
Merge pull request #363 from yuroller/sanguino_panelolu
...
Panelolu pin assignment for sanguinololu
12 years ago
Yuri Valentini
86358dd6cd
Panelolu pin assignment for sanguinololu from http://reprap.org/wiki/Panelolu
12 years ago
daid303
0f3f5d083d
Minor cleanup of the new FAN_KICKSTART code. #334
12 years ago
daid
6ec56fa923
Merge pull request #334 from KevinOConnor/FanKick
...
Add feature to briefly run the cooling fan at full speed when it first starts.
12 years ago
daid
965baf2683
Merge pull request #362 from daid/Marlin_v1
...
Finnish language
12 years ago
Kevin O'Connor
3d91bd486c
Add "kick fan" feature - briefly run fan at full speed on start.
...
Add a feature to run the cooling fan at full speed for a small period
(default 100ms) when first starting the fan. Some fans wont reliably
start spinning at low power, and many fans have issue with the PWM at
low power. However, once the fan starts spinning it can reliably be
set to a wide range of PWM values.
12 years ago
Kevin O'Connor
3f2f94ef28
Be consistent in setting of the fan PWM.
...
Always set the FAN PWM value in check_axes_activity() and always use
the value of the active move if a move is active.
12 years ago
Henry Palonen
7f30039d2a
+ Finnish translation
12 years ago
daid303
14e1d495ef
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
daid303
bbe7d3d0fe
Fixed #312
12 years ago
daid
7ce509b9a7
Merge pull request #361 from yuroller/MakefileSanguino
...
Makefile sanguino
12 years ago
Yuri Valentini
9c34c4f05b
fixes for ramps compilation using installed arduino ide
12 years ago
daid303
442ade15a6
Move Gen6 stuff into a proper location.
12 years ago
daid
5fd4582cc8
Merge pull request #242 from Drakelive/Marlin_v1
...
Fixes issues # 216 and # 135 for Gen6 and Gen6 Deluxe board
12 years ago
daid303
8b88e3b386
Fixed #345 , Fixed #267 .
12 years ago
daid
27843388c6
Merge pull request #360 from njprossi/Marlin_v1
...
Power signal control definitions for other power supplies
12 years ago
daid303
921273baa0
Added optional feature to stop printing when an endstop is hit. Made the Z display on the LCD in 3.2 format instead of 3.1. Added LCD message when and endstop is hit.
12 years ago
Yuri Valentini
7d20ec706e
Added libraries from Arduino 1.0.3 for sanguino build
12 years ago
Nicolas Rossi
437eb3bafc
Initialize PS_ON at startup
12 years ago
Nicolas Rossi
f3c1fc70a9
Power signal control definitions for ATX and others
12 years ago
Yuri Valentini
dad7691df9
makefile for sanguino standalone compilation
12 years ago
Erik vd Zalm
6752cb2d9c
PID now per extruder. Fixed typo
12 years ago
Erik vd Zalm
0ac452e252
Disable is now multi extruder compatible. M84 got a T option.
12 years ago
Johann Rocholl
9e7b5056a0
{X,Y,Z}_{MIN,MAX}_POS are actually in Gcode coordinates.
12 years ago
Daniele Sdei
5f82f03ff3
Add italian MSG_RESUMING.
12 years ago
daid303
5e3873c8db
Add german MSG_RESUMING.
12 years ago
daid303
01aac2a142
Small changes on the LCD panel, let the speed control work better, line up the parameter edit the same as the menu, remove some unused defines, and remove the Z from the 10mm move menu.
12 years ago
daid303
b69cb9fbd9
Change the end of SD cart print message from minutes/seconds to hours/minutes.
12 years ago
daid
30254e3388
Merge pull request #350 from jcrocholl/Marlin_v1
...
Automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR.
12 years ago
daid303
38ee395ac7
Replace the 1ms delay for 2 nops to get a 100ns delay. #259
12 years ago
daid303
5df5e4c4a2
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
daid303
a95dcd74e7
Fix some of the duplicated PSTRs, saving 500bytes of flash with LCD on.
12 years ago
Johann Rocholl
8caf5d252d
Remove bogus blank line.
12 years ago
Johann Rocholl
1c2ecddae4
Fix typo (# missing before define).
12 years ago
Johann Rocholl
6dfb8a2187
Fix home_all_axis to make QUICK_HOME work with Repetier-Host which sends G28 X0 Y0 Z0 instead of G28. Thanks to Matt Schoenholz for reporting this issue.
12 years ago
Johann Rocholl
3b2e5027e5
Merged updates from Marlin_v1.
12 years ago
Johann Rocholl
b39f5d614a
For boards with only one endstop per axis, automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR.
12 years ago
oni303
ab09fa4bbf
fixed pwm generation at pin D12 and D13 when one of them is used as FAN_PIN on Sanguino, added soft pwm entry for FAN_PIN in temperature.cpp
12 years ago
Sergey Taranenko
5697451c72
fix lcd class
12 years ago
Sergey Taranenko
58e806f3fa
Fix the russial translation.
12 years ago
Sergey Taranenko
50a5ce1dc4
deduplicate messages
12 years ago
daid303
6123a00e64
Fix the german translation.
12 years ago
daid303
7c21716886
Fixed #341
12 years ago
daid303
ae1bc83350
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
daid303
596a7e1904
Fix compiling for Arduin < 1.0.0
12 years ago
Daid
b264317fa0
Reverted the patch by KevinOConnor, as it crashes some versions of avr-gcc and caused linking issues.
12 years ago
Daid
673577a31b
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
Daid
23022f1a82
Updates to Makefile to compile for Teensy.
12 years ago
daid
96e9db8919
Merge pull request #339 from KevinOConnor/CompilerFlags
...
Add additional optimization flags to Makefile
12 years ago
daid303
08356361ac
Fixing a problem with heated beds not working without PID and BED_LIMIT_SWITCHING
12 years ago
daid303
047d037f8c
#ifdef fix for #326
12 years ago
Kevin O'Connor
0908458381
Use gcc "-fwhole-program" optimization.
...
Use "whole program" and "link time optimization" features of gcc. The
whole-program optimization enables the compiler to evaluate the entire
firmware for optimization instead of just one code file at a time.
This leads to better overall optimizations.
12 years ago
Kevin O'Connor
16fbb455ef
Use linker "--relax" option.
...
The "relax" option enables the linker to convert certain "call"
instructions to the smaller "rcall" instruction. This reduces the
size of the resulting binary.
12 years ago
daid303
f30b46b2a8
One more fix for #338 , I really should get a heated bed to test with.
12 years ago
daid303
65c3f1ffcd
Most likely fixing #338
12 years ago
daid303
7577717b59
Fixed #336
12 years ago
daid303
1a8f54cea1
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
12 years ago
daid303
6731c094ee
Fix compiling with just an 16x2 LCD and no buttons.
12 years ago
daid303
b99a928a80
Fix the M117 (display message on LCD) when used over USB with checksums.
12 years ago
daid303
55ba90ac19
Add PID functional range setting. With high powered heaters the current functional range of 10 degrees causes high overshoots as the PID needs to kick in before the temperature hits 10 degrees below target.
12 years ago
daid303
5ff5cee8ce
Fix the sensitive pin definitions, there where analogue numbers in the digital pin list. Also made M42 without a P function on the LED_PIN (which was otherwise a useless pin definition)
12 years ago
daid303
8b58edc70e
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
daid
d0319d45af
Merge pull request #335 from jcrocholl/Marlin_v1
...
Fix endstop pins for Printrboard
12 years ago
Johann Rocholl
ca409e5531
Fix X/Y/Z_MIN_PIN for Printrboard.
12 years ago
Johann Rocholl
1f45cb0a51
Fix typo in MANUAL_HOME_POSITION (plural S missing) and improve comments.
12 years ago
Johann Rocholl
931a0052ea
Fix typo in MANUAL_HOME_POSITION (plural S missing) and reduce BLOCK_BUFFER_SIZE because 64 wasn't working for some reason.
12 years ago
daid303
46ec4b648c
Added some missing Mxxx comments to M commands. Fixed the unsetting of the timer dividers for the fast PWM fan.
12 years ago
Daid
724f5aa36b
Update on makefile for moved Arduino addons.
12 years ago
daid303
6d9dfa96c3
Move the Arduino related stuff out of the Marlin tree, as they are not directly related to Marlin functionality but addons for the Arduino IDE. Also split up the addons for pre 1.0.0 Arduino and post 1.0.0 Arduino.
12 years ago
daid303
3fb07d9b8d
Add MINTEMP/MAXTEMP error to LCD, and fix temperature bug with more then 1 extruder.
12 years ago
Johann Rocholl
8e2519e88b
Add realtime delta geometry in Marlin_main.cpp.
12 years ago
Johann Rocholl
cec7283b21
Enable QUICK_HOME for deltabot.
12 years ago
Johann Rocholl
2292441f0c
Use X/Y/Z_MAX_PIN instead of X/Y/Z_MIN_PIN for top endstops on deltabot.
12 years ago
Johann Rocholl
c430906d3b
Deltabot settings and configuration adjustments.
12 years ago
daid303
82c8724b33
Fix compile with PID_DEBUG
12 years ago
daid303
9b160972a1
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
daid303
e036750bdf
Use the disable macros on initialization. Which fixes a bug when there is no pin defined for stepper enabled (motherboard 4)
12 years ago
Daid
fcd9de72ef
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
Daid
32d4373e0f
Add printrboard and brainwave to Makefile.
12 years ago
daid
b3ddbcee2a
Merge pull request #329 from jcrocholl/Marlin_v1
...
Add Printrboard and Brainwave to pins.h and fastio.h
12 years ago
Daid
29435dfb4b
Proper avr for Sanguino in Makefile.
12 years ago
daid303
52158dffcc
Big temperature code update. No longer converts back and forwards between temperature and raw sample value. Reducing complexity, removing code. Also named some variables better. While keeping the safety intact and functionality the same.
12 years ago
Daid
ca7acbe6d9
Allow specification of which arduino hardware subvariant in Makefile.
12 years ago
Johann Rocholl
33247733e0
Teensylu and Printrboard use different analog pins for thermistors.
12 years ago
Johann Rocholl
621c24a10f
AT90USB is only defined after pins.h is included.
12 years ago
Johann Rocholl
6cba11f087
Stop redefining MOTHERBOARD and #define AT90USB instead. Also put #ifndef AT90USB around the HardwareSerial_h trick, so now Printrboard / Brainwave support compiles on Arduino 1.0.2 as well.
12 years ago
Johann Rocholl
4d351b4846
Improved formatting and comments for consistency.
12 years ago
Johann Rocholl
a30007caa4
If fastio.h is not messed up then Teensylu and Printrboard are actually using the same pins.
12 years ago
Johann Rocholl
6aa87a7b67
Use the same fastio.h definition for AT90USB1286/7 and AT90USB646/7.
12 years ago
Johann Rocholl
b1c38d4c82
Avoid compiler warnings (redefined MOTHERBOARD) in Arduino 1.0 and greater.
12 years ago