69dc411ae0
Merge branch 'Development' of github.com:MarlinFirmware/Marlin into LogoLCD
...
Conflicts:
Marlin/dogm_lcd_implementation.h
10 years ago
326b925557
DOGLCD and LCD_PROGRESS_BAR to coexist
...
Small changes (and formatting to confuse the diff’er) which first
allows DOGLCD and LCD_PROGRESS_BAR to be enabled in tandem, then a
#warning (rather than error) that the extra progress bar / message
options don’t apply to graphical displays at this time. This leaves
open perhaps combining the progress bar and message area in some future
(or forked custom) graphical LCD display arrangement (at which time the
relevant variables may be moved into ultralcd.cpp with externs in
ultralcd.h). I also added a conditional error that the progress bar and
the filament display may not work well together.
10 years ago
1aade4a8e2
Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into Development
10 years ago
8a2e84e3f1
Possible fix for FWRETRACT with 0 zlift.
10 years ago
905aab3b85
added missing #endif
10 years ago
b9cf1465a7
updated LCD bouts with new strings and bitmaps
...
new version is pretty generic and should work in most scenarios
10 years ago
c7632be5cc
added high and low resolutions version of splash screen logo (saving code size)
10 years ago
8f0dba7cbf
adding string for bouts splash string to config
10 years ago
d94109e886
updated logo post and ver info
10 years ago
cd33b5b062
changed logo and ver info
...
logo is now 110 pixels wide and starts 9 pixels in from top left corner and also 9 pixels down from same corner... this will give a 9 pixel border all way round
ver info is placed centered and there is a 9 pixel from bottom of display to ver info
10 years ago
9b6c1cfda6
removed unneeded lines in welcome msg
10 years ago
ffa09f86f4
moved ver info 5 spaces to the right
10 years ago
2bbb68be8a
Fix calculation of BAL grid fitting into the bed
...
The previous calc was wrong. Between N points there are only N-1 gaps,
not N.
So changing AUTO_BED_LEVELING_GRID_POINTS to
(AUTO_BED_LEVELING_GRID_POINTS-1)
10 years ago
590caafa2d
changed ver info
10 years ago
3bb9b31515
changed boot logo a bit to test if fat wall goes away
10 years ago
da192c521f
Merge pull request #1333 from andrewsil1/development
...
Fix grammar/typos in new Configuration.h option
10 years ago
3a30d45c2e
Revert "issue 968 for dev branch"
10 years ago
269ec9f87f
Fix grammar/typos in new Configuration.h option
...
(For the SLOW_PWM_HEATERS option)
10 years ago
8d7bfd03d8
moved/renamed documentation stuff to top-level directory
10 years ago
3c9e6b7b62
added link for pic to hex converter
10 years ago
0e760274bd
changed reprap logo to marlin logo
10 years ago
b291a422e9
added square png version of logo
...
406*406 pixels
10 years ago
7ae548cf34
Update Marlin Firmware URL
10 years ago
8f9067faa6
Added marlin logos. (Designed by Ahmet Cem TURAN)
10 years ago
addf52fd4a
Merge pull request #1328 from DinoMesina/development
...
Some corrections and new features
10 years ago
5cfe13f240
Correct some mistakes
10 years ago
c7e2d73039
Merge branch 'development'
...
ok
10 years ago
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
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
6730335657
Update Configuration.h
10 years ago
4ffecdbf7d
Merge pull request #1313 from wgm4321/Development
...
Re-enable filament menu with recalc fix when enabling/disabling mm3
10 years ago
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
f25e793cff
rename stepper lookup table scipt to be consistent with termistor lookup table script
10 years ago
df17a6a1b4
fix #1305 by proposed workaround (thanks gaby64)
10 years ago
f7e65935fb
make use of power operator
10 years ago
4e02aff9b5
automatically determine min/max temp for terminator
10 years ago
81363bc441
more cleanups
10 years ago
95f4a55820
refactored termistor table calculation to be in line with wikipedia's article about Steinhart-Hart coefficients
10 years ago
21205cc3d8
more cleanups in the termistorTable generation script
10 years ago
fb0996b5db
improved output aligment and precision
10 years ago
538231edfd
cosmetic whitespace cleanup and comments added/updated
10 years ago
067b509479
Re-enable filament menu with recalc fix when enabling/disabling mm3
10 years ago
a19f2f8ae7
Disable volumetric menu item due to missing recalc of of multipliers when enabled/disabled
10 years ago
f24dda9700
Revert "Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3"
...
This reverts commit dd7e4ee97f
10 years ago
ec4681ab6b
Revert "Add "Detailed Z Probe" menu item with ABL is defined."
...
This reverts commit 2b9722f387
10 years ago
dd7e4ee97f
Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3
10 years ago
2b9722f387
Add "Detailed Z Probe" menu item with ABL is defined.
10 years ago
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
d2b6e62996
Merge pull request #1309 from philfifi/fix_temp_runaway
...
temp runaway: proper cast to prevent any overflow.
10 years ago
30248214c7
temp runaway: proper cast to prevent any overflow.
10 years ago
Steffen Vogel