瀏覽代碼

Rename, adjust Dagoma F5 (#19947)

Orel 4 年之前
父節點
當前提交
a272c019f9
No account linked to committer's email address

+ 1
- 1
Marlin/src/core/boards.h 查看文件

@@ -92,7 +92,7 @@
92 92
 #define BOARD_TRIGORILLA_14_11        1136  //   ... Rev 1.1 (new servo pin order)
93 93
 #define BOARD_RAMPS_ENDER_4           1137  // Creality: Ender-4, CR-8
94 94
 #define BOARD_RAMPS_CREALITY          1138  // Creality: CR10S, CR20, CR-X
95
-#define BOARD_RAMPS_DAGOMA            1139  // Dagoma F5
95
+#define BOARD_DAGOMA_F5               1139  // Dagoma F5
96 96
 #define BOARD_FYSETC_F6_13            1140  // FYSETC F6 1.3
97 97
 #define BOARD_FYSETC_F6_14            1141  // FYSETC F6 1.4
98 98
 #define BOARD_DUPLICATOR_I3_PLUS      1142  // Wanhao Duplicator i3 Plus

+ 78
- 0
Marlin/src/module/thermistor/thermistor_17.h 查看文件

@@ -0,0 +1,78 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ *
5
+ * Based on Sprinter and grbl.
6
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7
+ *
8
+ * This program is free software: you can redistribute it and/or modify
9
+ * it under the terms of the GNU General Public License as published by
10
+ * the Free Software Foundation, either version 3 of the License, or
11
+ * (at your option) any later version.
12
+ *
13
+ * This program is distributed in the hope that it will be useful,
14
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
+ * GNU General Public License for more details.
17
+ *
18
+ * You should have received a copy of the GNU General Public License
19
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+#pragma once
23
+
24
+// Dagoma NTC 100k white thermistor
25
+const temp_entry_t temptable_17[] PROGMEM = {
26
+  { OV(  16),  309 },
27
+  { OV(  18),  307 },
28
+  { OV(  20),  300 },
29
+  { OV(  22),  293 },
30
+  { OV(  26),  284 },
31
+  { OV(  29),  272 },
32
+  { OV(  33),  266 },
33
+  { OV(  36),  260 },
34
+  { OV(  42),  252 },
35
+  { OV(  46),  247 },
36
+  { OV(  48),  244 },
37
+  { OV(  51),  241 },
38
+  { OV(  62),  231 },
39
+  { OV(  73),  222 },
40
+  { OV(  78),  219 },
41
+  { OV(  87),  212 },
42
+  { OV(  98),  207 },
43
+  { OV( 109),  201 },
44
+  { OV( 118),  197 },
45
+  { OV( 131),  191 },
46
+  { OV( 145),  186 },
47
+  { OV( 160),  181 },
48
+  { OV( 177),  175 },
49
+  { OV( 203),  169 },
50
+  { OV( 222),  164 },
51
+  { OV( 256),  156 },
52
+  { OV( 283),  151 },
53
+  { OV( 312),  145 },
54
+  { OV( 343),  140 },
55
+  { OV( 377),  131 },
56
+  { OV( 413),  125 },
57
+  { OV( 454),  119 },
58
+  { OV( 496),  113 },
59
+  { OV( 537),  108 },
60
+  { OV( 578),  102 },
61
+  { OV( 619),   97 },
62
+  { OV( 658),   92 },
63
+  { OV( 695),   87 },
64
+  { OV( 735),   81 },
65
+  { OV( 773),   75 },
66
+  { OV( 808),   70 },
67
+  { OV( 844),   64 },
68
+  { OV( 868),   59 },
69
+  { OV( 892),   54 },
70
+  { OV( 914),   49 },
71
+  { OV( 935),   42 },
72
+  { OV( 951),   38 },
73
+  { OV( 967),   32 },
74
+  { OV( 975),   28 },
75
+  { OV(1000),   20 },
76
+  { OV(1010),   10 },
77
+  { OV(1024), -273 } // for safety
78
+};

+ 3
- 0
Marlin/src/module/thermistor/thermistors.h 查看文件

@@ -105,6 +105,9 @@ typedef struct { int16_t value, celsius; } temp_entry_t;
105 105
 #if ANY_THERMISTOR_IS(15) // JGAurora A5 thermistor calibration
106 106
   #include "thermistor_15.h"
107 107
 #endif
108
+#if ANY_THERMISTOR_IS(17) // Dagoma NTC 100k white thermistor
109
+  #include "thermistor_17.h"
110
+#endif
108 111
 #if ANY_THERMISTOR_IS(18) // ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327
109 112
   #include "thermistor_18.h"
110 113
 #endif

+ 6
- 2
Marlin/src/pins/pins.h 查看文件

@@ -179,8 +179,8 @@
179 179
   #include "ramps/pins_RAMPS_ENDER_4.h"         // ATmega2560                             env:mega2560
180 180
 #elif MB(RAMPS_CREALITY)
181 181
   #include "ramps/pins_RAMPS_CREALITY.h"        // ATmega2560                             env:mega2560
182
-#elif MB(RAMPS_DAGOMA)
183
-  #include "ramps/pins_RAMPS_DAGOMA.h"          // ATmega2560                             env:mega2560
182
+#elif MB(DAGOMA_F5)
183
+  #include "ramps/pins_DAGOMA_F5.h"             // ATmega2560                             env:mega2560
184 184
 #elif MB(FYSETC_F6_13)
185 185
   #include "ramps/pins_FYSETC_F6_13.h"          // ATmega2560                             env:FYSETC_F6_13
186 186
 #elif MB(FYSETC_F6_14)
@@ -713,6 +713,7 @@
713 713
   #define BOARD_BIGTREE_SKR_E3_DIP      -1017
714 714
   #define BOARD_RUMBA32                 -1018
715 715
   #define BOARD_RUMBA32_AUS3D           -1019
716
+  #define BOARD_RAMPS_DAGOMA            -1020
716 717
 
717 718
   #if MB(MKS_13)
718 719
     #error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration."
@@ -756,6 +757,8 @@
756 757
     #error "BOARD_RUMBA32 is now BOARD_RUMBA32_MKS or BOARD_RUMBA32_V1_0. Please update your configuration."
757 758
   #elif MB(RUMBA32_AUS3D)
758 759
     #error "BOARD_RUMBA32_AUS3D is now BOARD_RUMBA32_V1_0. Please update your configuration."
760
+  #elif MB(RAMPS_DAGOMA)
761
+    #error "BOARD_RAMPS_DAGOMA is now BOARD_DAGOMA_F5. Please update your configuration."
759 762
   #else
760 763
     #error "Unknown MOTHERBOARD value set in Configuration.h"
761 764
   #endif
@@ -780,6 +783,7 @@
780 783
   #undef BOARD_BIGTREE_SKR_E3_DIP
781 784
   #undef BOARD_RUMBA32
782 785
   #undef BOARD_RUMBA32_AUS3D
786
+  #undef BOARD_RAMPS_DAGOMA
783 787
 
784 788
 #endif
785 789
 

Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h → Marlin/src/pins/ramps/pins_DAGOMA_F5.h 查看文件

@@ -22,21 +22,47 @@
22 22
 #pragma once
23 23
 
24 24
 #if HOTENDS > 2 || E_STEPPERS > 2
25
-  #error "Dagoma3D F5 RAMPS supports only 2 hotends / E-steppers. Comment out this line to continue."
25
+  #error "Dagoma3D F5 supports only 2 hotends / E-steppers. Comment out this line to continue."
26 26
 #endif
27 27
 
28
-#define BOARD_INFO_NAME "Dagoma3D F5 RAMPS"
28
+#define BOARD_INFO_NAME "Dagoma3D F5"
29 29
 
30
+//
31
+// Endstops
32
+//
30 33
 #define X_STOP_PIN                            2
31 34
 #define Y_STOP_PIN                            3
32 35
 #define Z_STOP_PIN                           15
36
+
33 37
 #define FIL_RUNOUT_PIN                       39
38
+#if EXTRUDERS > 1
39
+  #define FIL_RUNOUT2_PIN                    14
40
+#endif
34 41
 
35
-#ifndef E0_AUTO_FAN_PIN
36
-  #define E0_AUTO_FAN_PIN                     7
42
+//
43
+// LCD delays
44
+//
45
+#if HAS_MARLINUI_U8GLIB
46
+  #define BOARD_ST7920_DELAY_1 DELAY_NS(0)
47
+  #define BOARD_ST7920_DELAY_2 DELAY_NS(250)
48
+  #define BOARD_ST7920_DELAY_3 DELAY_NS(250)
37 49
 #endif
38 50
 
39 51
 //
40
-// Import RAMPS 1.4 pins
52
+// DAC steppers
53
+//
54
+#define HAS_MOTOR_CURRENT_DAC
55
+
56
+#define DAC_STEPPER_ORDER { 0, 1, 2, 3 }
57
+
58
+#define DAC_STEPPER_SENSE    0.11
59
+#define DAC_STEPPER_ADDRESS  0
60
+#define DAC_STEPPER_MAX      4096
61
+#define DAC_STEPPER_VREF     1
62
+#define DAC_STEPPER_GAIN     0
63
+#define DAC_OR_ADDRESS       0x00
64
+
65
+//
66
+// Import default RAMPS 1.4 pins
41 67
 //
42 68
 #include "pins_RAMPS.h"

Loading…
取消
儲存