From 4d4fa3607bc598441cb4a3de0e1f3a8064f0f75f Mon Sep 17 00:00:00 2001 From: AnHardt <github@kitelab.de> Date: Tue, 19 May 2015 02:46:37 +0200 Subject: [PATCH 1/2] Remove Duemilanove No way to fit Marlin into 32K. --- Marlin/Makefile | 6 ---- Marlin/boards.h | 1 - Marlin/configurator/config/boards.h | 1 - Marlin/pins.h | 2 -- Marlin/pins_DUEMILANOVE_328P.h | 43 ----------------------------- 5 files changed, 53 deletions(-) delete mode 100644 Marlin/pins_DUEMILANOVE_328P.h diff --git a/Marlin/Makefile b/Marlin/Makefile index 34ad1340da4..b22cca67138 100644 --- a/Marlin/Makefile +++ b/Marlin/Makefile @@ -99,12 +99,6 @@ else ifeq ($(HARDWARE_MOTHERBOARD),34) HARDWARE_VARIANT ?= arduino MCU ?= atmega2560 -#Duemilanove w/ ATMega328P pin assignment -else ifeq ($(HARDWARE_MOTHERBOARD),4) -HARDWARE_VARIANT ?= arduino -HARDWARE_SUB_VARIANT ?= standard -MCU ?= atmega328p - #Gen6 else ifeq ($(HARDWARE_MOTHERBOARD),5) HARDWARE_VARIANT ?= Gen6 diff --git a/Marlin/boards.h b/Marlin/boards.h index cc9d1f28979..5ccf0f82e2a 100644 --- a/Marlin/boards.h +++ b/Marlin/boards.h @@ -16,7 +16,6 @@ #define BOARD_RAMPS_13_EEF 36 // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Fan) #define BOARD_RAMPS_13_SF 38 // RAMPS 1.3 / 1.4 (Power outputs: Spindle, Controller Fan) #define BOARD_FELIX2 37 // Felix 2.0+ Electronics Board (RAMPS like) -#define BOARD_DUEMILANOVE_328P 4 // Duemilanove w/ ATMega328P pin assignments #define BOARD_GEN6 5 // Gen6 #define BOARD_GEN6_DELUXE 51 // Gen6 deluxe #define BOARD_SANGUINOLOLU_11 6 // Sanguinololu < 1.2 diff --git a/Marlin/configurator/config/boards.h b/Marlin/configurator/config/boards.h index 8a60f011d57..0e9c8c20a19 100644 --- a/Marlin/configurator/config/boards.h +++ b/Marlin/configurator/config/boards.h @@ -15,7 +15,6 @@ #define BOARD_RAMPS_13_EFF 35 // RAMPS 1.3 / 1.4 (Power outputs: Extruder, Fan, Fan) #define BOARD_RAMPS_13_EEF 36 // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Fan) #define BOARD_FELIX2 37 // Felix 2.0+ Electronics Board (RAMPS like) -#define BOARD_DUEMILANOVE_328P 4 // Duemilanove w/ ATMega328P pin assignments #define BOARD_GEN6 5 // Gen6 #define BOARD_GEN6_DELUXE 51 // Gen6 deluxe #define BOARD_SANGUINOLOLU_11 6 // Sanguinololu < 1.2 diff --git a/Marlin/pins.h b/Marlin/pins.h index 6af115d63ac..abffe2c9345 100644 --- a/Marlin/pins.h +++ b/Marlin/pins.h @@ -36,8 +36,6 @@ #include "pins_RAMPS_OLD.h" #elif MB(RAMPS_13_EFB) || MB(RAMPS_13_EEB) || MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF) || MB(RAMPS_13_SF) #include "pins_RAMPS_13.h" -#elif MB(DUEMILANOVE_328P) - #include "pins_DUEMILANOVE_328P.h" #elif MB(GEN6) #include "pins_GEN6.h" #elif MB(GEN6_DELUXE) diff --git a/Marlin/pins_DUEMILANOVE_328P.h b/Marlin/pins_DUEMILANOVE_328P.h deleted file mode 100644 index 9e47055849b..00000000000 --- a/Marlin/pins_DUEMILANOVE_328P.h +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Duemilanove w/ ATMega328P pin assignments - */ - -#ifndef __AVR_ATmega328P__ - #error Oops! Make sure you have 'Arduino Duemilanove w/ ATMega328' selected from the 'Tools -> Boards' menu. -#endif - -#define X_STEP_PIN 19 -#define X_DIR_PIN 18 -#define X_ENABLE_PIN -1 -#define X_STOP_PIN 17 - -#define Y_STEP_PIN 10 -#define Y_DIR_PIN 7 -#define Y_ENABLE_PIN -1 -#define Y_STOP_PIN 8 - -#define Z_STEP_PIN 13 -#define Z_DIR_PIN 3 -#define Z_ENABLE_PIN 2 -#define Z_STOP_PIN 4 - -#define E0_STEP_PIN 11 -#define E0_DIR_PIN 12 -#define E0_ENABLE_PIN -1 - -#define SDPOWER -1 -#define SDSS -1 -#define LED_PIN -1 -#define FAN_PIN 5 -#define PS_ON_PIN -1 -#define KILL_PIN -1 - -#define HEATER_0_PIN 6 -#define HEATER_1_PIN -1 -#define HEATER_2_PIN -1 -#define TEMP_0_PIN 0 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! -#define TEMP_1_PIN -1 -#define TEMP_2_PIN -1 -#define HEATER_BED_PIN -1 -#define TEMP_BED_PIN -1 - From 23ee57c1c121bab4ae17db257a5e3a70d136add2 Mon Sep 17 00:00:00 2001 From: AnHardt <github@kitelab.de> Date: Tue, 19 May 2015 03:17:56 +0200 Subject: [PATCH 2/2] Remove DUEMILANOVE from Travis too. --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f844a29eb73..8154ace313a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -161,6 +161,3 @@ script: #- rm -rf .build/ #- ino build -m mega2560 ######## Board Types ############# - - sed -i 's/#define MOTHERBOARD BOARD_RAMPS_13_EFB/#define MOTHERBOARD BOARD_DUEMILANOVE_328P/g' Marlin/Configuration.h - - rm -rf .build/ - - ino build -m atmega328 \ No newline at end of file