e3d92b9168
Try to fix the travis build, which is failing because conditional includes do not work in .ino files for the ino processor ?
2015-03-02 18:45:58 +01:00
c13d81ce15
Merge branch 'Development' into pr-felix
2015-03-02 17:21:39 +00:00
a375d648c7
Merge remote-tracking branch 'upstream/Development' into Development
2015-03-02 17:21:05 +00:00
4a7aca2736
Merge remote-tracking branch 'remotes/upstream/Development' into Development
2015-03-02 17:52:12 +01:00
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
e428e8da75
Merge pull request #1552 from thinkyhead/cleanup_cardreader
...
Cleanup of cardreader.*
2015-03-02 07:57:26 -08:00
20e59dc61e
Don't skip files starting with underscores
2015-03-02 07:56:11 -08:00
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
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
c7cdb176c8
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
2015-03-02 06:13:10 -08:00
187d336665
Revert default conf and temperature.cpp
2015-03-02 13:56:37 +00:00
7f060d7caf
Revert "Testing Fix for Arduino 1.6+ compiler issue #1523 "
...
This reverts commit fb75a9272d
2015-03-02 13:47:35 +00:00
49f471a5fc
Merge pull request #1541 from thinkyhead/fixup_temperature
...
Cleanup of temperature code
2015-03-02 05:38:10 -08:00
f2710e11d1
Optimize initial loading, code cleanup
2015-03-02 05:23:36 -08:00
fb75a9272d
Testing Fix for Arduino 1.6+ compiler issue #1523
2015-03-02 10:45:54 +00:00
558c6313f7
Merge branch 'pr-felix' into Marlix
2015-03-02 10:27:58 +00:00
08bc723a3c
Enable PIDBED
2015-03-02 10:26:42 +00:00
e487bd642b
Updated PR to streamline integration
2015-03-02 09:49:45 +00:00
2eeb241b42
Find fields that group together
...
- Do field grouping
- Tweak configurations for better grouping
2015-03-02 01:45:53 -08:00
9377089c43
Merge pull request #1548 from thinkyhead/issue_1547_bed_leveling
...
Fix undefined *_PROBE_BED_POSITION error
2015-03-01 20:01:38 -08:00
e30bfedce4
Fix undefined *_PROBE_BED_POSITION error
2015-03-01 19:57:35 -08:00
875812d346
Updated package info
2015-03-01 11:15:17 +01:00
3eafea840d
Minor fixes in Configuration.h
2015-03-01 11:04:02 +01:00
c7fb1b70f2
Initial Configuration.h for Felix 2.0/3.0
2015-03-01 09:54:36 +00:00
2e172f38bd
Added support for Felix 2.0/3.0 printers
2015-03-01 09:16:55 +00:00
f994729999
Parse and use dependent groups
...
- Parse #if, #ifdef, etc. for rules to enable fields
2015-02-28 22:40:20 -08:00
b869476e99
Merge pull request #1545 from maverikou/panel_one_encoder
...
Panel One encoder pins
2015-02-28 05:32:56 -08:00
9b50ec6512
Panel One encoder pins
2015-02-28 10:52:15 +02:00
838a22de64
Fix switch value method, make app global
2015-02-27 21:08:09 -08:00
8d5839151b
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
2015-02-27 20:40:23 -08:00
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
1db02c2891
Merge branch 'Development' into fixup_temperature
...
Merge upstream changes
2015-02-26 17:25:28 -08:00
a99470fbb0
Merge pull request #1527 from maverikou/panel_one
...
Added support for PanelOne from T3P3.
2015-02-26 16:01:13 -08:00
5727cb3ed4
Cleanup TMC Stepper a bit.
2015-02-26 12:57:46 +01:00
a5bbd402bf
Merge pull request #1539 from AnHardt/dummysensor
...
Extend the idea of dummy temperature sensors.
2015-02-26 01:29:14 -08:00
1a7b0d9a37
Redo HAS_* macros to fix define error
2015-02-26 01:14:59 -08:00
864dddc878
Macros to the top, a few HAS_* macros
2015-02-26 00:33:30 -08:00
227ab8c665
Merge pull request #1503 from MarcelMo/patch-2
...
Support for simple customisable AutoZProbing area
2015-02-25 13:22:42 -03:00
fd1ea9d56f
Move literal strings to language files
2015-02-24 23:03:08 -08:00
8742b6bd56
Merge branch 'Development' into panel_one
2015-02-24 22:24:57 +02:00
aa9c1f1bed
Better name for ADC macro
2015-02-24 05:38:10 -08:00
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
c6d2ebe452
Extend the idea of dummy temperature sensors.
...
Added a second sensor and made them configurable.
2015-02-24 11:02:16 +01:00
e6af82ba2f
Merge pull request #1526 from thinkyhead/cleanup_ultralcd
...
Cleanup and fix ultralcd.cpp
2015-02-23 21:22:54 -08:00
c9a3eb0c1a
Spacing in calculate_volumetric_multiplier(s)
2015-02-23 20:35:18 -08:00
2af559cca3
Shared function for menu_edit_* and menu_edit_callback_*
2015-02-23 20:31:28 -08:00
7ec391e689
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
2015-02-23 20:21:40 -08:00
df8c51528f
Merge branch 'Development' into cleanup_ultralcd
...
Latest upstream changes
2015-02-23 20:13:08 -08:00
517f411999
Spacing adjustment to menu_edit* macro
2015-02-23 20:11:52 -08:00
4938ae5caf
Add required backslash for macro expansion
2015-02-23 20:10:49 -08:00
