zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
2243 commits 1 branch 0 tags 156 MiB
Commit graph

1788 commits

Author SHA1 Message Date
chrono b423b90c77 Added Configuration_adv.h to examples for LCD/SD Support 2015-03-03 19:09:25 +01: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
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 49f471a5fc Merge pull request #1541 from thinkyhead/fixup_temperature 
Cleanup of temperature code
 2015-03-02 05:38:10 -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 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
maverikou 9b50ec6512 Panel One encoder pins 2015-02-28 10:52:15 +02: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
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
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
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