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
e6af82ba2f
Merge pull request #1526 from thinkyhead/cleanup_ultralcd
...
Cleanup and fix ultralcd.cpp
2015-02-23 21:22:54 -08: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
adbb839b16
Merge pull request #1535 from gege2b/Development
...
Corrected a typo in ArduinoAddons/Arduino_1.5.x/(...)/boards.txt
2015-02-23 19:51:44 -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
Gege2B
b4e9395661
Corrected a typo in ArduinoAddons/Arduino_1.5.x/(...)/avr/boards.txt about Sanguino
2015-02-23 16:02:04 +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
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
c3c50528e6
Merge pull request #1521 from thinkyhead/fixup_encoder_code
...
Encoder multiplier - revised code
2015-02-21 19:44:53 -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
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
c9465c33cf
Merge branch 'thinkyhead-fixup_ramps_boards' into Development
...
Merge resolving conflicts
2015-02-19 17:36:49 -08:00
Scott Lahteine
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
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
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
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
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
MagoKimbra
159196d1e9
Reset Alert message when finish M600 command
2015-02-18 21:33:38 +01:00
