j/Marlin-1.1.9
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correction version firmware PD1

Browse Source
This commit is contained in:
Jonathan Roth 2024-12-02 14:57:09 +01:00
parent b0d842da5e
commit aa67771948
10 changed files with 168 additions and 1678 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1720
trunk/PD1/Marlin/Configuration.h
View File

File diff suppressed because it is too large Load Diff

4
trunk/PD1/Marlin/Configuration_adv.h
View File

@ -134,7 +134,7 @@
#endif #endif
// Show extra position information in M114 // Show extra position information in M114
#define M114_DETAIL //#define M114_DETAIL
// Show Temperature ADC value // Show Temperature ADC value
// Enable for M105 to include ADC values read from temperature sensors. // Enable for M105 to include ADC values read from temperature sensors.
@ -238,7 +238,7 @@
* the fan will turn on when any selected extruder is above the threshold. * the fan will turn on when any selected extruder is above the threshold.
*/ */
#define E0_AUTO_FAN_PIN FAN1_PIN #define E0_AUTO_FAN_PIN FAN1_PIN
#define E1_AUTO_FAN_PIN FAN1_PIN #define E1_AUTO_FAN_PIN -1
#define E2_AUTO_FAN_PIN -1 #define E2_AUTO_FAN_PIN -1
#define E3_AUTO_FAN_PIN -1 #define E3_AUTO_FAN_PIN -1
#define E4_AUTO_FAN_PIN -1 #define E4_AUTO_FAN_PIN -1

2
trunk/PD1/Marlin/boards.h
View File

@ -79,7 +79,6 @@
#define BOARD_TRIGORILLA_13 343 // TriGorilla Anycubic version 1.3 based on RAMPS EFB #define BOARD_TRIGORILLA_13 343 // TriGorilla Anycubic version 1.3 based on RAMPS EFB
#define BOARD_TRIGORILLA_14 443 // TriGorilla Anycubic version 1.4 based on RAMPS EFB #define BOARD_TRIGORILLA_14 443 // TriGorilla Anycubic version 1.4 based on RAMPS EFB
#define BOARD_RAMPS_ENDER_4 243 // Creality: Ender-4, CR-8 #define BOARD_RAMPS_ENDER_4 243 // Creality: Ender-4, CR-8
#define BOARD_MKT_1 461 // Alchimies MKT v1
// //
// Other ATmega1280, ATmega2560 // Other ATmega1280, ATmega2560
@ -106,6 +105,7 @@
#define BOARD_GT2560_REV_A 74 // Geeetech GT2560 Rev. A #define BOARD_GT2560_REV_A 74 // Geeetech GT2560 Rev. A
#define BOARD_GT2560_REV_A_PLUS 75 // Geeetech GT2560 Rev. A+ (with auto level probe) #define BOARD_GT2560_REV_A_PLUS 75 // Geeetech GT2560 Rev. A+ (with auto level probe)
#define BOARD_ALCHIMIES_PD1 463
// //
// ATmega1281, ATmega2561 // ATmega1281, ATmega2561
// //

5
trunk/PD1/Marlin/pins.h
View File

@ -140,8 +140,6 @@
#include "pins_TRIGORILLA_14.h" // ATmega2560 env:megaatmega2560 #include "pins_TRIGORILLA_14.h" // ATmega2560 env:megaatmega2560
#elif MB(RAMPS_ENDER_4) #elif MB(RAMPS_ENDER_4)
#include "pins_RAMPS_ENDER_4.h" // ATmega2560 env:megaatmega2560 #include "pins_RAMPS_ENDER_4.h" // ATmega2560 env:megaatmega2560
#elif MB(MKT_1)
#include "pins_MKT_1.h" // ATmega2560 env:megaatmega2560
// //
// Other ATmega1280, ATmega2560 // Other ATmega1280, ATmega2560
@ -266,6 +264,9 @@
#elif MB(5DPRINT) #elif MB(5DPRINT)
#include "pins_5DPRINT.h" // AT90USB1286 ?env:at90USB1286_DFU #include "pins_5DPRINT.h" // AT90USB1286 ?env:at90USB1286_DFU
#elif MB(ALCHIMIES_PD1)
#include "pins_ALCHIMIES_PD1.h"
#else #else
#error "Unknown MOTHERBOARD value set in Configuration.h" #error "Unknown MOTHERBOARD value set in Configuration.h"
#endif #endif

65
trunk/PD1/Marlin/pins_MKT_1.h → trunk/PD1/Marlin/pins_ALCHIMIES_PD1.h
View File

@ -21,64 +21,59 @@
*/ */
/** /**
* Alchimies MKT v1 pin assignment * MegaTronics v3.0 / v3.1 pin assignments
*/ */
#ifndef __AVR_ATmega2560__ #ifndef __AVR_ATmega2560__
#error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu." #error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu."
#endif #endif
#define BOARD_NAME "Alchimies MKT v1" #define BOARD_NAME "Alchimies PD1"
// // Dx = Ax + 54
// Limit Switches #define X_MIN_PIN 69
// #define Y_MAX_PIN 67
#define X_MIN_PIN 37
#define X_MAX_PIN -1
#define Y_MIN_PIN 41
#define Y_MAX_PIN -1
#define Z_MIN_PIN -1
#define Z_MAX_PIN 68 #define Z_MAX_PIN 68
//
// Steppers
// #define X_MS1_PIN 27
#define X_MS2_PIN 26
#define X_MS3_PIN 25
#define Y_MS1_PIN 49
#define Y_MS2_PIN 46
#define Y_MS3_PIN 47
#define Z_MS1_PIN 34
#define Z_MS2_PIN 33
#define Z_MS3_PIN 32
#define E0_MS1_PIN 40
#define E0_MS2_PIN 41
#define E0_MS3_PIN 38
#define X_STEP_PIN 23 #define X_STEP_PIN 23
#define X_DIR_PIN 22 #define X_DIR_PIN 22
#define X_ENABLE_PIN 28 #define X_ENABLE_PIN 28
#define X_MS1_PIN 27
#define X_MS2_PIN 26
#define X_MS3_PIN 25
#define Y_STEP_PIN 44
#define Y_DIR_PIN 42
#define Y_ENABLE_PIN 48
#define Y_MS1_PIN 49
#define Y_MS2_PIN 46
#define Y_MS3_PIN 47
#define Z_STEP_PIN 30 #define Z_STEP_PIN 30
#define Z_DIR_PIN 29 #define Z_DIR_PIN 29
#define Z_ENABLE_PIN 35 #define Z_ENABLE_PIN 35
#define Z_MS1_PIN 34
#define Z_MS2_PIN 33
#define Z_MS3_PIN 32
#define E0_STEP_PIN 39 #define E0_STEP_PIN 39
#define E0_DIR_PIN 37 #define E0_DIR_PIN 37
#define E0_ENABLE_PIN 43 #define E0_ENABLE_PIN 43
#define E0_MS1_PIN 40
#define E0_MS2_PIN 41
#define E0_MS3_PIN 38
// #define Y_STEP_PIN 44
// Temperature Sensors #define Y_DIR_PIN 42
// #define Y_ENABLE_PIN 48
#define TEMP_0_PIN 8 // Analog Input #define TEMP_0_PIN 8 // Analog Input
//
// Heaters / Fans
//
#define HEATER_0_PIN 16 #define HEATER_0_PIN 16
#define FAN_PIN 18 #define FAN_PIN 18

2
trunk/PD1/Marlin/pins_MEGATRONICS_3.h
View File

@ -128,7 +128,7 @@
// //
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13
#define PS_ON_PIN 22 //12 #define PS_ON_PIN 12
#define CASE_LIGHT_PIN 45 // Try the keypad connector #define CASE_LIGHT_PIN 45 // Try the keypad connector
// //

10
trunk/PD1/Marlin/temperature.cpp
View File

@ -373,22 +373,22 @@ uint8_t Temperature::soft_pwm_amount[HOTENDS];
SERIAL_PROTOCOLPAIR(MSG_KP, workKp); SERIAL_PROTOCOLPAIR(MSG_KP, workKp);
SERIAL_PROTOCOLPAIR(MSG_KI, workKi); SERIAL_PROTOCOLPAIR(MSG_KI, workKi);
SERIAL_PROTOCOLLNPAIR(MSG_KD, workKd); SERIAL_PROTOCOLLNPAIR(MSG_KD, workKd);
/** //*
workKp = 0.33*Ku; workKp = 0.33*Ku;
workKi = workKp/Tu; workKi = workKp/Tu;
workKd = workKp*Tu/3; workKd = workKp*Tu/3;
SERIAL_PROTOCOLLNPGM(" Some overshoot"); SERIAL_PROTOCOLLNPGM(" Some overshoot");
SERIAL_PROTOCOLPAIR(" Kp: ", workKp); SERIAL_PROTOCOLPAIR(" Kp: ", workKp);
SERIAL_PROTOCOLPAIR(" Ki: ", workKi); SERIAL_PROTOCOLPAIR(" Ki: ", workKi);
SERIAL_PROTOCOLPAIR(" Kd: ", workKd); SERIAL_PROTOCOLLNPAIR(" Kd: ", workKd);
workKp = 0.2*Ku; workKp = 0.2*Ku;
workKi = 2*workKp/Tu; workKi = 2*workKp/Tu;
workKd = workKp*Tu/3; workKd = workKp*Tu/3;
SERIAL_PROTOCOLLNPGM(" No overshoot"); SERIAL_PROTOCOLLNPGM(" No overshoot");
SERIAL_PROTOCOLPAIR(" Kp: ", workKp); SERIAL_PROTOCOLPAIR(" Kp: ", workKp);
SERIAL_PROTOCOLPAIR(" Ki: ", workKi); SERIAL_PROTOCOLPAIR(" Ki: ", workKi);
SERIAL_PROTOCOLPAIR(" Kd: ", workKd); SERIAL_PROTOCOLLNPAIR(" Kd: ", workKd);
*/ //*/
} }
} }
SHV(soft_pwm_amount, (bias + d) >> 1, (bias + d) >> 1); SHV(soft_pwm_amount, (bias + d) >> 1, (bias + d) >> 1);
@ -400,7 +400,7 @@ uint8_t Temperature::soft_pwm_amount[HOTENDS];
// Did the temperature overshoot very far? // Did the temperature overshoot very far?
#ifndef MAX_OVERSHOOT_PID_AUTOTUNE #ifndef MAX_OVERSHOOT_PID_AUTOTUNE
#define MAX_OVERSHOOT_PID_AUTOTUNE 20 #define MAX_OVERSHOOT_PID_AUTOTUNE 50
#endif #endif
if (current > target + MAX_OVERSHOOT_PID_AUTOTUNE) { if (current > target + MAX_OVERSHOOT_PID_AUTOTUNE) {
SERIAL_PROTOCOLLNPGM(MSG_PID_TEMP_TOO_HIGH); SERIAL_PROTOCOLLNPGM(MSG_PID_TEMP_TOO_HIGH);

2
trunk/PD1/Marlin/thermistornames.h
View File

@ -85,6 +85,8 @@
#define THERMISTOR_NAME "PT100 4K7" #define THERMISTOR_NAME "PT100 4K7"
#elif THERMISTOR_ID == 110 #elif THERMISTOR_ID == 110
#define THERMISTOR_NAME "PT100 1K" #define THERMISTOR_NAME "PT100 1K"
#elif THERMISTOR_ID == 112
#define THERMISTOR_NAME "Alchimies b3950 100k (JR table)"
// High Temperature thermistors // High Temperature thermistors
#elif THERMISTOR_ID == 66 #elif THERMISTOR_ID == 66

34
trunk/PD1/Marlin/thermistortable_112.h
View File

@ -21,21 +21,21 @@
*/ */
const short temptable_112[][2] PROGMEM = { const short temptable_112[][2] PROGMEM = {
{ OV( 22 ), 283 }, { OV( 22 ) , 283 },
{ OV( 40 ), 257 }, { OV( 40 ) , 257 },
{ OV( 47 ), 241 }, { OV( 47 ) , 241 },
{ OV( 56 ), 233 }, { OV( 56 ) , 233 },
{ OV( 66 ), 225 }, { OV( 66 ) , 225 },
{ OV( 95 ), 208 }, { OV( 95 ) , 208 },
{ OV( 112 ), 198 }, { OV( 112 ) , 198 },
{ OV( 135 ), 188 }, { OV( 135 ) , 188 },
{ OV( 163 ), 178 }, { OV( 163 ) , 178 },
{ OV( 197 ), 167 }, { OV( 197 ) , 167 },
{ OV( 280 ), 148 }, { OV( 280 ) , 148 },
{ OV( 602 ), 102 }, { OV( 602 ) , 102 },
{ OV( 905 ), 56 }, { OV( 905 ) , 56 },
{ OV( 986 ), 28 }, { OV( 986 ) , 28 },
{ OV( 1009 ), 10 }, { OV( 1009 ) , 10 },
{ OV( 1020 ), -14 }, { OV( 1020 ) , -14 },
{ OV( 1021 ), -17 } { OV( 1021 ) , -17 }
}; };

2
trunk/PD1/Marlin/thermistortables.h
View File

@ -116,7 +116,7 @@
#if ANY_THERMISTOR_IS(110) // Pt100 with 1k0 pullup #if ANY_THERMISTOR_IS(110) // Pt100 with 1k0 pullup
#include "thermistortable_110.h" #include "thermistortable_110.h"
#endif #endif
#if ANY_THERMISTOR_IS(112) #if ANY_THERMISTOR_IS(112) // Alchimies b3950 100k, 4k7 pullup
#include "thermistortable_112.h" #include "thermistortable_112.h"
#endif #endif
#if ANY_THERMISTOR_IS(147) // Pt100 with 4k7 pullup #if ANY_THERMISTOR_IS(147) // Pt100 with 4k7 pullup