Skip to content

Commit

Permalink
Cheetah 5.0 update to v1.3.4, marlin 2.0.5
Browse files Browse the repository at this point in the history 
Cheetah 5.0 updated to Marlin 2.0.5.1
  • Loading branch information
@KAY3D
KAY3D committed Mar 28, 2020
1 parent 201dded commit bdd3b36
Show file tree
Hide file tree
Showing 1,503 changed files with 13,288 additions and 9,924 deletions.
Empty file modified LICENSE
100644 → 100755
View file
Empty file.
224 changes: 126 additions & 98 deletions Marlin/Configuration.h
View file

Large diffs are not rendered by default.

316 changes: 173 additions & 143 deletions Marlin/Configuration_adv.h
View file

Large diffs are not rendered by default.

85 changes: 45 additions & 40 deletions Marlin/Makefile
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,88 +180,93 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1105)
else ifeq ($(HARDWARE_MOTHERBOARD),1106)
# MKS v1.5 with Allegro A4982 stepper drivers
else ifeq ($(HARDWARE_MOTHERBOARD),1107)
# MKS BASE 1.0 with Heroic HR4982 stepper drivers
# MKS v1.6 with Allegro A4982 stepper drivers
else ifeq ($(HARDWARE_MOTHERBOARD),1108)
# MKS GEN v1.3 or 1.4

# MKS BASE 1.0 with Heroic HR4982 stepper drivers
else ifeq ($(HARDWARE_MOTHERBOARD),1109)
# MKS GEN L
# MKS GEN v1.3 or 1.4
else ifeq ($(HARDWARE_MOTHERBOARD),1110)
# zrib V2.0 control board (Chinese knock off RAMPS replica)
# MKS GEN L
else ifeq ($(HARDWARE_MOTHERBOARD),1111)
# BigTreeTech or BIQU KFB2.0
# zrib V2.0 control board (Chinese knock off RAMPS replica)
else ifeq ($(HARDWARE_MOTHERBOARD),1112)
# Felix 2.0+ Electronics Board (RAMPS like)
# BigTreeTech or BIQU KFB2.0
else ifeq ($(HARDWARE_MOTHERBOARD),1113)
# Invent-A-Part RigidBoard
# Felix 2.0+ Electronics Board (RAMPS like)
else ifeq ($(HARDWARE_MOTHERBOARD),1114)
# Invent-A-Part RigidBoard V2
# Invent-A-Part RigidBoard
else ifeq ($(HARDWARE_MOTHERBOARD),1115)
# Sainsmart 2-in-1 board
# Invent-A-Part RigidBoard V2
else ifeq ($(HARDWARE_MOTHERBOARD),1116)
# Ultimaker
# Sainsmart 2-in-1 board
else ifeq ($(HARDWARE_MOTHERBOARD),1117)
# Ultimaker (Older electronics. Pre 1.5.4. This is rare)
# Ultimaker
else ifeq ($(HARDWARE_MOTHERBOARD),1118)
# Ultimaker (Older electronics. Pre 1.5.4. This is rare)
else ifeq ($(HARDWARE_MOTHERBOARD),1119)
MCU ?= atmega1280

# Azteeg X3
else ifeq ($(HARDWARE_MOTHERBOARD),1119)
# Azteeg X3 Pro
else ifeq ($(HARDWARE_MOTHERBOARD),1120)
# Ultimainboard 2.x (Uses TEMP_SENSOR 20)
# Azteeg X3 Pro
else ifeq ($(HARDWARE_MOTHERBOARD),1121)
# Rumba
# Ultimainboard 2.x (Uses TEMP_SENSOR 20)
else ifeq ($(HARDWARE_MOTHERBOARD),1122)
# Raise3D Rumba
# Rumba
else ifeq ($(HARDWARE_MOTHERBOARD),1123)
# Rapide Lite RL200 Rumba
# Raise3D Rumba
else ifeq ($(HARDWARE_MOTHERBOARD),1124)
# Formbot T-Rex 2 Plus
# Rapide Lite RL200 Rumba
else ifeq ($(HARDWARE_MOTHERBOARD),1125)
# Formbot T-Rex 3
# Formbot T-Rex 2 Plus
else ifeq ($(HARDWARE_MOTHERBOARD),1126)
# Formbot Raptor
# Formbot T-Rex 3
else ifeq ($(HARDWARE_MOTHERBOARD),1127)
# Formbot Raptor 2
# Formbot Raptor
else ifeq ($(HARDWARE_MOTHERBOARD),1128)
# bq ZUM Mega 3D
# Formbot Raptor 2
else ifeq ($(HARDWARE_MOTHERBOARD),1129)
# MakeBoard Mini v2.1.2 is a control board sold by MicroMake
# bq ZUM Mega 3D
else ifeq ($(HARDWARE_MOTHERBOARD),1130)
# TriGorilla Anycubic version 1.3 based on RAMPS EFB
# MakeBoard Mini v2.1.2 is a control board sold by MicroMake
else ifeq ($(HARDWARE_MOTHERBOARD),1131)
# TriGorilla Anycubic version 1.4 based on RAMPS EFB
# TriGorilla Anycubic version 1.3 based on RAMPS EFB
else ifeq ($(HARDWARE_MOTHERBOARD),1132)
# TriGorilla Anycubic version 1.4 Rev 1.1
# TriGorilla Anycubic version 1.4 based on RAMPS EFB
else ifeq ($(HARDWARE_MOTHERBOARD),1133)
# Creality: Ender-4, CR-8
# TriGorilla Anycubic version 1.4 Rev 1.1
else ifeq ($(HARDWARE_MOTHERBOARD),1134)
# Creality: CR10S, CR20, CR-X
# Creality: Ender-4, CR-8
else ifeq ($(HARDWARE_MOTHERBOARD),1135)
# Dagoma F5
# Creality: CR10S, CR20, CR-X
else ifeq ($(HARDWARE_MOTHERBOARD),1136)
# FYSETC F6
# Dagoma F5
else ifeq ($(HARDWARE_MOTHERBOARD),1137)
# Duplicator i3 Plus
# FYSETC F6 1.3
else ifeq ($(HARDWARE_MOTHERBOARD),1138)
# VORON
# FYSETC F6 1.5
else ifeq ($(HARDWARE_MOTHERBOARD),1139)
# TRONXY V3 1.0
# Duplicator i3 Plus
else ifeq ($(HARDWARE_MOTHERBOARD),1140)
# Z-Bolt X Series
# VORON
else ifeq ($(HARDWARE_MOTHERBOARD),1141)
# TT OSCAR
# TRONXY V3 1.0
else ifeq ($(HARDWARE_MOTHERBOARD),1142)
# Overlord/Overlord Pro
# Z-Bolt X Series
else ifeq ($(HARDWARE_MOTHERBOARD),1143)
# ADIMLab Gantry v1
# TT OSCAR
else ifeq ($(HARDWARE_MOTHERBOARD),1144)
# ADIMLab Gantry v2
# Overlord/Overlord Pro
else ifeq ($(HARDWARE_MOTHERBOARD),1145)
# BIQU Tango V1
# ADIMLab Gantry v1
else ifeq ($(HARDWARE_MOTHERBOARD),1146)
# MKS GEN L V2
# ADIMLab Gantry v2
else ifeq ($(HARDWARE_MOTHERBOARD),1147)
# BIQU Tango V1
else ifeq ($(HARDWARE_MOTHERBOARD),1148)
# MKS GEN L V2
else ifeq ($(HARDWARE_MOTHERBOARD),1149)

#
# RAMBo and derivatives
Expand Down
Empty file modified Marlin/Marlin.ino
100644 → 100755
View file
Empty file.
4 changes: 2 additions & 2 deletions Marlin/Version.h
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
Expand Down Expand Up @@ -28,7 +28,7 @@
/**
* Marlin release version identifier
*/
//#define SHORT_BUILD_VERSION "2.0.3"
//#define SHORT_BUILD_VERSION "2.0.5"

/**
* Verbose version identifier which should contain a reference to the location
Expand Down
17 changes: 8 additions & 9 deletions Marlin/board_def.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
#endif

#if ENABLED(BTTSKR1_3)
#define processor_name LPC1768 //use this value in platform.ino. Serach for 'change_value' and replace it with this value LPC1768
#define motherboard_name BOARD_BIGTREE_SKR_V1_3
#define motherboard_name BOARD_BTT_SKR_V1_3
#define SERIAL_PORT 0
#define SERIAL_PORT_2 -1
#define BAUDRATE 115200
Expand All @@ -35,36 +34,36 @@
#endif

#if ENABLED(BTTSKR1_4)
#define motherboard_name BOARD_BIGTREE_SKR_V1_4
#define motherboard_name BOARD_BTT_SKR_V1_4
#define SERIAL_PORT -1
#define SERIAL_PORT_2 0
#define BAUDRATE 115200
#endif


#if ENABLED(BTTSKRV1_4TURBO)
#define motherboard_name BOARD_BIGTREE_SKR_V1_4_TURBO
#define motherboard_name BOARD_BTT_SKR_V1_4_TURBO
#define SERIAL_PORT 0
#define SERIAL_PORT_2 -1
#define BAUDRATE 115200
#endif

#if ENABLED(BTTSKRE3DIPV1_0)
#define motherboard_name BOARD_BIGTREE_SKR_E3_DIP
#define motherboard_name BOARD_BTT_SKR_E3_DIP
#define SERIAL_PORT -1 //2
#define SERIAL_PORT_2 2 //-1
#define BAUDRATE 115200
#endif

#if ENABLED(BTTSKRE3DIPV1_1)
#define motherboard_name BOARD_BIGTREE_SKR_E3_DIP
#define motherboard_name BOARD_BTT_SKR_E3_DIP
#define SERIAL_PORT -1 //2
#define SERIAL_PORT_2 2 //-1
#define BAUDRATE 115200
#endif

#if ENABLED(BTTSKRPROV1_1)
#define motherboard_name BOARD_BIGTREE_SKR_PRO_V1_1
#define motherboard_name BOARD_BTT_SKR_PRO_V1_1
#define SERIAL_PORT 6
#define SERIAL_PORT_2 1
#define BAUDRATE 115200
Expand Down Expand Up @@ -94,8 +93,8 @@


#if ENABLED(BTTSKRNPRO1_1)
#define motherboard_name BOARD_BIGTREE_SKR_V1_1
#define SERIAL_PORT 1
#define motherboard_name BOARD_BTT_SKR_V1_1
#define SERIAL_PORT 0 //changed from 1
#define SERIAL_PORT_2 -1
#define BAUDRATE 115200
#endif
Expand Down
4 changes: 4 additions & 0 deletions Marlin/hotext_def.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@
#define e__steps 93
#endif

#if ENABLED (Ender_regular_metal)
#define e__steps 97.3
#endif

#if ENABLED (Ender_metaldualdrive)
#define e__steps 140
#endif
Expand Down
Empty file modified Marlin/lib/readme.txt
100644 → 100755
View file
Empty file.
2 changes: 1 addition & 1 deletion Marlin/printer_def.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@
#define CHOPPER_TIMING CHOPPER_DEFAULT_24V
#define x_steps 80
#define y_steps 80
#define z_steps 1200
#define z_steps 400
#define X_HOME_DIR -1 //This defines the homing direction. Change between values of 1 and -1 to change direction
#define Y_HOME_DIR 1 //This defines the homing direction. Change between values of 1 and -1 to change direction
#define Z_HOME_DIR -1 //This defines the homing direction. Change between values of 1 and -1 to change direction
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HAL_AVR/HAL.cpp → Marlin/src/HAL/AVR/HAL.cpp
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/HAL/HAL_AVR/HAL.h → Marlin/src/HAL/AVR/HAL.h
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins [email protected]
*
* This program is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -53,8 +53,8 @@
//#define analogInputToDigitalPin(IO) IO

#ifndef CRITICAL_SECTION_START
#define CRITICAL_SECTION_START unsigned char _sreg = SREG; cli()
#define CRITICAL_SECTION_END SREG = _sreg
#define CRITICAL_SECTION_START() unsigned char _sreg = SREG; cli()
#define CRITICAL_SECTION_END() SREG = _sreg
#endif
#define ISRS_ENABLED() TEST(SREG, SREG_I)
#define ENABLE_ISRS() sei()
Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/HAL/HAL_AVR/HAL_SPI.cpp → Marlin/src/HAL/AVR/HAL_SPI.cpp
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
Expand Down Expand Up @@ -197,7 +197,7 @@ void spiBegin() {
// output pin high - like sending 0xFF
WRITE(MOSI_PIN, HIGH);

for (uint8_t i = 0; i < 8; i++) {
LOOP_L_N(i, 8) {
WRITE(SCK_PIN, HIGH);

nop; // adjust so SCK is nice
Expand All @@ -224,7 +224,7 @@ void spiBegin() {
void spiSend(uint8_t data) {
// no interrupts during byte send - about 8µs
cli();
for (uint8_t i = 0; i < 8; i++) {
LOOP_L_N(i, 8) {
WRITE(SCK_PIN, LOW);
WRITE(MOSI_PIN, data & 0x80);
data <<= 1;
Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp → Marlin/src/HAL/AVR/MarlinSerial.cpp
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
Expand Down Expand Up @@ -55,7 +55,7 @@
// A SW memory barrier, to ensure GCC does not overoptimize loops
#define sw_barrier() asm volatile("": : :"memory");

#include "../../feature/emergency_parser.h"
#include "../../feature/e_parser.h"

// "Atomically" read the RX head index value without disabling interrupts:
// This MUST be called with RX interrupts enabled, and CAN'T be called
Expand Down Expand Up @@ -682,7 +682,7 @@

// Round correctly so that print(1.999, 2) prints as "2.00"
double rounding = 0.5;
for (uint8_t i = 0; i < digits; ++i) rounding *= 0.1;
LOOP_L_N(i, digits) rounding *= 0.1;
number += rounding;

// Extract the integer part of the number and print it
Expand Down
20 changes: 10 additions & 10 deletions Marlin/src/HAL/HAL_AVR/MarlinSerial.h → Marlin/src/HAL/AVR/MarlinSerial.h
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
Expand Down Expand Up @@ -31,10 +31,10 @@
* Templatized 01 October 2018 by Eduardo José Tagle to allow multiple instances
*/

#include "../shared/MarlinSerial.h"

#include <WString.h>

#include "../../inc/MarlinConfigPre.h"

#ifndef SERIAL_PORT
#define SERIAL_PORT 0
#endif
Expand Down Expand Up @@ -261,12 +261,12 @@
static constexpr int PORT = serial;
static constexpr unsigned int RX_SIZE = RX_BUFFER_SIZE;
static constexpr unsigned int TX_SIZE = TX_BUFFER_SIZE;
static constexpr bool XONOFF = bSERIAL_XON_XOFF;
static constexpr bool EMERGENCYPARSER = bEMERGENCY_PARSER;
static constexpr bool DROPPED_RX = bSERIAL_STATS_DROPPED_RX;
static constexpr bool RX_OVERRUNS = bSERIAL_STATS_RX_BUFFER_OVERRUNS;
static constexpr bool RX_FRAMING_ERRORS = bSERIAL_STATS_RX_FRAMING_ERRORS;
static constexpr bool MAX_RX_QUEUED = bSERIAL_STATS_MAX_RX_QUEUED;
static constexpr bool XONOFF = ENABLED(SERIAL_XON_XOFF);
static constexpr bool EMERGENCYPARSER = ENABLED(EMERGENCY_PARSER);
static constexpr bool DROPPED_RX = ENABLED(SERIAL_STATS_DROPPED_RX);
static constexpr bool RX_OVERRUNS = ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS);
static constexpr bool RX_FRAMING_ERRORS = ENABLED(SERIAL_STATS_RX_FRAMING_ERRORS);
static constexpr bool MAX_RX_QUEUED = ENABLED(SERIAL_STATS_MAX_RX_QUEUED);
};
extern MarlinSerial<MarlinSerialCfg<SERIAL_PORT>> customizedSerial1;

Expand Down Expand Up @@ -304,7 +304,7 @@
static constexpr bool XONOFF = false;
static constexpr bool EMERGENCYPARSER = false;
static constexpr bool DROPPED_RX = false;
static constexpr bool RX_OVERRUNS = bDGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS;
static constexpr bool RX_OVERRUNS = HAS_DGUS_LCD && ENABLED(DGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS);
static constexpr bool RX_FRAMING_ERRORS = false;
static constexpr bool MAX_RX_QUEUED = false;
};
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HAL_AVR/Servo.cpp → Marlin/src/HAL/AVR/Servo.cpp
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HAL_AVR/ServoTimers.h → Marlin/src/HAL/AVR/ServoTimers.h
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HAL_AVR/endstop_interrupts.h → Marlin/src/HAL/AVR/endstop_interrupts.h
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
Expand Down
Loading

0 comments on commit bdd3b36

Please sign in to comment.