Commit b2f21cbe authored by Franco (nextime) Lanza's avatar Franco (nextime) Lanza

Merge branch 'master' into k40_noflow_nocooler

parents 8e490320 78d80449
...@@ -16,25 +16,25 @@ For K40 laser cutter there are branches with the default config files ready to u ...@@ -16,25 +16,25 @@ For K40 laser cutter there are branches with the default config files ready to u
* [without cooler and flow sensor](https://git.nexlab.net/machinery/MarlinKimbra/tree/k40_noflow_nocooler) * [without cooler and flow sensor](https://git.nexlab.net/machinery/MarlinKimbra/tree/k40_noflow_nocooler)
Also, take care that lasers needs a larger serial buffer on arduino mega 2560 than the default 64 byte buffer, so Also, take care that lasers needs a larger serial buffer on arduino mega 2560 than the default 64 byte buffer, so
take a look at needed modification on the arduino ide from [Laser Documentation README](/Documentation/Laser/README.md) take a look at needed modification on the arduino ide from [Laser Documentation README](Documentation/Laser/README.md)
### Special thanks ### Special thanks
* all Marlin8bit-developers. * all Marlin8bit-developers.
--- ---
# MarlinKimbra 3D Printer Firmware # MarlinKimbra 3D Printer Firmware
* [Configuration & Compilation](/Documentation/Compilation.md) * [Configuration & Compilation](Documentation/Compilation.md)
* Supported * Supported
* [Features](/Documentation/Features.md) * [Features](Documentation/Features.md)
* [Hardware](/Documentation/Hardware.md) * [Hardware](Documentation/Hardware.md)
* [GCodes](/Documentation/GCodes.md) * [GCodes](Documentation/GCodes.md)
* Notes * Notes
* [Auto Bed Leveling](/Documentation/BedLeveling.md) * [Auto Bed Leveling](Documentation/BedLeveling.md)
* [Filament Sensor](/Documentation/FilamentSensor.md) * [Filament Sensor](Documentation/FilamentSensor.md)
* [Ramps Servo Power](/Documentation/RampsServoPower.md) * [Ramps Servo Power](Documentation/RampsServoPower.md)
* [LCD Language - Font - System](Documentation/LCDLanguageFont.md) * [LCD Language - Font - System](Documentation/LCDLanguageFont.md)
* Version * Version
* [Change Log](/Documentation/changelog.md) * [Change Log](Documentation/changelog.md)
## Configurator Tool Online ## Configurator Tool Online
...@@ -78,5 +78,5 @@ Laser features have been added by: ...@@ -78,5 +78,5 @@ Laser features have been added by:
## License ## License
Marlin is published under the [GPL license](/Documentation/COPYING.md) because I believe in open development. Marlin is published under the [GPL license](Documentation/COPYING.md) because I believe in open development.
Please do not use this code in products (3D printers, CNC etc) that are closed source or are crippled by a patent. Please do not use this code in products (3D printers, CNC etc) that are closed source or are crippled by a patent.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment