c610471b0c
Add PID_PARAMS_PER_EXTRUDER conditional
2015-02-20 00:00:19 -08:00
2d6fa9ce80
Proper implementation of PID menu items
...
- Make this work per #1344
2015-02-19 23:54:06 -08:00
b8e79dce89
Fix compilation errors when encoder multiplier is disabled
2015-02-19 21:51:23 -05:00
65e1fc71be
Add encoder rate multiplier
2015-02-19 21:42:57 -05:00
c9465c33cf
Merge branch 'thinkyhead-fixup_ramps_boards' into Development
...
Merge resolving conflicts
2015-02-19 17:36:49 -08:00
623119619c
Merge branch 'fixup_ramps_boards' of https://github.com/thinkyhead/Marlin into thinkyhead-fixup_ramps_boards
...
Merge commit
2015-02-19 17:36:00 -08:00
859c8d3fef
Azteeg X3 overrides too
2015-02-19 17:28:38 -08:00
7891eacf21
Merge branch 'Development' into fixup_ramps_boards
...
- Also apply cleanup for #1514
2015-02-19 17:26:22 -08:00
b12cd1f841
Merge pull request #1514 from 2PrintBeta/Development
...
Initial definitions for the Boards BAM&DICE + BAM&DICE Due
2015-02-19 17:17:34 -08:00
1600506545
Merge remote-tracking branch 'upstream/Development' into marlin_configurator
2015-02-19 15:15:55 -08:00
5d0c93ae10
Keep config boxes in view on wide screen
2015-02-19 03:41:41 -08:00
335b7680c9
Tooltip code, widescreen layout, hide auto-expands
...
Slightly better layout for wide screens.
2015-02-19 03:11:16 -08:00
15b73386b5
Add pin definitions for the Boards BAM&DICE + BAM&DICE Due
2015-02-19 11:53:31 +01:00
08c236059e
Merge pull request #1505 from thinkyhead/issue_1499
...
Bed leveling probe behavior issue?
2015-02-19 01:24:17 -08:00
ab419795b3
Merge pull request #1511 from MagoKimbra/Reset_Alert_message_M600
...
Reset Alert message when finish M600 command
2015-02-19 01:19:56 -08:00
f238c7428d
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
2015-02-18 21:56:17 -08:00
da275c72ab
Cleanup Github reply.data.content before atob()
2015-02-18 21:45:38 -08:00
159196d1e9
Reset Alert message when finish M600 command
2015-02-18 21:33:38 +01:00
266ff227cf
Merge pull request #1510 from docdawning/Development
...
Trivial spelling correction
2015-02-17 20:59:32 +01:00
dfd4e74a5c
Trivial spelling correction
2015-02-17 12:37:05 -07:00
6cdcd6c6d1
Fix iss#1492
...
Introduced lcd_strlen() and lcd_strlen_P().
Replaced the old functions where necessary.
Reworked language_ru.h.
Speeded up test for zero length string in cardreader.cpp
2015-02-16 13:53:58 +01:00
c033904693
Updated config file section markers
2015-02-15 23:25:57 -08:00
84a87a5b1c
Fix up configs a little
2015-02-15 23:19:22 -08:00
63a5ff7ab9
Merge pull request #1489 from tommil/Development
...
Updated Finnish language file
2015-02-15 23:02:11 -08:00
efb0491d40
Merge branch 'Development' into issue_1499
...
Merging latest upstream changes
2015-02-15 22:59:07 -08:00
8309b4f408
Merge branch 'Development' into marlin_configurator
...
Merging latest upstream changes
2015-02-15 22:58:04 -08:00
961998cf91
Merge pull request #1496 from thinkyhead/issue_1493
...
Megatronics 3 servo pins
2015-02-15 22:00:14 -08:00
59e92a2db4
Merge pull request #1506 from thinkyhead/issue_1504
...
Issue #1504 – K8200 Z_ENABLE_PIN
2015-02-15 21:59:30 -08:00
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.
2015-02-15 21:56:23 -08:00
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.
2015-02-15 20:51:27 -08:00
7c6236761a
Merge branch 'Development' into issue_1493
...
Merging latest upstream changes
2015-02-15 20:45:35 -08:00
9875352dd8
Merge branch 'Development' into marlin_configurator
...
Merging latest upstream changes
2015-02-15 20:44:21 -08:00
d28f5b9e82
Support for simple customisable AutoZProbing area
...
When probing PCB´s I had the problem that i needed auto-leveling for specific areas (it´s never the same size).
Not much code, but very useful.
Now I use simply G29 L5 R55 F5 B35 P3 to probe a 4x6cm PCB before milling.
I used int for values... might be wrong...
I hope this time I got the right development tree. (tried first with https://github.com/MarlinFirmware/Marlin/pull/1130/commits )
2015-02-15 15:58:29 +01:00
3e6ae25481
Merge branch 'Development' of https://github.com/tommil/Marlin into Development
2015-02-15 12:21:57 +02:00
513ff94b89
Merge remote-tracking branch 'upstream/Development' into Development
2015-02-15 12:21:45 +02:00
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
2015-02-14 23:44:01 -08:00
07a9165ca2
Merge remote-tracking branch 'upstream/Development' into Development
2015-02-13 21:09:52 +02:00
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.
2015-02-13 14:38:05 -02:00
ec53c6309a
More fields, options in config, fix tooltips
2015-02-13 03:02:56 -08:00
68184af57b
Merge branch 'Development' into marlin_configurator
...
Latest upstream commits
2015-02-12 21:59:26 -08:00
7866fa161f
Merge pull request #1476 from Natealus/Development
...
Compiling errors with 4 Extruders defined and Viki 2 Implementation
2015-02-12 16:56:55 -08:00
8cfdd3e8a4
Merge pull request #1423 from MoonCactus/Development
...
Multi-line G-code commands
2015-02-12 16:29:30 -08:00
ea9e49b20d
ARRAY_BY_EXTRUDERS 4th hotend PID parameters
2015-02-12 00:56:47 -07:00
d0ad8a978c
Megatronics 3 servo pins
...
- Naive implementation, assuming the data sheet pin numbers correspond
to Arduino pin numbers.
2015-02-11 23:46:27 -08:00
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
2015-02-11 04:59:07 -08:00
622a531d9c
Fixed error in translation
2015-02-11 08:50:48 +02:00
290ab42d22
Updated Finnish translations
2015-02-11 08:37:07 +02:00
22a7985445
reverted to upstream
2015-02-11 07:12:55 +01:00
b3bda57ca2
reverted to upstream
2015-02-11 07:12:02 +01:00
9d75a56b56
Merge remote-tracking branch 'upstream/Development' into Development
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
2015-02-11 06:38:36 +01:00