Browse Source

Merge pull request #8784 from fiveangle/bf2-travis_examples_squashed

[2.0.x] Fix example configs and add to TravisCI tests - squashed
Scott Lahteine 7 years ago
parent
commit
20008b72a8
No account linked to committer's email address

+ 1
- 1
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h View File

287
  * :{ '0': "Not used", '1':"100k / 4.7k - EPCOS", '2':"200k / 4.7k - ATC Semitec 204GT-2", '3':"Mendel-parts / 4.7k", '4':"10k !! do not use for a hotend. Bad resolution at high temp. !!", '5':"100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '6':"100k / 4.7k EPCOS - Not as accurate as Table 1", '7':"100k / 4.7k Honeywell 135-104LAG-J01", '8':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9':"100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10':"100k / 4.7k RS 198-961", '11':"100k / 4.7k beta 3950 1%", '12':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13':"100k Hisens 3950  1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '20':"PT100 (Ultimainboard V2.x)", '51':"100k / 1k - EPCOS", '52':"200k / 1k - ATC Semitec 204GT-2", '55':"100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '60':"100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '66':"Dyze Design 4.7M High Temperature thermistor", '70':"the 100K thermistor found in the bq Hephestos 2", '71':"100k / 4.7k Honeywell 135-104LAF-J01", '147':"Pt100 / 4.7k", '1047':"Pt1000 / 4.7k", '110':"Pt100 / 1k (non-standard)", '1010':"Pt1000 / 1k (non standard)", '-3':"Thermocouple + MAX31855 (only for sensor 0)", '-2':"Thermocouple + MAX6675 (only for sensor 0)", '-1':"Thermocouple + AD595",'998':"Dummy 1", '999':"Dummy 2" }
287
  * :{ '0': "Not used", '1':"100k / 4.7k - EPCOS", '2':"200k / 4.7k - ATC Semitec 204GT-2", '3':"Mendel-parts / 4.7k", '4':"10k !! do not use for a hotend. Bad resolution at high temp. !!", '5':"100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '6':"100k / 4.7k EPCOS - Not as accurate as Table 1", '7':"100k / 4.7k Honeywell 135-104LAG-J01", '8':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9':"100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10':"100k / 4.7k RS 198-961", '11':"100k / 4.7k beta 3950 1%", '12':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13':"100k Hisens 3950  1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '20':"PT100 (Ultimainboard V2.x)", '51':"100k / 1k - EPCOS", '52':"200k / 1k - ATC Semitec 204GT-2", '55':"100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '60':"100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '66':"Dyze Design 4.7M High Temperature thermistor", '70':"the 100K thermistor found in the bq Hephestos 2", '71':"100k / 4.7k Honeywell 135-104LAF-J01", '147':"Pt100 / 4.7k", '1047':"Pt1000 / 4.7k", '110':"Pt100 / 1k (non-standard)", '1010':"Pt1000 / 1k (non standard)", '-3':"Thermocouple + MAX31855 (only for sensor 0)", '-2':"Thermocouple + MAX6675 (only for sensor 0)", '-1':"Thermocouple + AD595",'998':"Dummy 1", '999':"Dummy 2" }
288
  */
288
  */
289
 #define TEMP_SENSOR_0 7
289
 #define TEMP_SENSOR_0 7
290
-#define TEMP_SENSOR_1 7
290
+#define TEMP_SENSOR_1 0
291
 #define TEMP_SENSOR_2 0
291
 #define TEMP_SENSOR_2 0
292
 #define TEMP_SENSOR_3 0
292
 #define TEMP_SENSOR_3 0
293
 #define TEMP_SENSOR_4 0
293
 #define TEMP_SENSOR_4 0

+ 0
- 3
Marlin/src/config/examples/BQ/Hephestos/Configuration.h View File

126
 // Displayed in the LCD "Ready" message
126
 // Displayed in the LCD "Ready" message
127
 #define CUSTOM_MACHINE_NAME "HEPHESTOS"
127
 #define CUSTOM_MACHINE_NAME "HEPHESTOS"
128
 
128
 
129
-// Added for BQ
130
-#define SOURCE_CODE_URL "http://www.bq.com/gb/downloads-prusa-i3-hephestos.html"
131
-
132
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
129
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
133
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
130
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
134
 //#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
131
 //#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"

+ 0
- 3
Marlin/src/config/examples/BQ/WITBOX/Configuration.h View File

126
 // Displayed in the LCD "Ready" message
126
 // Displayed in the LCD "Ready" message
127
 #define CUSTOM_MACHINE_NAME "WITBOX"
127
 #define CUSTOM_MACHINE_NAME "WITBOX"
128
 
128
 
129
-// Added for BQ
130
-#define SOURCE_CODE_URL "http://www.bq.com/gb/downloads-witbox.html"
131
-
132
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
129
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
133
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
130
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
134
 //#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
131
 //#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"

+ 2
- 2
Marlin/src/config/examples/Malyan/M150/Configuration.h View File

81
 // build by the user have been successfully uploaded into firmware.
81
 // build by the user have been successfully uploaded into firmware.
82
 #define STRING_CONFIG_H_AUTHOR "(Gunther)" // Who made the changes.
82
 #define STRING_CONFIG_H_AUTHOR "(Gunther)" // Who made the changes.
83
 #define SHOW_BOOTSCREEN
83
 #define SHOW_BOOTSCREEN
84
-//#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
85
-//#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
84
+#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
85
+#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
86
 
86
 
87
 //
87
 //
88
 // *** VENDORS PLEASE READ *****************************************************
88
 // *** VENDORS PLEASE READ *****************************************************

+ 1
- 1
Marlin/src/config/examples/SCARA/Configuration.h View File

484
 // extra connectors. Leave undefined any used for non-endstop and non-probe purposes.
484
 // extra connectors. Leave undefined any used for non-endstop and non-probe purposes.
485
 #define USE_XMIN_PLUG
485
 #define USE_XMIN_PLUG
486
 #define USE_YMIN_PLUG
486
 #define USE_YMIN_PLUG
487
-//#define USE_ZMIN_PLUG
487
+#define USE_ZMIN_PLUG
488
 //#define USE_XMAX_PLUG
488
 //#define USE_XMAX_PLUG
489
 //#define USE_YMAX_PLUG
489
 //#define USE_YMAX_PLUG
490
 #define USE_ZMAX_PLUG
490
 #define USE_ZMAX_PLUG

+ 2
- 2
Marlin/src/config/examples/Velleman/K8400/Configuration.h View File

781
 
781
 
782
 // The size of the print bed
782
 // The size of the print bed
783
 #define X_BED_SIZE 200
783
 #define X_BED_SIZE 200
784
-#define Y_BED_SIZE 200
784
+#define Y_BED_SIZE 180
785
 
785
 
786
 // Travel limits (mm) after homing, corresponding to endstop positions.
786
 // Travel limits (mm) after homing, corresponding to endstop positions.
787
 #define X_MIN_POS 0
787
 #define X_MIN_POS 0
788
 #define Y_MIN_POS 20
788
 #define Y_MIN_POS 20
789
 #define Z_MIN_POS 0
789
 #define Z_MIN_POS 0
790
 #define X_MAX_POS X_BED_SIZE
790
 #define X_MAX_POS X_BED_SIZE
791
-#define Y_MAX_POS Y_BED_SIZE
791
+#define Y_MAX_POS ((Y_BED_SIZE) + (Y_MIN_POS))
792
 #define Z_MAX_POS 190
792
 #define Z_MAX_POS 190
793
 
793
 
794
 /**
794
 /**

+ 2
- 2
Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h View File

781
 
781
 
782
 // The size of the print bed
782
 // The size of the print bed
783
 #define X_BED_SIZE 200
783
 #define X_BED_SIZE 200
784
-#define Y_BED_SIZE 200
784
+#define Y_BED_SIZE 180
785
 
785
 
786
 // Travel limits (mm) after homing, corresponding to endstop positions.
786
 // Travel limits (mm) after homing, corresponding to endstop positions.
787
 #define X_MIN_POS 0
787
 #define X_MIN_POS 0
788
 #define Y_MIN_POS 20
788
 #define Y_MIN_POS 20
789
 #define Z_MIN_POS 0
789
 #define Z_MIN_POS 0
790
 #define X_MAX_POS X_BED_SIZE
790
 #define X_MAX_POS X_BED_SIZE
791
-#define Y_MAX_POS Y_BED_SIZE
791
+#define Y_MAX_POS ((Y_BED_SIZE) + (Y_MIN_POS))
792
 #define Z_MAX_POS 190
792
 #define Z_MAX_POS 190
793
 
793
 
794
 /**
794
 /**

+ 39
- 0
Marlin/src/pins/pins_MAKEBOARD_MINI.h View File

1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (C) 2016 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 <http://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+
23
+#include "pins_RAMPS.h"
24
+
25
+#undef BOARD_NAME
26
+#define BOARD_NAME "MAKEBOARD_MINI"
27
+
28
+//
29
+// Only 3 Limit Switch plugs on Micromake C1
30
+//
31
+#undef X_MIN_PIN
32
+#undef Y_MIN_PIN
33
+#undef Z_MIN_PIN
34
+#undef X_MAX_PIN
35
+#undef Y_MAX_PIN
36
+#undef Z_MAX_PIN
37
+#define X_STOP_PIN          2
38
+#define Y_STOP_PIN         15
39
+#define Z_STOP_PIN         19

+ 5
- 0
Marlin/src/pins/pins_MKS_SBASE.h View File

181
 #define ENET_TXD0          P1_00  // J12-11
181
 #define ENET_TXD0          P1_00  // J12-11
182
 #define ENET_TXD1          P1_01  // J12-12
182
 #define ENET_TXD1          P1_01  // J12-12
183
 
183
 
184
+//
185
+// Misc. Functions
186
+//
187
+#define SDSS               P0_06
188
+
184
 /**
189
 /**
185
  *  PWMs
190
  *  PWMs
186
  *
191
  *

+ 3
- 0
Marlin/src/pins/pins_RAMBO.h View File

108
 
108
 
109
 #define DIGIPOTSS_PIN      38
109
 #define DIGIPOTSS_PIN      38
110
 #define DIGIPOT_CHANNELS {4,5,3,0,1} // X Y Z E0 E1 digipot channels to stepper driver mapping
110
 #define DIGIPOT_CHANNELS {4,5,3,0,1} // X Y Z E0 E1 digipot channels to stepper driver mapping
111
+#ifndef DIGIPOT_MOTOR_CURRENT
112
+  #define DIGIPOT_MOTOR_CURRENT { 135,135,135,135,135 }   // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
113
+#endif
111
 
114
 
112
 //
115
 //
113
 // Temperature Sensors
116
 // Temperature Sensors

Loading…
Cancel
Save