Support all but motion

2020-03-15 14:44:41 -04:00
parent b35d0c61b9
commit d21d6f6c9e
3 changed files with 109 additions and 11 deletions
@@ -1,5 +1,4 @@
-/**
- * Marlin 3D Printer Firmware
+ /** Marlin 3D Printer Firmware
 * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
 *
 * Based on Sprinter and grbl.
@@ -128,7 +127,7 @@

 // Choose the name from boards.h that matches your setup
 #ifndef MOTHERBOARD
-  #define MOTHERBOARD BOARD_RAMPS_14_EFB
+  #define MOTHERBOARD BOARD_INTAMSYS40
 #endif

 // Name displayed in the LCD "Ready" message and Info menu
@@ -416,7 +415,7 @@
 *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
 *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
 */
-#define TEMP_SENSOR_0 1
+#define TEMP_SENSOR_0 20
 #define TEMP_SENSOR_1 0
 #define TEMP_SENSOR_2 0
 #define TEMP_SENSOR_3 0
@@ -424,9 +423,9 @@
 #define TEMP_SENSOR_5 0
 #define TEMP_SENSOR_6 0
 #define TEMP_SENSOR_7 0
-#define TEMP_SENSOR_BED 0
+#define TEMP_SENSOR_BED 1
 #define TEMP_SENSOR_PROBE 0
-#define TEMP_SENSOR_CHAMBER 0
+#define TEMP_SENSOR_CHAMBER 1

 // Dummy thermistor constant temperature readings, for use with 998 and 999
 #define DUMMY_THERMISTOR_998_VALUE 25
@@ -1698,7 +1697,7 @@
 * you must uncomment the following option or it won't work.
 *
 */
-//#define SDSUPPORT
+#define SDSUPPORT

 /**
 * SD CARD: SPI SPEED
@@ -1951,7 +1950,7 @@
 // RepRapDiscount FULL GRAPHIC Smart Controller
 // https://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
 //
-//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
+#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER

 //
 // ReprapWorld Graphical LCD
@@ -1370,7 +1370,7 @@
  //#define STATUS_ALT_FAN_BITMAP     // Use the alternative fan bitmap
  //#define STATUS_FAN_FRAMES 3       // :[0,1,2,3,4] Number of fan animation frames
  //#define STATUS_HEAT_PERCENT       // Show heating in a progress bar
-  //#define BOOT_MARLIN_LOGO_SMALL    // Show a smaller Marlin logo on the Boot Screen (saving 399 bytes of flash)
+  #define BOOT_MARLIN_LOGO_SMALL    // Show a smaller Marlin logo on the Boot Screen (saving 399 bytes of flash)
  //#define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~‭3260 (or ~940) bytes of PROGMEM.

  // Frivolous Game Options
@@ -1893,7 +1893,7 @@
 * Currently handles M108, M112, M410, M876
 * NOTE: Not yet implemented for all platforms.
 */
-//#define EMERGENCY_PARSER
+#define EMERGENCY_PARSER

 // Bad Serial-connections can miss a received command by sending an 'ok'
 // Therefore some clients abort after 30 seconds in a timeout.
@@ -3505,7 +3505,7 @@
 //
 // M43 - display pin status, toggle pins, watch pins, watch endstops & toggle LED, test servo probe
 //
-//#define PINS_DEBUGGING
+#define PINS_DEBUGGING

 // Enable Marlin dev mode which adds some special commands
 //#define MARLIN_DEV_MODE
@@ -16,18 +16,29 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
+<<<<<<< HEAD
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+=======
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+>>>>>>> Support all but motion
 *
 */
 #pragma once

 /**
+<<<<<<< HEAD
 * Intamsys Funmat HT V4.0 Mainboard
 * 4988 Drivers Tested
 * 2208 version exists and may or may not work
 */

 #ifndef __AVR_ATmega2560__
+=======
+ * CNControls V15 for HMS434 pin assignments
+ */
+
+#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
+>>>>>>> Support all but motion
  #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
 #endif

@@ -36,11 +47,16 @@
 //
 // Servos
 //
+<<<<<<< HEAD
 #define SERVO0_PIN                            12  // Uses High Temp Present Jumper Pin
+=======
+#define SERVO0_PIN          -1
+>>>>>>> Support all but motion

 //
 // Limit Switches
 //
+<<<<<<< HEAD
 #define X_STOP_PIN                            22
 #define Y_STOP_PIN                            26
 #define Z_MIN_PIN                             29
@@ -115,10 +131,73 @@
 #if ENABLED(PSU_CONTROL)
  #define PS_ON_PIN                           38  // UPS Module
 #endif
+=======
+//
+// Limit Switches
+//
+#define X_MIN_PIN          22
+#define X_MAX_PIN          -1
+#define Y_MIN_PIN          26
+#define Y_MAX_PIN          -1
+#define Z_MIN_PIN          29
+#define Z_MAX_PIN          69
+
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN  -1
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN         -1
+#define X_DIR_PIN          -1
+#define X_ENABLE_PIN       -1//44
+
+#define Y_STEP_PIN         -1
+#define Y_DIR_PIN          -1
+#define Y_ENABLE_PIN       -1//32
+
+#define Z_STEP_PIN         -1//45
+#define Z_DIR_PIN          -1
+#define Z_ENABLE_PIN       -1//34
+
+#define E0_STEP_PIN        69
+#define E0_DIR_PIN         29
+#define E0_ENABLE_PIN      22
+
+//
+// Temperature Sensors
+// Analog Inputs
+//
+#define TEMP_0_PIN          8   // Analog InputD62 A8
+#define TEMP_BED_PIN        10   // Analog Input D64 A10
+
+#define TEMP_CHAMBER_PIN  9   // Analog Input D63
+
+//
+// Heaters
+//
+#define HEATER_0_PIN        2
+#define HEATER_BED_PIN     4
+#define HEATER_CHAMBER_PIN 3
+
+//
+// Fans
+//
+#define FAN_PIN             7
+
+//
+// Misc. Functions
+//
+#define SDSS               53
+#define SD_DETECT_PIN      39
+#define CASE_LIGHT_PIN      8
+>>>>>>> Support all but motion

 //
 // LCD Controller
 //
+<<<<<<< HEAD

 #define BEEPER_PIN                            18

@@ -150,3 +229,23 @@

 Hotend High Temp Connected : D12
 */
+=======
+//#define BEEPER_PIN         18
+
+  #define LCD_PINS_RS      20
+  #define LCD_PINS_ENABLE  30
+  #define LCD_PINS_D4      14
+  #define LCD_PINS_D5      21
+  #define LCD_PINS_D6       5
+  #define LCD_PINS_D7      6
+  #define BTN_EN1        40
+  #define BTN_EN2        41
+  #define BTN_ENC        19
+
+
+// Common I/O
+
+#define FIL_RUNOUT_PIN      10
+//#define BATTERY     38
+#define BEEPER_PIN         -1
+>>>>>>> Support all but motion