SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2527 commits 1 branch 0 tags 119 MiB
Commit graph

2032 commits

Author SHA1 Message Date
Wurstnase
a5342c942e Update Marlin_main.cpp 2015-03-07 16:47:53 +01:00
Scott Lahteine
0f3b7d5575 Update annotated configurations 
- Also update base configs
 2015-03-07 01:07:40 -08:00
Scott Lahteine
c5aa56bc4d Merge branch 'Development' into marlin_configurator 
Latest upstream commits
 2015-03-06 23:00:03 -08:00
Scott Lahteine
d085725c86 More sanity-checking for ABL 
- Moved sanity-checks to Marlin_main.cpp
- Applied to other configuration files
- Fixed formatting of ABL output
- Passing verbose level to probe_pt
- Miscellaneous cleanup
- Put CONFIG_STEPPERS_TOSHIBA into Configuration.h
 2015-03-06 22:14:34 -08:00
Scott Lahteine
8b6766b37b Merge branch 'Development' into marlin_configurator 
Latest upstream changes
 2015-03-06 16:32:57 -08:00
Scott Lahteine
9eed8c8cf0 Make sure a ROM is selected for ULTRA_LCD 2015-03-06 15:37:54 -08:00
Scott Lahteine
254970c92a Merge pull request #1570 from C-o-r-E/escape_fix 
Fixes gCode handling of comments and escaped characters
 2015-03-06 15:09:35 -08:00
Scott Lahteine
25dc79f124 Remove M48 credits also 2015-03-06 14:54:30 -08:00
Scott Lahteine
34e51f576f Fix compile error in gcode_G29 
- A redo of #1576, which missed topo_flag
- Always set verbose_level
 2015-03-06 14:52:05 -08:00
Scott Lahteine
344a12bd10 Merge pull request #1571 from AnHardt/Undubble 
Undubble MSG_MIN & MSG MAX
 2015-03-06 10:08:19 -08:00
Scott Lahteine
1149c24b86 More grouping, cleanup, start on overrides 2015-03-06 08:48:53 -08:00
Wurstnase
62bd734612 fix controllerFan() for inverted enable pins 
add ```^ !(n_ENABLE_ON)``` for each stepper
 2015-03-06 12:01:17 +01:00
AnHardt
3024f6c706 Undubble MSG_MIN &MSG MAX 2015-03-06 00:25:44 +01:00
Gina Häußge
63b62d8d4e Fixed in-line comments and escaping 
* "G1 X1 ; test" was not executing "G1 X1" due to never leaving comment mode.
  * "M117 Hello \;)" printed "Hello \" to the display due to not replacing serial_char properly.

Tested with the following commands:
    * M117 Hello ; test => displays "Hello" on display, ignores "test"
    * G1 X1 ; foo => moves 1mm in X, ignores "foo"
    * ; test => completely ignored, not even acknowledged
    * M117 Hello \;) => displays "Hello ;)" on display
    * M117 Hello \\;) => displays "Hello \" on display, ignores ")"
 2015-03-05 23:30:34 +01:00
C-o-r-E
99fb1bc3e8 Attempt to resolve #1568 and add basic escape character support 2015-03-05 15:22:37 -05:00
Scott Lahteine
fad14ae7eb Merge branch 'Development' into marlin_configurator 
Latest upstream changes
 2015-03-05 05:32:31 -08:00
Scott Lahteine
cdc38aa783 Move gcode handlers into inline functions 2015-03-05 04:27:24 -08:00
Scott Lahteine
6d9e9a6bef Merge branch 'Development' into enhanced_g29 
Latest upstream changes
 2015-03-05 02:49:18 -08:00
Scott Lahteine
4db2179f5c Include 4th extruder support 2015-03-05 02:37:36 -08:00
OhmEye
f90a947e65 Fix autoretract 
Autoretract was broken, looks like it was overlooked when the retracted flag was updated for multi extruders.
 2015-03-04 20:28:08 -10:00
Scott Lahteine
2ef6b3d57a Fix wrong defines, broken syntax 2015-03-04 22:24:44 -08:00
Scott Lahteine
08b722b635 Merge pull request #1555 from C-o-r-E/solenoids 
Add support for solenoid articulated extruders
 2015-03-04 21:36:29 -08:00
Scott Lahteine
32744d41a9 Do sanity checking on LRFB values 
- Setting boundaries based on configured limits, contrasting with G28
(which forgets these limits?)
 2015-03-04 21:32:11 -08:00
chrono
0a7d85c20e Minor fixes 2015-03-04 12:35:32 +00:00
chrono
48e3a97a18 Removed extra encoder definitions from pins_FELIX2.h 2015-03-04 12:21:18 +00:00
Scott Lahteine
d052a3c6aa Merge pull request #1551 from thinkyhead/redundant_encrot 
Cleanup rotary encoder encrot* defines
 2015-03-04 03:22:24 -08:00
chrono
d8eeddfb93 Updated DUAL Extruder config, added README and enabled NEWPANEL by default 2015-03-04 09:59:58 +00:00
chrono
b423b90c77 Added Configuration_adv.h to examples for LCD/SD Support 2015-03-03 19:09:25 +01:00
domonoky
075507fb9a missed one X_ENABLE_PIN 2015-03-03 11:09:56 +01:00
Scott Lahteine
dfb38874f8 Some suggested changes for #1555 2015-03-03 00:48:20 -08:00
Scott Lahteine
7f8ea7105f Arrange ProbeAction values bitwise 2015-03-02 20:14:37 -08:00
Scott Lahteine
7684721977 Enhanced G29 
- Adapted “Enhanced G29” code referred to in #1499 and posted at
[3dprintboard.com](http://3dprintboard.com/showthread.php?3105-Auto_Bed_
Leveling-Enhanced-G29-command)
- Compatible with current G29 while adding some new arguments
  - `V` sets the verbose level for serial out
  - `T` (or `V` > 2) send a Topology report to serial out
  - `E` works the same way as before
  - `P` works as before (source used `n` or `U`/`u`)
  - `L`, `R`, `B`, `F` work as before
- Still needs sanity checking for `LRBF`
 2015-03-02 20:00:17 -08:00
C-o-r-E
874d3d3fc5 Add support for solenoid articulated extruders 2015-03-02 20:07:12 -05:00
chrono
7540a81106 Minor fixes 2015-03-02 22:55:00 +01:00
chrono
a375d648c7 Merge remote-tracking branch 'upstream/Development' into Development 2015-03-02 17:21:05 +00:00
domonoky
4a7aca2736 Merge remote-tracking branch 'remotes/upstream/Development' into Development 2015-03-02 17:52:12 +01:00
alexborro
715104e477 Fix Endstop check for CoreXY bots. 
The X_Axis could not home to min while Y_Max endstop was trigged.
 2015-03-02 13:36:58 -03:00
Scott Lahteine
e428e8da75 Merge pull request #1552 from thinkyhead/cleanup_cardreader 
Cleanup of cardreader.*
 2015-03-02 07:57:26 -08:00
Scott Lahteine
20e59dc61e Don't skip files starting with underscores 2015-03-02 07:56:11 -08:00
Scott Lahteine
f171656f8e Cleanup of cardreader.* 
- Apply standards to cardreader.*
- Fix minor issues with cardreader.cpp
- Apply standards to some other stale regions
 2015-03-02 07:06:01 -08:00
Scott Lahteine
f379edca78 Cleanup rotary encoder encrot* defines 
The encrot values are used in only one place, and don’t vary, so remove
redundant references.
 2015-03-02 06:42:48 -08:00
Scott Lahteine
c7cdb176c8 Merge branch 'Development' into marlin_configurator 
Latest upstream changes
 2015-03-02 06:13:10 -08:00
Scott Lahteine
49f471a5fc Merge pull request #1541 from thinkyhead/fixup_temperature 
Cleanup of temperature code
 2015-03-02 05:38:10 -08:00
Scott Lahteine
f2710e11d1 Optimize initial loading, code cleanup 2015-03-02 05:23:36 -08:00
chrono
558c6313f7 Merge branch 'pr-felix' into Marlix 2015-03-02 10:27:58 +00:00
chrono
08bc723a3c Enable PIDBED 2015-03-02 10:26:42 +00:00
chrono
e487bd642b Updated PR to streamline integration 2015-03-02 09:49:45 +00:00
Scott Lahteine
2eeb241b42 Find fields that group together 
- Do field grouping
- Tweak configurations for better grouping
 2015-03-02 01:45:53 -08:00
Scott Lahteine
e30bfedce4 Fix undefined *_PROBE_BED_POSITION error 2015-03-01 19:57:35 -08:00
chrono
3eafea840d Minor fixes in Configuration.h 2015-03-01 11:04:02 +01:00
chrono
c7fb1b70f2 Initial Configuration.h for Felix 2.0/3.0 2015-03-01 09:54:36 +00:00
chrono
2e172f38bd Added support for Felix 2.0/3.0 printers 2015-03-01 09:16:55 +00:00
Scott Lahteine
f994729999 Parse and use dependent groups 
- Parse #if, #ifdef, etc. for rules to enable fields
 2015-02-28 22:40:20 -08:00
maverikou
9b50ec6512 Panel One encoder pins 2015-02-28 10:52:15 +02:00
Scott Lahteine
838a22de64 Fix switch value method, make app global 2015-02-27 21:08:09 -08:00
Scott Lahteine
8d5839151b Merge branch 'Development' into marlin_configurator 
Latest upstream changes
 2015-02-27 20:40:23 -08:00
domonoky
443e7edef4 - Add support for L6470 Drivers. 
- Both TMC, L6470 and pin-driven drivers work.
- All can be mixed and matched as needed.
 2015-02-27 12:43:23 +01:00
Scott Lahteine
1db02c2891 Merge branch 'Development' into fixup_temperature 
Merge upstream changes
 2015-02-26 17:25:28 -08:00
Scott Lahteine
a99470fbb0 Merge pull request #1527 from maverikou/panel_one 
Added support for PanelOne from T3P3.
 2015-02-26 16:01:13 -08:00
domonoky
5727cb3ed4 Cleanup TMC Stepper a bit. 2015-02-26 12:57:46 +01:00
Scott Lahteine
a5bbd402bf Merge pull request #1539 from AnHardt/dummysensor 
Extend the idea of dummy temperature sensors.
 2015-02-26 01:29:14 -08:00
Scott Lahteine
1a7b0d9a37 Redo HAS_* macros to fix define error 2015-02-26 01:14:59 -08:00
Scott Lahteine
864dddc878 Macros to the top, a few HAS_* macros 2015-02-26 00:33:30 -08:00
alexborro
227ab8c665 Merge pull request #1503 from MarcelMo/patch-2 
Support for simple customisable AutoZProbing area
 2015-02-25 13:22:42 -03:00
Scott Lahteine
fd1ea9d56f Move literal strings to language files 2015-02-24 23:03:08 -08:00
maverikou
8742b6bd56 Merge branch 'Development' into panel_one 2015-02-24 22:24:57 +02:00
Scott Lahteine
aa9c1f1bed Better name for ADC macro 2015-02-24 05:38:10 -08:00
Scott Lahteine
9c9726d469 Cleanup of temperature code 
- Reduce calls to millis()
- General cleanup of manage_heaters
- General cleanup of pid autotune
- Formatting here & there
- Macros to clean up and shrink ISR code (reduced by ~364 lines)
 2015-02-24 04:46:11 -08:00
AnHardt
c6d2ebe452 Extend the idea of dummy temperature sensors. 
Added a second sensor and made them configurable.
 2015-02-24 11:02:16 +01:00
Scott Lahteine
c9a3eb0c1a Spacing in calculate_volumetric_multiplier(s) 2015-02-23 20:35:18 -08:00
Scott Lahteine
2af559cca3 Shared function for menu_edit_* and menu_edit_callback_* 2015-02-23 20:31:28 -08:00
Scott Lahteine
df8c51528f Merge branch 'Development' into cleanup_ultralcd 
Latest upstream changes
 2015-02-23 20:13:08 -08:00
Scott Lahteine
517f411999 Spacing adjustment to menu_edit* macro 2015-02-23 20:11:52 -08:00
Scott Lahteine
4938ae5caf Add required backslash for macro expansion 2015-02-23 20:10:49 -08:00
Scott Lahteine
e182cdebf9 Add required backslash for macro expansion 2015-02-23 19:54:07 -08:00
Scott Lahteine
fa4c36df68 Fix menu callback issue wrt LCD_CLICKED 2015-02-23 19:40:57 -08:00
Scott Lahteine
0cf0c20532 Optimize calculate_volumetric_multiplier 2015-02-23 18:10:35 -08:00
domonoky
38500165ea First attempt at adding TMC Driver support. May need some cleanup. 2015-02-23 17:45:29 +01:00
domonoky
b55995aae8 Introduce a layer of macro indirection to all stepper pins. This allows other stepper drivers to redefine them, so they can use SPI/I2C instead of direct pin manipulation. 2015-02-23 16:12:35 +01:00
kieranc
8ccdac9898 Enable PID debugging for heated bed 2015-02-23 09:42:01 +01:00
kieranc
29097b0ab2 Enable PID debugging for heated bed 2015-02-23 09:41:25 +01:00
kieranc
21bd4fd6db Enable PID debugging for heated bed 2015-02-23 09:40:53 +01:00
kieranc
fb56aad898 Enable PID debugging for heated bed 2015-02-23 09:40:29 +01:00
kieranc
08c543f8fb Enable PID debugging for heated bed 2015-02-23 09:40:06 +01:00
kieranc
c89413db1e Enable PID debugging for heated bed 2015-02-23 09:39:39 +01:00
kieranc
1c71e4751a Enable PID debugging for heated bed 2015-02-23 09:39:07 +01:00
maverikou
a9e15aa503 Updated example configurations 2015-02-22 20:15:05 +02:00
Scott Lahteine
3ba47ea277 Remove test/demo multi=line code menu items 2015-02-22 10:10:37 -08:00
Scott Lahteine
c1240f23dd Merge branch 'Development' into marlin_configurator 
Latest upstream changes
 2015-02-22 10:02:25 -08:00
alexborro
a57869ba49 Dummy Thermistor Table for testing purposes 
Am I the only one who always need to change the thermistortable.h to add
a dummy table??
Ok, it is done. Just set the thermistor to 999 and it will always read
25C. Great for Testing or Development purposes.
 2015-02-22 11:02:04 -03:00
Maverikou
2e166f5337 Added support for PanelOne from T3P3. 2015-02-22 09:14:43 +02:00
Scott Lahteine
40ef472a25 Merge in encoder multiplier 2015-02-21 20:18:49 -08:00
Scott Lahteine
1c13cd604b Formatting in babysteps defines 2015-02-21 18:45:10 -08:00
Scott Lahteine
3a26804d80 Adapt to latest PID code and fix typos 2015-02-21 18:41:04 -08:00
Scott Lahteine
422582da71 Prep formatting for upcoming PR 2015-02-21 18:24:16 -08:00
Scott Lahteine
27ac3e985d Add options to example_configurations 2015-02-21 18:17:37 -08:00
Scott Lahteine
0d6a7a2df0 Merge with latest upstream changes 2015-02-21 18:13:31 -08:00
Scott Lahteine
c7a97e18b7 Merge branch 'Development' into cleanup_ultralcd 
Latest upstream changes
 2015-02-21 18:04:08 -08:00
Scott Lahteine
6d5c13df74 Merge pull request #1520 from thinkyhead/fixup_temperature 
Fix typos in checkExtruderAutoFans
 2015-02-21 17:53:26 -08:00
Scott Lahteine
5b9e341222 Merge pull request #1516 from thinkyhead/fixup_ramps 
Cleanup ramps boards
 2015-02-21 17:51:57 -08:00
Scott Lahteine
57bc28b42c Cleanup and fix ultralcd.cpp 
- Fix bug in lcd_control_temperature_menu
- Remove test menu-item left in from multi-line command feature
- Replace literals with translatable strings
- Reduce lcd_preheat code redundancy
- Reduce menu macro redundancy
- Clean up formatting
 2015-02-21 17:38:56 -08:00
Scott Lahteine
4fcd4b444e Merge pull request #1519 from thinkyhead/fix_recent_issues 
Fix implementation of PID menu items
 2015-02-21 16:43:11 -08:00
Scott Lahteine
9c35ed149d Merge pull request #1508 from AnHardt/iss1492 
Fix iss#1492
 2015-02-21 16:26:37 -08:00
Scott Lahteine
430c4b6538 Replace missing backslash 2015-02-20 02:17:16 -08:00
Scott Lahteine
3aa5f98b64 Download all as ZIP, adjust layout on resize 2015-02-20 02:12:00 -08:00
Scott Lahteine
a8939eec28 Readability of MENU_MULTIPLIER_ITEM 
Last commit before bed.
 2015-02-20 02:08:41 -08:00
Scott Lahteine
09e09b308e Tweaky spacing adjustments 2015-02-20 01:22:56 -08:00
Scott Lahteine
e3fd3e8fa4 Fix typos in checkExtruderAutoFans 2015-02-20 00:08:59 -08:00
Scott Lahteine
c610471b0c Add PID_PARAMS_PER_EXTRUDER conditional 2015-02-20 00:00:19 -08:00
Scott Lahteine
2d6fa9ce80 Proper implementation of PID menu items 
- Make this work per #1344
 2015-02-19 23:54:06 -08:00
wgm4321
b8e79dce89 Fix compilation errors when encoder multiplier is disabled 2015-02-19 21:51:23 -05:00
wgm4321
65e1fc71be Add encoder rate multiplier 2015-02-19 21:42:57 -05:00
Scott Lahteine
859c8d3fef Azteeg X3 overrides too 2015-02-19 17:28:38 -08:00
Scott Lahteine
7891eacf21 Merge branch 'Development' into fixup_ramps_boards 
- Also apply cleanup for #1514
 2015-02-19 17:26:22 -08:00
Scott Lahteine
1600506545 Merge remote-tracking branch 'upstream/Development' into marlin_configurator 2015-02-19 15:15:55 -08:00
Scott Lahteine
5d0c93ae10 Keep config boxes in view on wide screen 2015-02-19 03:41:41 -08:00
Scott Lahteine
335b7680c9 Tooltip code, widescreen layout, hide auto-expands 
Slightly better layout for wide screens.
 2015-02-19 03:11:16 -08:00
domonoky
15b73386b5 Add pin definitions for the Boards BAM&DICE + BAM&DICE Due 2015-02-19 11:53:31 +01:00
Scott Lahteine
08c236059e Merge pull request #1505 from thinkyhead/issue_1499 
Bed leveling probe behavior issue?
 2015-02-19 01:24:17 -08:00
Scott Lahteine
f238c7428d Merge branch 'Development' into marlin_configurator 
Latest upstream changes
 2015-02-18 21:56:17 -08:00
Scott Lahteine
da275c72ab Cleanup Github reply.data.content before atob() 2015-02-18 21:45:38 -08:00
MagoKimbra
159196d1e9 Reset Alert message when finish M600 command 2015-02-18 21:33:38 +01:00
daid
266ff227cf Merge pull request #1510 from docdawning/Development 
Trivial spelling correction
 2015-02-17 20:59:32 +01:00
DocDawning
dfd4e74a5c Trivial spelling correction 2015-02-17 12:37:05 -07:00
AnHardt
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
Scott Lahteine
c033904693 Updated config file section markers 2015-02-15 23:25:57 -08:00
Scott Lahteine
84a87a5b1c Fix up configs a little 2015-02-15 23:19:22 -08:00
Scott Lahteine
63a5ff7ab9 Merge pull request #1489 from tommil/Development 
Updated Finnish language file
 2015-02-15 23:02:11 -08:00
Scott Lahteine
efb0491d40 Merge branch 'Development' into issue_1499 
Merging latest upstream changes
 2015-02-15 22:59:07 -08:00
Scott Lahteine
8309b4f408 Merge branch 'Development' into marlin_configurator 
Merging latest upstream changes
 2015-02-15 22:58:04 -08:00
Scott Lahteine
961998cf91 Merge pull request #1496 from thinkyhead/issue_1493 
Megatronics 3 servo pins
 2015-02-15 22:00:14 -08:00
Scott Lahteine
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
Scott Lahteine
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
Scott Lahteine
7c6236761a Merge branch 'Development' into issue_1493 
Merging latest upstream changes
 2015-02-15 20:45:35 -08:00
Scott Lahteine
9875352dd8 Merge branch 'Development' into marlin_configurator 
Merging latest upstream changes
 2015-02-15 20:44:21 -08:00
MarcelMo
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
Tommi Lamberg
513ff94b89 Merge remote-tracking branch 'upstream/Development' into Development 2015-02-15 12:21:45 +02:00
Scott Lahteine
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
alexborro
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
Scott Lahteine
ec53c6309a More fields, options in config, fix tooltips 2015-02-13 03:02:56 -08:00
Scott Lahteine
68184af57b Merge branch 'Development' into marlin_configurator 
Latest upstream commits
 2015-02-12 21:59:26 -08:00
Scott Lahteine
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
Natealus
ea9e49b20d ARRAY_BY_EXTRUDERS 4th hotend PID parameters 2015-02-12 00:56:47 -07:00
Scott Lahteine
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
Scott Lahteine
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
Tommi Lamberg
622a531d9c Fixed error in translation 2015-02-11 08:50:48 +02:00
Tommi Lamberg
290ab42d22 Updated Finnish translations 2015-02-11 08:37:07 +02:00
Jérémie FRANCOIS
22a7985445 reverted to upstream 2015-02-11 07:12:55 +01:00
Jérémie FRANCOIS
b3bda57ca2 reverted to upstream 2015-02-11 07:12:02 +01:00
Jérémie FRANCOIS
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
Tommi Lamberg
0a59fee763 Merge remote-tracking branch 'upstream/Development' into Development 2015-02-11 06:53:43 +02:00
Scott Lahteine
eb5889b3da Merge pull request #1479 from AnHardt/en_first 
#include "language_en.h" before the national language in language.h
 2015-02-10 15:33:45 -08:00
kieranc
b9ed873827 Enable PID debugging for heated bed 2015-02-10 14:13:06 +01:00
kieranc
0a19109476 Enable PID debugging for heated bed 2015-02-10 14:11:44 +01:00
Tommi Lamberg
a4f939cc27 Updated Finnish language file 2015-02-10 10:48:33 +02:00
Scott Lahteine
32d4dd073f Merge pull request #1487 from AnHardt/iss1485 
Fix for #1485
 2015-02-09 21:41:07 -08:00
AnHardt
c246026bda Sorry. 2015-02-10 00:23:39 +01:00
AnHardt
07e488cfae Fix for #1485 2015-02-10 00:13:46 +01:00
Souko
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.
 2015-02-09 21:46:06 +01:00
Scott Lahteine
52c3cf6d34 Fix a logging error 2015-02-09 05:07:05 -08:00
Scott Lahteine
ba24a09f24 Use api.github to get Configurations 
- Make api.github the default source for configurations
- Remove configurations from the configurator
- Continuation and enhancements
 2015-02-09 04:34:57 -08:00
Natealus
f4b0a40abb Additional fixes to temperature.cpp and found another missing line 
Looks like INVERT_E3_DIR was missing in the configuration.h also as I
did a test compile with 4 extruders and Azteeg X3 Pro defined. So I also
added those lines too. Additional formatting to make the comments line
up better in that section.
 2015-02-08 15:43:58 -07:00
AnHardt
3aac2df057 Now the oter way around. 
Include of language_en.h now behind national language.

All "#define MSG_STR_*" now surrounded by #ifndef and #endif.
 2015-02-08 20:41:20 +01:00
AnHardt
488633bf44 #include "language_en.h" before the national language in language.h 
+ May decrease the workload for feature developers. They may omit to
update all the language files but "language_en.h". When loading _en
first, all new features give some display, but the new in English.

- May throw some additional warnings about redefinition during compile.
 2015-02-08 14:26:24 +01:00
AnHardt
8e92729141 Make display language configurable in Configuration.h 2015-02-08 13:45:22 +01:00
Natealus
38a500d05c Viki 2 Implementation 
I've insert the define and pointer entries for the Viki 2 and miniViki
from Panucatt in all of the example configs and main config. With these
additions and with pins done in the old single pin.h style...I was able
to get the display working fine save for needing to turn Delta Segments
per Second down. But that's a common graphics lcd issue being looked
into right now.

I need assistance in understanding how the new divided pins files fit
together because my previous attempts at trying to get it to work
appropriately didn't seem successful. This originally came from trying
to find out how to swap the XYZ Min and Max Endstop pins in the Azteeg
X3 Pro. It only comes with one set of connectors and they're Min
Endstops. My previous experience didn't turn out well trying to tell the
firmware to home to the Min Endstops so the best solution I found was to
swap the pins in the firmware. If I'm missing a conflict with a setup
other than delta please let me know, but it makes sense in my setup.
 2015-02-08 03:14:59 -07:00
Natealus
697ee2dc50 Compiling errors with 4 Extruders defined 
Here were a few changes that I had to make/add lines for the 4th hotend.
A compiling problem in the Temperature.cpp and missing lines in
configuration.h and configuration_adv.h. I added these lines in all of
the example configs too.
 2015-02-08 01:05:05 -07:00
Jérémie FRANCOIS
85e5aa4011 Generalized enqueue_commands_P, and moved them to Marlin_main as they should 2015-02-07 23:24:20 +01:00
Scott Lahteine
4228758f1d Clean up and improve tooltips, show the name 2015-02-07 11:58:19 -08:00
Scott Lahteine
0116320d2c Strip slashes off the front of tooltips 2015-02-07 11:04:10 -08:00
Scott Lahteine
69240d41b0 Offset the timing of the pulsing animation 2015-02-07 10:45:56 -08:00
Scott Lahteine
78b9428f4e Avoid capturing disabled items in comments 2015-02-07 10:34:16 -08:00
Scott Lahteine
5d159851e5 Fix positioning of tooltip 2015-02-07 09:03:00 -08:00
Scott Lahteine
c99f1de9f3 Fix tooltips blocking clicks 2015-02-07 07:39:10 -08:00
Scott Lahteine
1a548c1bc1 Find nearby comments and make them into tooltips 2015-02-07 06:20:04 -08:00
Scott Lahteine
90fa1345b0 Fix purge + refresh of define info 2015-02-07 03:02:26 -08:00
Scott Lahteine
aa67b38a44 Fan speed and 4th extruder on graphical LCD 
- Display fan speed 0-1 as “—“ and 254-255 as “100%”.
- Display 4th extruder instead of the heated bed
 2015-02-07 02:44:35 -08:00
Scott Lahteine
7850ae2f4f Merge branch 'Development' into marlin_configurator 
Merge latest Development
 2015-02-07 02:20:25 -08:00
Scott Lahteine
2647402095 Use info.repl in updateDefineFromField, fix regex 2015-02-07 02:04:44 -08:00
Scott Lahteine
12a3975341 Close section tag, add String.prototype.lineCount 2015-02-07 00:46:14 -08:00
Scott Lahteine
4bb72f9480 Highlight the edited line 
- Add a span to the edited text line to provide a highlight
- Scroll and highlight for switch checkboxes also
- Clean up initialization
- More API documentation
- Smarter handling of asynchronous file loading during init
 2015-02-06 23:46:16 -08:00
Scott Lahteine
37c43a7ab3 Scroll to reveal on switches as well 2015-02-06 18:09:14 -08:00
Scott Lahteine
9c0adae3cd Scroll to setting position in file when edited 
- Animate scrolling to the edited item’s position
- Sanity check file drops and show warnings
- Fix form init / refresh on new configuration drop
- Document the API methods that get/set defines
 2015-02-06 17:57:31 -08:00
Scott Lahteine
4d341bb758 Copy configs into subfolder 
Browsers may not want to load files outside the folder, but they may be
okay with these relative references within the folder.
 2015-02-06 14:58:47 -08:00
Scott Lahteine
72856166a9 Fix bad typo in ConfigurationStore.cpp 2015-02-06 14:43:58 -08:00
Scott Lahteine
b51204cc1c Add fieldsets and make them into tabs 2015-02-05 20:28:39 -08:00
Scott Lahteine
56769ba4f8 Make comment/uncomment a little neater 2015-02-05 19:39:42 -08:00
Scott Lahteine
94bebf31ac Pre-collect info about options on field init 
- When initializing fields use the configuration to determine the format
- Cache the line for each option for fastest string compare / replace
- Add logging levels for debugging
 2015-02-05 19:30:11 -08:00
Scott Lahteine
32aaadc301 Include minimized jQuery 2.1.3 2015-02-05 11:50:42 -08:00
Scott Lahteine
53f6bbdfe0 Try a stepper for the serial port 2015-02-05 11:44:43 -08:00
Scott Lahteine
ac7a4358d6 Add a responsive file uploader 
- Specify HTML5
- Allow drag and drop for loading configurations
 2015-02-05 11:14:31 -08:00
Scott Lahteine
09a385d9b0 Add "use strict" to the top. 2015-02-05 08:22:51 -08:00
Scott Lahteine
b2627200ea Get thermistors from config, add temp sensors 2015-02-05 08:19:09 -08:00
Scott Lahteine
ef18bfdd3f An in-place browser-based configurator utility 
- A web form with fields for configuration values
- Reads and parses standard config files
- Modifies configurations dynamically in-place
 2015-02-05 07:05:29 -08:00
Scott Lahteine
3490a19103 Merge pull request #1466 from CONSULitAS/Development_K8200_de 
K8200: Example Configuration.h fixed
 2015-02-04 17:28:04 -08:00
CONSULitAS
cfbb94a2a8 K8200: Example Configuration.h fixed 
Example Configuration.h: fixed strange white characters preventing
compilation in lines 1 and 3 - oops
 2015-02-04 10:35:10 +01:00
Scott Lahteine
b65c5d8ec6 Merge pull request #1464 from AnHardt/iss1448-Menu 
Unified menu selection - by hilighting - made first column avilable
 2015-02-03 22:43:29 -08:00
CONSULitAS
0de5083aff K8200: Example Configurations readme.md updated 
Example Configurations for K8200 readme.md updated
* readme.md: added description for german umlaut support on LCD
 2015-02-04 00:24:51 +01:00
CONSULitAS
c421ffd520 K8200: Example Configuration_adv.h back in sync 
Example Configuration_adv.h for K8200 back in sync
* Configuration_adv.h: rebased and added missing changes for 4th
extruder
 2015-02-04 00:19:18 +01:00
CONSULitAS
0575dd10de K8200: Example Configuration.h back in sync 
Example Configuration.h for K8200 back in sync
* Configuration.h: rebased and added missing changes
* Configuration.h: updated comments for K8200
 2015-02-04 00:15:50 +01:00