1600506545
Merge remote-tracking branch 'upstream/Development' into marlin_configurator
10 years ago
5d0c93ae10
Keep config boxes in view on wide screen
10 years ago
335b7680c9
Tooltip code, widescreen layout, hide auto-expands
Slightly better layout for wide screens.
10 years ago
08c236059e
Merge pull request #1505 from thinkyhead/issue_1499
Bed leveling probe behavior issue?
10 years ago
ab419795b3
Merge pull request #1511 from MagoKimbra/Reset_Alert_message_M600
Reset Alert message when finish M600 command
10 years ago
f238c7428d
Merge branch 'Development' into marlin_configurator
Latest upstream changes
10 years ago
da275c72ab
Cleanup Github reply.data.content before atob()
10 years ago
159196d1e9
Reset Alert message when finish M600 command
10 years ago
266ff227cf
Merge pull request #1510 from docdawning/Development
Trivial spelling correction
10 years ago
dfd4e74a5c
Trivial spelling correction
10 years ago
c033904693
Updated config file section markers
10 years ago
84a87a5b1c
Fix up configs a little
10 years ago
63a5ff7ab9
Merge pull request #1489 from tommil/Development
Updated Finnish language file
10 years ago
efb0491d40
Merge branch 'Development' into issue_1499
Merging latest upstream changes
10 years ago
8309b4f408
Merge branch 'Development' into marlin_configurator
Merging latest upstream changes
10 years ago
961998cf91
Merge pull request #1496 from thinkyhead/issue_1493
Megatronics 3 servo pins
10 years ago
59e92a2db4
Merge pull request #1506 from thinkyhead/issue_1504
Issue #1504 – K8200 Z_ENABLE_PIN
10 years ago
b71322e793
Issue #1504 – K8200 Z_ENABLE_PIN
- K8200 uses a non-standard RAMPS with Z_ENABLE=63 ??
- Assuming from previous input that 3DRAG is the same.
10 years ago
978d114c73
Bed leveling probe behavior issue?
The `float` keyword should not be on these vars because they conceal
the outer vars, preventing them from obtaining known values before
being passed in `set_bed_level_equation_3pts`. Possibly related to
`Z_RAISE_BETWEEN_PROBING` not functioning.
10 years ago
7c6236761a
Merge branch 'Development' into issue_1493
Merging latest upstream changes
10 years ago
9875352dd8
Merge branch 'Development' into marlin_configurator
Merging latest upstream changes
10 years ago
3e6ae25481
Merge branch 'Development' of https://github.com/tommil/Marlin into Development
10 years ago
513ff94b89
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
83cb702e72
Config sections, multi-field values, toggles, etc
- Auto-detect “switchable” items where possible
- Handle switchable multi-value fields
- Add standard sections to config form
- Add section markers to configurations
- Add value options to configurations
- Remove and re-add fields for loaded configs
- Preserve sections across configs
- Preserve non-added fields
- Style added fields wider & newline by default
10 years ago
07a9165ca2
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
afc737ca0c
Fix CoreXY Homing Routine.
Fixed how stepper ISR figure it out when the head (extruder) is going to
Min or Max direction.
Added Homing to Max Endstops.
10 years ago
ec53c6309a
More fields, options in config, fix tooltips
10 years ago
68184af57b
Merge branch 'Development' into marlin_configurator
Latest upstream commits
10 years ago
7866fa161f
Merge pull request #1476 from Natealus/Development
Compiling errors with 4 Extruders defined and Viki 2 Implementation
10 years ago
8cfdd3e8a4
Merge pull request #1423 from MoonCactus/Development
Multi-line G-code commands
10 years ago
ea9e49b20d
ARRAY_BY_EXTRUDERS 4th hotend PID parameters
10 years ago
d0ad8a978c
Megatronics 3 servo pins
- Naive implementation, assuming the data sheet pin numbers correspond
to Arduino pin numbers.
10 years ago
e74138b2be
More robust fetch code, download buttons
- Fetch code now handles github, local, or http: access
- Download button creates a time-stamped inline download
- More complete error messages
- Show warnings when approaching the hourly fetch quota (limit
reloading!)
- Added my test domain (where the _htaccess is deployed)
- `_htaccess` file added to set Access-Control-Allow-Origin “*”
- Marlin logo with css
- Limit selectable areas to avoid annoying selections
- Messages now persist until dismissed
- Default repo for files set to thinkyhead, ‘marlin_configurator’ branch
- Cosmetic changes
10 years ago
622a531d9c
Fixed error in translation
10 years ago
290ab42d22
Updated Finnish translations
10 years ago
22a7985445
reverted to upstream
10 years ago
b3bda57ca2
reverted to upstream
10 years ago
9d75a56b56
Merge remote-tracking branch 'upstream/Development' into Development
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
10 years ago
0a59fee763
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
d75cd69de4
Merge pull request #1488 from Wurstnase/Development
Bedleveling: X and Y must be Integers not Float!
10 years ago
eb5889b3da
Merge pull request #1479 from AnHardt/en_first
#include "language_en.h" before the national language in language.h
10 years ago
a4f939cc27
Updated Finnish language file
10 years ago
4546c92f5b
X and Y must be Integers not Float!
https://github.com/Wurstnase/Marlin/blob/Development/Marlin/Configuration.h#L427
10 years ago
32d4dd073f
Merge pull request #1487 from AnHardt/iss1485
Fix for #1485
10 years ago
f92b0dc6c7
Merge pull request #1486 from Souko/patch-1
Update ultralcd_st7920_u8glib_rrd.h
10 years ago
c246026bda
Sorry.
10 years ago
07e488cfae
Fix for #1485
10 years ago
e7ecf14d0c
Update ultralcd_st7920_u8glib_rrd.h
Fixed delay-times during Init. REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER won't get initialized on some Boards because delay was to short.
10 years ago
8be25389f2
Merge pull request #1477 from AnHardt/languagetoconfig
Make display language configurable in Configuration.h
10 years ago
52c3cf6d34
Fix a logging error
10 years ago
Scott Lahteine
Scott Lahteine
MagoKimbra
daid
DocDawning
Tommi Lamberg
alexborro
Natealus
Jérémie FRANCOIS
Wurstnase
AnHardt
Souko