tannoo / marlin Goto Github PK

View Code? Open in Web Editor NEW

This project forked from marlinfirmware/marlin

1.0 2.0 0.0 192.2 MB

Optimized firmware for RepRap 3D printers based on the Arduino platform.

Home Page: http://www.marlinfw.org/

License: GNU General Public License v3.0

C++ 25.90% C 72.89% Makefile 0.39% Arduino 0.08% Objective-C 0.05% Shell 0.22% CMake 0.16% Batchfile 0.02% Python 0.28%

marlin's Introduction

Marlin 3D Printer Firmware

Additional documentation can be found at The Marlin Documentation Project. Please test this firmware and inform us if it misbehaves in any way, volunteers are standing by!

Release Candidate -- Marlin 1.1.0-RC8 - 6 Dec 2016

Not for production use – use with caution!

The latest "stable" release of Marlin is 1.0.2-2. Download earlier versions of Marlin on the Releases page.

The latest Release Candidate lives in the "RC" branch. Bugs that we find in the current Release Candidate are patched in the "RCBugFix" branch, so during beta testing this is where you can always find the latest code on its way towards release.

Recent Changes

RC8 - 06 Dec 2016
- Major performance improvement for Graphical LCDs
- Simplified probe configuration
- Enable Auto Bed Leveling by type
- Reduce serial communication errors
- Make Bilinear (Mesh) Grid Leveling available for non-delta
- Support for Trinamic TMC2130 SilentStepStick SPI-based drivers
- Add M211 to Enable/Disable Software Endstops
- Add M355 to turn the case light on/off and set brightness
- Improved I2C class with full master/slave support
- Add G38.2 G38.3 command option for CNC style probing
- Add MINIMUM_STEPPER_PULSE option to adjust step pulse duration
- Add R parameter support for G2/G3
- Add M43 optional command (PINS_DEBUGGING)
- Remove SCARA axis scaling
- Improved sanity checking of configuration
- Improved support for PlatformIO and command-line build
- Usable DELTA_CALIBRATION_MENU
- Support for Printrbot Rev.F
- New and updated languages
RC7 - 31 Jul 2016
- Add Print Job Timer and Print Counter (PRINTCOUNTER)
- New M600 Filament Change (FILAMENT_CHANGE_FEATURE)
- New G12 Nozzle Clean (NOZZLE_CLEAN_FEATURE)
- New G27 Nozzle Park (NOZZLE_PARK_FEATURE)
- Add support for COREYZ
- Add a new Advance Extrusion algorithm (LIN_ADVANCE)
- Add support for inches, Fahrenheit, Kelvin units (INCH_MODE_SUPPORT, TEMPERATURE_UNITS_SUPPORT)
- Better handling of G92 shifting of the coordinate space
- Add Greek and Croatian languages
- Improve the Manual (Mesh) Bed Leveling user interface
- Add support for more boards, controllers, and probes:
  - Vellemann K8400 (BOARD_K8400)
  - RigidBot V2 (BOARD_RIGIDBOARD_V2)
  - Cartesio UI (BOARD_CNCONTROLS_12)
  - BLTouch probe sensor (BLTOUCH)
  - Viki 2 with RAMPS and MKS boards
- Improve support for DELTA and other kinematics
- Improve thermal management, add WATCH_BED_TEMP_PERIOD
- Better handling of toolchange, multiple tools
- Add support for two X steppers X_DUAL_STEPPER_DRIVERS
- Add support for SINGLENOZZLE, MIXING_EXTRUDER, and SWITCHING_EXTRUDER
- Simplified probe configuration, allow usage without bed leveling
- And much more… See the 1.1.0-RC7 Change Log for the complete list of changes.
RC6 - 24 Apr 2016
- Marlin now requires Arduino version 1.6.0 or later
- Completed support for CoreXY / CoreXZ
- See the 1.1.0-RC6 Change Log for all the changes.
RC5 - 01 Apr 2016
- Warn if compiling with older versions (<1.50) of Arduino
- Fix various LCD menu issues
- Add formal support for MKSv1.3 and Sainsmart (RAMPS variants)
- Fix bugs in M104, M109, and M190
- Fix broken M404 command
- Fix issues with M23 and "Start SD Print"
- More output for M111
- Rename FILAMENT_SENSOR to FILAMENT_WIDTH_SENSOR
- Fix SD card bugs
- and a lot more
- See the 1.1.0-RC5 Change Log for more!
RC4 - 24 Mar 2016
- Many lingering bugs and nagging issues addressed
- Improvements to LCD menus, CoreXY/CoreXZ, Delta, Bed Leveling, and more…
RC3 - 01 Dec 2015
- A number of language sensitive strings have been revised
- Formatting of the LCD display has been improved to handle negative coordinates better
- Various compiler-related issues have been corrected
RC2 - 29 Sep 2015
- File styling reverted
- LCD update frequency reduced
RC1 - 19 Sep 2015
- Published for testing

Submitting Patches

Proposed patches should be submitted as a Pull Request against the RCBugFix branch.

Don't submit new feature proposals. The RCBugFix branch is for fixing bugs in existing features.
Do submit questions and concerns. The "naive" question is often the one we forget to ask.
Follow the proper coding style. Pull requests with styling errors will be delayed. See our Coding Standards page for more information.

Current Status: Testing

Please test this firmware and inform us if it misbehaves in any way. Volunteers are standing by!

RepRap.org Wiki Page

Credits

The current Marlin dev team consists of:

Scott Lahteine [@thinkyhead] - English
[@Wurstnase] - Deutsch, English
F. Malpartida [@fmalpartida] - English, Spanish
Jochen Groppe [@CONSULitAS] - Deutsch, English
[@maverikou]
Chris Palmer [@nophead]
[@paclema]
Edward Patel [@epatel] - Swedish, English
Erik van der Zalm [@ErikZalm]
David Braam [@daid]
Bernhard Kubicek [@bkubicek]
Roxanne Neufeld [@Roxy-3DPrintBoard] - English

More features have been added by:

Alberto Cotronei [@MagoKimbra]
Lampmaker,
Bradley Feldman,
and others...

License

Marlin is published under the GPL license because we believe in open development. The GPL comes with both rights and obligations. Whether you use Marlin firmware as the driver for your open or closed-source product, you must keep Marlin open, and you must provide your compatible Marlin source code to end users upon request. The most straightforward way to comply with the Marlin license is to make a fork of Marlin on Github, perform your modifications, and direct users to your modified fork.

While we can't prevent the use of this code in products (3D printers, CNC, etc.) that are closed source or crippled by a patent, we would prefer that you choose another firmware or, better yet, make your own.

marlin's People

Contributors

Stargazers

Watchers

marlin's Issues

Re-ARM and 20x4 LCD Panel

Hey! Let me know if you have any trouble getting the current code to compile and load on the Re-ARM board. A lot of stuff is not intuitive. I had some trouble getting the code to compile and load. I wasn't even sure if I was opening the project the right way.

So... Don't waste too much time trying to figure things out on your own.

How hard do you think it will be to get the 20x4 LCD Panel displaying something? I'm hoping it will come up easily but that is probably not likely. But the machine I want to put the Re-ARM board on has a 20x4 LCD display, so that is part of the reason for the question.

And once it can compile... Even if it doesn't work... I can probably jump in and help with debugging.

LCD not displaying on a second attempt.

@thinkyhead,

In the current PR 7231, when selecting Output Mesh Map from the LCD, Homing XYZ displays just fine.
If I disable the steppers manually by M84 or Disable Steppers from the LCD, (or let them timeout), when selecting the Output Mesh Map from the LCD again the Homing XYZ doesn't display and it goes on to the map once the homing is complete.
I can get it to display again, only if I reset Marlin. But, it's back again to the issue above.

All else works just fine.

I've tried multiple different things...Nothing is working, what am I missing?

UBL Menu Sytem

@Roxy-3D, could you look this over and tell me what you think?

https://github.com/Tannoo/Marlin/tree/UBL_Menu

It is current with RCBugFix as of 4/20/17.

UBL LCD Matrix Plotting

@Roxy-3D, this is the 'new and improved' version... ready for improvement.

https://github.com/Tannoo/Marlin/tree/UBL_Mesh_Plotting

UBL character radar code

Removed

Does this have anything to do with our recent merge?

Does this have anything to do with our recent merge? Technically, the code base is frozen but we (I) merged our stuff anyway... If we broke something... We better figure out how to fix it.

MarlinFirmware#7262

Array troubles

@Roxy-3D,

I have an issue with this and unsure what to do.

    void _lcd_set_led_color() {
      const char *_colors[10] = {
        MSG_LCD_RED,         // 0  -- color_number
        MSG_LCD_GREEN,       // 1
        MSG_LCD_BLUE,        // 2
        MSG_LCD_AQUA,        // 3
        MSG_LCD_YELLOW,      // 4
        MSG_LCD_PURPLE,      // 5
        MSG_LCD_PINK,        // 6
        MSG_LCD_AMBER,       // 7
        MSG_LCD_BLACKLIGHT,  // 8
        MSG_LCD_WATERMELON   // 9
      };

      START_MENU();
      MENU_ITEM(back, MSG_LED_LIGHTING, lcd_main_menu);
      MENU_ITEM_EDIT_CALLBACK(int3, _colors[color_number], &color_number, 0, 9, _color_select);
      MENU_ITEM(submenu, MSG_LCD_RGB_EDIT, _lcd_set_rgb_color);
      MENU_ITEM(function, MSG_LCD_COLOR_RESET, _lcd_set_led_color_reset);
      END_MENU();
    }

This compiles and works just fine with the Re-ARM, I do see the linter errors are exactly the same as AVR.
The compiler errors in the Arduino IDE for the Mega2560:

sketch\ultralcd.cpp: In function 'void _lcd_set_led_color()':

ultralcd.cpp:305: error: initializer fails to determine size of '__c'

   #define MENU_ITEM_EDIT_CALLBACK(type, label, ...) MENU_ITEM(setting_edit_callback_ ## type, label, PSTR(label), ## __VA_ARGS__)

                                                                                                      ^

sketch\ultralcd.cpp:253:30: note: in definition of macro '_MENU_ITEM_PART_2'

         menu_action_ ## TYPE(__VA_ARGS__); \

                              ^

sketch\ultralcd.cpp:305:53: note: in expansion of macro 'MENU_ITEM'

   #define MENU_ITEM_EDIT_CALLBACK(type, label, ...) MENU_ITEM(setting_edit_callback_ ## type, label, PSTR(label), ## __VA_ARGS__)

                                                     ^

sketch\ultralcd.cpp:3068:7: note: in expansion of macro 'MENU_ITEM_EDIT_CALLBACK'

       MENU_ITEM_EDIT_CALLBACK(int3, _colors[color_number], &color_number, 0, 9, _color_select);

       ^

ultralcd.cpp:305: error: array must be initialized with a brace-enclosed initializer

   #define MENU_ITEM_EDIT_CALLBACK(type, label, ...) MENU_ITEM(setting_edit_callback_ ## type, label, PSTR(label), ## __VA_ARGS__)

                                                                                                      ^

sketch\ultralcd.cpp:253:30: note: in definition of macro '_MENU_ITEM_PART_2'

         menu_action_ ## TYPE(__VA_ARGS__); \

                              ^

sketch\ultralcd.cpp:305:53: note: in expansion of macro 'MENU_ITEM'

   #define MENU_ITEM_EDIT_CALLBACK(type, label, ...) MENU_ITEM(setting_edit_callback_ ## type, label, PSTR(label), ## __VA_ARGS__)

                                                     ^

sketch\ultralcd.cpp:3068:7: note: in expansion of macro 'MENU_ITEM_EDIT_CALLBACK'

       MENU_ITEM_EDIT_CALLBACK(int3, _colors[color_number], &color_number, 0, 9, _color_select);

       ^

In file included from C:\Users\JASON\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.6.19\cores\arduino/Arduino.h:28:0,

                 from sketch\src/HAL/HAL_AVR/HAL_AVR.h:38,

                 from sketch\src/HAL/HAL.h:81,

                 from sketch\MarlinConfig.h:27,

                 from sketch\Marlin.h:31,

                 from sketch\ultralcd.h:26,

                 from sketch\ultralcd.cpp:23:

ultralcd.cpp:257: error: initializer fails to determine size of '__c'

         lcd_implementation_drawmenu_ ## TYPE(encoderLine == _thisItemNr, _lcdLineNr, PSTR(LABEL), ## __VA_ARGS__); \

                                                                                      ^

sketch\ultralcd.cpp:264:7: note: in expansion of macro '_MENU_ITEM_PART_2'

       _MENU_ITEM_PART_2(TYPE, LABEL, ## __VA_ARGS__); \

       ^

sketch\ultralcd.cpp:305:53: note: in expansion of macro 'MENU_ITEM'

   #define MENU_ITEM_EDIT_CALLBACK(type, label, ...) MENU_ITEM(setting_edit_callback_ ## type, label, PSTR(label), ## __VA_ARGS__)

                                                     ^

sketch\ultralcd.cpp:3068:7: note: in expansion of macro 'MENU_ITEM_EDIT_CALLBACK'

       MENU_ITEM_EDIT_CALLBACK(int3, _colors[color_number], &color_number, 0, 9, _color_select);

       ^

ultralcd.cpp:257: error: array must be initialized with a brace-enclosed initializer

         lcd_implementation_drawmenu_ ## TYPE(encoderLine == _thisItemNr, _lcdLineNr, PSTR(LABEL), ## __VA_ARGS__); \

                                                                                      ^

sketch\ultralcd.cpp:264:7: note: in expansion of macro '_MENU_ITEM_PART_2'

       _MENU_ITEM_PART_2(TYPE, LABEL, ## __VA_ARGS__); \

       ^

sketch\ultralcd.cpp:305:53: note: in expansion of macro 'MENU_ITEM'

   #define MENU_ITEM_EDIT_CALLBACK(type, label, ...) MENU_ITEM(setting_edit_callback_ ## type, label, PSTR(label), ## __VA_ARGS__)

                                                     ^

sketch\ultralcd.cpp:3068:7: note: in expansion of macro 'MENU_ITEM_EDIT_CALLBACK'

       MENU_ITEM_EDIT_CALLBACK(int3, _colors[color_number], &color_number, 0, 9, _color_select);

       ^

ultralcd.cpp:305: error: initializer fails to determine size of '__c'

   #define MENU_ITEM_EDIT_CALLBACK(type, label, ...) MENU_ITEM(setting_edit_callback_ ## type, label, PSTR(label), ## __VA_ARGS__)

                                                                                                      ^

sketch\ultralcd.cpp:264:7: note: in expansion of macro '_MENU_ITEM_PART_2'

       _MENU_ITEM_PART_2(TYPE, LABEL, ## __VA_ARGS__); \

       ^

sketch\ultralcd.cpp:305:53: note: in expansion of macro 'MENU_ITEM'

   #define MENU_ITEM_EDIT_CALLBACK(type, label, ...) MENU_ITEM(setting_edit_callback_ ## type, label, PSTR(label), ## __VA_ARGS__)

                                                     ^

sketch\ultralcd.cpp:3068:7: note: in expansion of macro 'MENU_ITEM_EDIT_CALLBACK'

       MENU_ITEM_EDIT_CALLBACK(int3, _colors[color_number], &color_number, 0, 9, _color_select);

       ^

ultralcd.cpp:305: error: array must be initialized with a brace-enclosed initializer

   #define MENU_ITEM_EDIT_CALLBACK(type, label, ...) MENU_ITEM(setting_edit_callback_ ## type, label, PSTR(label), ## __VA_ARGS__)

                                                                                                      ^

sketch\ultralcd.cpp:264:7: note: in expansion of macro '_MENU_ITEM_PART_2'

       _MENU_ITEM_PART_2(TYPE, LABEL, ## __VA_ARGS__); \

       ^

sketch\ultralcd.cpp:305:53: note: in expansion of macro 'MENU_ITEM'

   #define MENU_ITEM_EDIT_CALLBACK(type, label, ...) MENU_ITEM(setting_edit_callback_ ## type, label, PSTR(label), ## __VA_ARGS__)

                                                     ^

sketch\ultralcd.cpp:3068:7: note: in expansion of macro 'MENU_ITEM_EDIT_CALLBACK'

       MENU_ITEM_EDIT_CALLBACK(int3, _colors[color_number], &color_number, 0, 9, _color_select);

       ^

exit status 1
initializer fails to determine size of '__c'

Help wanted

@Roxy-3D, I was hoping you could tell me if there is a cleaner way of doing the following?

These are conditionals to defining the different colors, but only if the specified color is needed.

#if ENABLED(PRINTER_EVENT_LEDS)
  #if ENABLED(HOMING_EVENT) == RED || ENABLED(LEVELING_EVENT) == RED || ENABLED(UBL_LOAD_EVENT) == RED || ENABLED(UBL_SAVE_EVENT) == RED || ENABLED(ADVANCED_PAUSE_EVENT) == RED || ENABLED(PAUSED_TIMEOUT) == RED
    #define RED 255, 0, 0, 0
  #endif
  #if ENABLED(HOMING_EVENT) == GREEN || ENABLED(LEVELING_EVENT) == GREEN || ENABLED(UBL_LOAD_EVENT) == GREEN || ENABLED(UBL_SAVE_EVENT) == GREEN || ENABLED(ADVANCED_PAUSE_EVENT) == GREEN || ENABLED(PAUSED_TIMEOUT) == GREEN
    #define GREEN 0, 255, 0, 0
  #endif
  #if ENABLED(HOMING_EVENT) == BLUE || ENABLED(LEVELING_EVENT) == BLUE || ENABLED(UBL_LOAD_EVENT) == BLUE || ENABLED(UBL_SAVE_EVENT) == BLUE || ENABLED(ADVANCED_PAUSE_EVENT) == BLUE || ENABLED(PAUSED_TIMEOUT) == BLUE
    #define BLUE 0, 0, 255, 0
  #endif
  #if ENABLED(HOMING_EVENT) == YELLOW || ENABLED(LEVELING_EVENT) == YELLOW || ENABLED(UBL_LOAD_EVENT) == YELLOW || ENABLED(UBL_SAVE_EVENT) == YELLOW || ENABLED(ADVANCED_PAUSE_EVENT) == YELLOW || ENABLED(PAUSED_TIMEOUT) == YELLOW
    #define YELLOW 255, 255, 0, 0
  #endif
  #if ENABLED(HOMING_EVENT) == PURPLE || ENABLED(LEVELING_EVENT) == PURPLE || ENABLED(UBL_LOAD_EVENT) == PURPLE || ENABLED(UBL_SAVE_EVENT) == PURPLE || ENABLED(ADVANCED_PAUSE_EVENT) == PURPLE || ENABLED(PAUSED_TIMEOUT) == PURPLE
    #define PURPLE 255, 0, 255, 0
  #endif
  #if ENABLED(HOMING_EVENT) == TEAL || ENABLED(LEVELING_EVENT) == TEAL || ENABLED(UBL_LOAD_EVENT) == TEAL || ENABLED(UBL_SAVE_EVENT) == TEAL || ENABLED(ADVANCED_PAUSE_EVENT) == TEAL || ENABLED(PAUSED_TIMEOUT) == TEAL
    #define TEAL 0, 255, 255, 0
  #endif
  #if ENABLED(HOMING_EVENT) == TEAL_HALF || ENABLED(LEVELING_EVENT) == TEAL_HALF || ENABLED(UBL_LOAD_EVENT) == TEAL_HALF || ENABLED(UBL_SAVE_EVENT) == TEAL_HALF || ENABLED(ADVANCED_PAUSE_EVENT) == TEAL_HALF || ENABLED(PAUSED_TIMEOUT) == TEAL_HALF
    #define TEAL_HALF 0, 127, 127, 0
  #endif
  #if ENABLED(HOMING_EVENT) == BLACKLIGHT || ENABLED(LEVELING_EVENT) == BLACKLIGHT || ENABLED(UBL_LOAD_EVENT) == BLACKLIGHT || ENABLED(UBL_SAVE_EVENT) == BLACKLIGHT || ENABLED(ADVANCED_PAUSE_EVENT) == BLACKLIGHT || ENABLED(PAUSED_TIMEOUT) == BLACKLIGHT
    #define BLACKLIGHT 167, 0, 255, 0
  #endif
  #if ENABLED(HOMING_EVENT) == WATERMELON || ENABLED(LEVELING_EVENT) == WATERMELON || ENABLED(UBL_LOAD_EVENT) == WATERMELON || ENABLED(UBL_SAVE_EVENT) == WATERMELON || ENABLED(ADVANCED_PAUSE_EVENT) == WATERMELON || ENABLED(PAUSED_TIMEOUT) == WATERMELON
    #define WATERMELON 255, 90, 90, 0
  #endif
  #if ENABLED(HOMING_EVENT) == AMBER || ENABLED(LEVELING_EVENT) == AMBER || ENABLED(UBL_LOAD_EVENT) == AMBER || ENABLED(UBL_SAVE_EVENT) == AMBER || ENABLED(ADVANCED_PAUSE_EVENT) == AMBER || ENABLED(PAUSED_TIMEOUT) == AMBER
    #define AMBER 183, 255, 0, 0
  #endif
  #if ENABLED(HOMING_EVENT) == ORANGE || ENABLED(LEVELING_EVENT) == ORANGE || ENABLED(UBL_LOAD_EVENT) == ORANGE || ENABLED(UBL_SAVE_EVENT) == ORANGE || ENABLED(ADVANCED_PAUSE_EVENT) == ORANGE || ENABLED(PAUSED_TIMEOUT) == ORANGE
    #define ORANGE 255, 75, 0, 0
  #endif
  #if ENABLED(HOMING_EVENT) == ROSE || ENABLED(LEVELING_EVENT) == ROSE || ENABLED(UBL_LOAD_EVENT) == ROSE || ENABLED(UBL_SAVE_EVENT) == ROSE || ENABLED(ADVANCED_PAUSE_EVENT) == ROSE || ENABLED(PAUSED_TIMEOUT) == ROSE
    #define ROSE 255, 0, 50, 0
  #endif
  #define LEDS_OFF 0, 0, 0, 0
#endif

This is how the colors are defined:

#if ENABLED(PRINTER_EVENT_LEDS)
  #define HOMING_EVENT           YELLOW
  #define LEVELING_EVENT         BLACKLIGHT
  #define UBL_LOAD_EVENT         AMBER
  #define UBL_SAVE_EVENT         ORANGE
  #define ADVANCED_PAUSE_EVENT   TEAL
  #define PAUSED_TIMEOUT_EVENT   TEAL_HALF
#endif

UBL LCD "Radar"

@Roxy-3D, take a look... 10x10 matrix:

I have to set the coordinates first, then go map it.
Need to get encoder working to change the values dynamically.

LCD Interactive Mesh

I have another branch now out for "cleanup" of this:
https://github.com/Tannoo/Marlin/tree/LCD_Interactive_Mesh_Edit_Refinements

I just moved the whole function of _lcd_ubl_plot_drawing_prep to the DOGM.h file, but renamed it to _lcd_ubl_plot_drawing.

You should be able to add whatever you want to throw into this branch.

MKS TFT32

@Roxy-3D, I got that LCD here on Ebay.

UBL matrix plotting

@Roxy-3D, I have a draft here to check out:

https://github.com/Tannoo/Marlin/tree/UBL_mesh_plot

Working:
Matrix is represented, not the build platform.
Grid box is two steps larger than any grid
X/Y nozzle locations (top of screen)
X/Y grid locations (bottom of screen)
Z value of grid location (bottom of screen)
'delta' circle that will overlay the matrix when (IS_KINEMATIC).
Encoder working 'on the fly' to select points.
Click on map point will invoke editing that point.
Editing will return to the "radar" to select another point.
"Radar" screen will time out to status screen.
UBL's 'click and hold' to cancel edit will exit this also.

TODO:
Scale up 3x3 "radar"

LCD SD Print

@Bob-the-Kuhn,
I'm trying this now. I did see the file list and selected the file and clicked to print. The screen went all wacky then and stays like that. I clicked the encoder and nothing happened. I rotated the encoder to the right about 1/2 turn then clicked and I got the main menu.