Browse Source

Add support for upcoming Gen7 v1.4

V1.4 moves thermistor power to the always-on 5v line.
The BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE is no longer
needed on this board.  Add a new motherboard type to
support this feature.
Phil Hord 13 years ago
parent
commit
b65ef8d66c
2 changed files with 17 additions and 3 deletions
  1. 1
    0
      Marlin/Configuration.h
  2. 16
    3
      Marlin/pins.h

+ 1
- 0
Marlin/Configuration.h View File

19
 // Gen7 custom (Alfons3 Version) = 10 "https://github.com/Alfons3/Generation_7_Electronics"
19
 // Gen7 custom (Alfons3 Version) = 10 "https://github.com/Alfons3/Generation_7_Electronics"
20
 // Gen7 v1.1, v1.2 = 11
20
 // Gen7 v1.1, v1.2 = 11
21
 // Gen7 v1.3 = 12
21
 // Gen7 v1.3 = 12
22
+// Gen7 v1.4 = 13
22
 // MEGA/RAMPS up to 1.2 = 3
23
 // MEGA/RAMPS up to 1.2 = 3
23
 // RAMPS 1.3 = 33 (Power outputs: Extruder, Bed, Fan)
24
 // RAMPS 1.3 = 33 (Power outputs: Extruder, Bed, Fan)
24
 // RAMPS 1.3 = 34 (Power outputs: Extruder0, Extruder1, Bed)
25
 // RAMPS 1.3 = 34 (Power outputs: Extruder0, Extruder1, Bed)

+ 16
- 3
Marlin/pins.h View File

45
 #endif /* 99 */
45
 #endif /* 99 */
46
 
46
 
47
 /****************************************************************************************
47
 /****************************************************************************************
48
-* Gen7 v1.1, v1.2, v1.3 pin assignment
48
+* Gen7 v1.1, v1.2, v1.3, v1.4 pin assignment
49
 *
49
 *
50
 ****************************************************************************************/
50
 ****************************************************************************************/
51
 
51
 
52
+
53
+#if MOTHERBOARD == 13
54
+#define MOTHERBOARD 11
55
+#define GEN7_VERSION 14 // v1.4
56
+#endif
57
+
52
 #if MOTHERBOARD == 12
58
 #if MOTHERBOARD == 12
53
 #define MOTHERBOARD 11
59
 #define MOTHERBOARD 11
54
-#define GEN7_V_1_3
60
+#define GEN7_VERSION 13 // v1.3
55
 #endif
61
 #endif
56
 
62
 
57
 #if MOTHERBOARD == 11
63
 #if MOTHERBOARD == 11
62
 
68
 
63
 #endif
69
 #endif
64
 
70
 
71
+#ifndef GEN7_VERSION
72
+#define GEN7_VERSION 12 // v1.x
73
+#endif
74
+
65
 //x axis pins
75
 //x axis pins
66
 #define X_STEP_PIN 19
76
 #define X_STEP_PIN 19
67
 #define X_DIR_PIN 18
77
 #define X_DIR_PIN 18
103
 #define SDSS -1 // SCL pin of I2C header
113
 #define SDSS -1 // SCL pin of I2C header
104
 #define LED_PIN -1
114
 #define LED_PIN -1
105
 
115
 
106
-#ifdef GEN7_V_1_3
116
+#if (GEN7_VERSION >= 13)
107
 // Gen7 v1.3 removed the fan pin
117
 // Gen7 v1.3 removed the fan pin
108
 #define FAN_PIN -1
118
 #define FAN_PIN -1
109
 #else
119
 #else
111
 #endif
121
 #endif
112
 #define PS_ON_PIN 15
122
 #define PS_ON_PIN 15
113
 
123
 
124
+#if (GEN7_VERSION < 14)
114
 // Gen 1.3 and earlier supplied thermistor power via PS_ON
125
 // Gen 1.3 and earlier supplied thermistor power via PS_ON
115
 // Need to ignore the bad thermistor readings on those units
126
 // Need to ignore the bad thermistor readings on those units
116
 #define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
127
 #define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
128
+#endif
129
+
117
 //our pin for debugging.
130
 //our pin for debugging.
118
 #define DEBUG_PIN 0
131
 #define DEBUG_PIN 0
119
 
132
 

Loading…
Cancel
Save