bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge pull request #7554 from thinkyhead/bf1_sanguino_config

Browse Source 
Sanguinololu example config
This commit is contained in:
Scott Lahteine 2017-08-23 19:58:06 -05:00 committed by GitHub
commit ddfe527ff2
17 changed files with 3260 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/Marlin_main.cpp
View File

@ -13324,6 +13324,7 @@ void setup() {
SERIAL_ECHOPGM(MSG_CONFIGURATION_VER); SERIAL_ECHOPGM(MSG_CONFIGURATION_VER);
SERIAL_ECHOPGM(STRING_DISTRIBUTION_DATE); SERIAL_ECHOPGM(STRING_DISTRIBUTION_DATE);
SERIAL_ECHOLNPGM(MSG_AUTHOR STRING_CONFIG_H_AUTHOR); SERIAL_ECHOLNPGM(MSG_AUTHOR STRING_CONFIG_H_AUTHOR);
SERIAL_ECHO_START();
SERIAL_ECHOLNPGM("Compiled: " __DATE__); SERIAL_ECHOLNPGM("Compiled: " __DATE__);
#endif #endif

4
Marlin/configuration_store.cpp
View File

@ -659,7 +659,7 @@ void MarlinSettings::postprocess() {
#if ENABLED(EEPROM_CHITCHAT) #if ENABLED(EEPROM_CHITCHAT)
SERIAL_ECHO_START(); SERIAL_ECHO_START();
SERIAL_ECHOPAIR("Settings Stored (", eeprom_size - (EEPROM_OFFSET)); SERIAL_ECHOPAIR("Settings Stored (", eeprom_size - (EEPROM_OFFSET));
SERIAL_ECHOPAIR(" bytes; crc ", final_crc); SERIAL_ECHOPAIR(" bytes; crc ", (uint32_t)final_crc);
SERIAL_ECHOLNPGM(")"); SERIAL_ECHOLNPGM(")");
#endif #endif
} }
@ -1010,7 +1010,7 @@ void MarlinSettings::postprocess() {
SERIAL_ECHO_START(); SERIAL_ECHO_START();
SERIAL_ECHO(version); SERIAL_ECHO(version);
SERIAL_ECHOPAIR(" stored settings retrieved (", eeprom_index - (EEPROM_OFFSET)); SERIAL_ECHOPAIR(" stored settings retrieved (", eeprom_index - (EEPROM_OFFSET));
SERIAL_ECHOPAIR(" bytes; crc ", working_crc); SERIAL_ECHOPAIR(" bytes; crc ", (uint32_t)working_crc);
SERIAL_ECHOLNPGM(")"); SERIAL_ECHOLNPGM(")");
#endif #endif
} }

1688
Marlin/example_configurations/Sanguinololu/Configuration.h Normal file
View File

File diff suppressed because it is too large Load Diff

1374
Marlin/example_configurations/Sanguinololu/Configuration_adv.h Normal file
View File

File diff suppressed because it is too large Load Diff

261
Marlin/pins.h
View File

@ -35,27 +35,11 @@
#ifndef __PINS_H__ #ifndef __PINS_H__
#define __PINS_H__ #define __PINS_H__
#if MB(GEN7_CUSTOM) //
#include "pins_GEN7_CUSTOM.h" // RAMPS 1.3 / 1.4 - ATmega1280, ATmega2560
#elif MB(GEN7_12) //
#include "pins_GEN7_12.h"
#elif MB(GEN7_13) #if MB(RAMPS_OLD)
#include "pins_GEN7_13.h"
#elif MB(GEN7_14)
#include "pins_GEN7_14.h"
#elif MB(CNCONTROLS_11)
#include "pins_CNCONTROLS_11.h"
#elif MB(CNCONTROLS_12)
#include "pins_CNCONTROLS_12.h"
#elif MB(CHEAPTRONIC)
#include "pins_CHEAPTRONIC.h"
#elif MB(CHEAPTRONIC_V2)
#include "pins_CHEAPTRONICv2.h"
#elif MB(SETHI)
#include "pins_SETHI.h"
#elif MB(MIGHTYBOARD_REVE)
#include "pins_MIGHTYBOARD_REVE.h"
#elif MB(RAMPS_OLD)
#include "pins_RAMPS_OLD.h" #include "pins_RAMPS_OLD.h"
#elif MB(RAMPS_13_EFB) #elif MB(RAMPS_13_EFB)
#define IS_RAMPS_EFB #define IS_RAMPS_EFB
@ -87,115 +71,166 @@
#elif MB(RAMPS_14_SF) #elif MB(RAMPS_14_SF)
#define IS_RAMPS_SF #define IS_RAMPS_SF
#include "pins_RAMPS.h" #include "pins_RAMPS.h"
#elif MB(GEN6)
#include "pins_GEN6.h" //
#elif MB(GEN6_DELUXE) // RAMPS Derivatives - ATmega1280, ATmega2560
#include "pins_GEN6_DELUXE.h" //
#elif MB(SANGUINOLOLU_11)
#include "pins_SANGUINOLOLU_11.h"
#elif MB(SANGUINOLOLU_12)
#include "pins_SANGUINOLOLU_12.h"
#elif MB(MELZI)
#include "pins_MELZI.h"
#elif MB(MELZI_MAKR3D)
#include "pins_MELZI_MAKR3D.h"
#elif MB(MELZI_CREALITY)
#include "pins_MELZI_CREALITY.h"
#elif MB(STB_11)
#include "pins_STB_11.h"
#elif MB(AZTEEG_X1)
#include "pins_AZTEEG_X1.h"
#elif MB(AZTEEG_X3)
#include "pins_AZTEEG_X3.h"
#elif MB(AZTEEG_X3_PRO)
#include "pins_AZTEEG_X3_PRO.h"
#elif MB(ANET_10)
#include "pins_ANET_10.h"
#elif MB(ULTIMAKER)
#include "pins_ULTIMAKER.h"
#elif MB(ULTIMAKER_OLD)
#include "pins_ULTIMAKER_OLD.h"
#elif MB(ULTIMAIN_2)
#include "pins_ULTIMAIN_2.h"
#elif MB(3DRAG) #elif MB(3DRAG)
#include "pins_3DRAG.h" #include "pins_3DRAG.h" // ATmega1280, ATmega2560
#elif MB(K8200) #elif MB(K8200)
#include "pins_K8200.h" #include "pins_K8200.h" // ATmega1280, ATmega2560 (3DRAG)
#elif MB(K8400) #elif MB(K8400)
#include "pins_K8400.h" #include "pins_K8400.h" // ATmega1280, ATmega2560 (3DRAG)
#elif MB(TEENSYLU) #elif MB(BAM_DICE)
#include "pins_TEENSYLU.h" #include "pins_RAMPS.h" // ATmega1280, ATmega2560
#elif MB(BAM_DICE_DUE)
#include "pins_BAM_DICE_DUE.h" // ATmega1280, ATmega2560
#elif MB(MKS_BASE)
#include "pins_MKS_BASE.h" // ATmega1280, ATmega2560
#elif MB(MKS_13)
#include "pins_MKS_13.h" // ATmega1280, ATmega2560
#elif MB(ZRIB_V20)
#include "pins_ZRIB_V20.h" // ATmega1280, ATmega2560 (MKS_13)
#elif MB(FELIX2)
#include "pins_FELIX2.h" // ATmega1280, ATmega2560
#elif MB(RIGIDBOARD)
#include "pins_RIGIDBOARD.h" // ATmega1280, ATmega2560
#elif MB(RIGIDBOARD_V2)
#include "pins_RIGIDBOARD_V2.h" // ATmega1280, ATmega2560
#elif MB(SAINSMART_2IN1)
#include "pins_SAINSMART_2IN1.h" // ATmega1280, ATmega2560
#elif MB(ULTIMAKER)
#include "pins_ULTIMAKER.h" // ATmega1280, ATmega2560
#elif MB(ULTIMAKER_OLD)
#include "pins_ULTIMAKER_OLD.h" // ATmega1280, ATmega2560
#elif MB(AZTEEG_X3)
#include "pins_AZTEEG_X3.h" // ATmega2560
#elif MB(AZTEEG_X3_PRO)
#include "pins_AZTEEG_X3_PRO.h" // ATmega2560
#elif MB(ULTIMAIN_2)
#include "pins_ULTIMAIN_2.h" // ATmega2560
#elif MB(RUMBA) #elif MB(RUMBA)
#include "pins_RUMBA.h" #include "pins_RUMBA.h" // ATmega2560
#elif MB(PRINTRBOARD) #elif MB(BQ_ZUM_MEGA_3D)
#include "pins_PRINTRBOARD.h" #include "pins_BQ_ZUM_MEGA_3D.h" // ATmega2560
#elif MB(PRINTRBOARD_REVF)
#include "pins_PRINTRBOARD_REVF.h" //
#elif MB(BRAINWAVE) // Other ATmega1280, ATmega2560
#include "pins_BRAINWAVE.h" //
#elif MB(BRAINWAVE_PRO)
#include "pins_BRAINWAVE_PRO.h" #elif MB(CNCONTROLS_11)
#elif MB(SAV_MKI) #include "pins_CNCONTROLS_11.h" // ATmega1280, ATmega2560
#include "pins_SAV_MKI.h" #elif MB(CNCONTROLS_12)
#elif MB(TEENSY2) #include "pins_CNCONTROLS_12.h" // ATmega1280, ATmega2560
#include "pins_TEENSY2.h" #elif MB(MIGHTYBOARD_REVE)
#elif MB(GEN3_PLUS) #include "pins_MIGHTYBOARD_REVE.h" // ATmega1280, ATmega2560
#include "pins_GEN3_PLUS.h" #elif MB(CHEAPTRONIC)
#elif MB(GEN3_MONOLITHIC) #include "pins_CHEAPTRONIC.h" // ATmega2560
#include "pins_GEN3_MONOLITHIC.h" #elif MB(CHEAPTRONIC_V2)
#include "pins_CHEAPTRONICv2.h" // ATmega2560
#elif MB(MEGATRONICS) #elif MB(MEGATRONICS)
#include "pins_MEGATRONICS.h" #include "pins_MEGATRONICS.h" // ATmega2560
#elif MB(MINITRONICS)
#include "pins_MINITRONICS.h"
#elif MB(MEGATRONICS_2) #elif MB(MEGATRONICS_2)
#include "pins_MEGATRONICS_2.h" #include "pins_MEGATRONICS_2.h" // ATmega2560
#elif MB(MEGATRONICS_3) #elif MB(MEGATRONICS_3)
#include "pins_MEGATRONICS_3.h" #include "pins_MEGATRONICS_3.h" // ATmega2560
#elif MB(MEGATRONICS_31) #elif MB(MEGATRONICS_31)
#define MEGATRONICS_31 #define MEGATRONICS_31
#include "pins_MEGATRONICS_3.h" #include "pins_MEGATRONICS_3.h" // ATmega2560
#elif MB(OMCA_A)
#include "pins_OMCA_A.h"
#elif MB(OMCA)
#include "pins_OMCA.h"
#elif MB(RAMBO) #elif MB(RAMBO)
#include "pins_RAMBO.h" #include "pins_RAMBO.h" // ATmega2560
#elif MB(MINIRAMBO) #elif MB(MINIRAMBO)
#include "pins_MINIRAMBO.h" #include "pins_MINIRAMBO.h" // ATmega2560
#elif MB(ELEFU_3) #elif MB(ELEFU_3)
#include "pins_ELEFU_3.h" #include "pins_ELEFU_3.h" // ATmega2560
#elif MB(5DPRINT)
#include "pins_5DPRINT.h"
#elif MB(LEAPFROG) #elif MB(LEAPFROG)
#include "pins_LEAPFROG.h" #include "pins_LEAPFROG.h" // ATmega1280, ATmega2560
#elif MB(BAM_DICE)
#include "pins_RAMPS.h"
#elif MB(BAM_DICE_DUE)
#include "pins_BAM_DICE_DUE.h"
#elif MB(FELIX2)
#include "pins_FELIX2.h"
#elif MB(MKS_BASE)
#include "pins_MKS_BASE.h"
#elif MB(RIGIDBOARD)
#include "pins_RIGIDBOARD.h"
#elif MB(RIGIDBOARD_V2)
#include "pins_RIGIDBOARD_V2.h"
#elif MB(MEGACONTROLLER) #elif MB(MEGACONTROLLER)
#include "pins_MEGACONTROLLER.h" #include "pins_MEGACONTROLLER.h" // ATmega2560
#elif MB(BQ_ZUM_MEGA_3D)
#include "pins_BQ_ZUM_MEGA_3D.h"
#elif MB(SCOOVO_X9H) #elif MB(SCOOVO_X9H)
#include "pins_SCOOVO_X9H.h" #include "pins_SCOOVO_X9H.h" // ATmega2560
#elif MB(MKS_13)
#include "pins_MKS_13.h"
#elif MB(SAINSMART_2IN1)
#include "pins_SAINSMART_2IN1.h"
#elif MB(ZRIB_V20)
#include "pins_ZRIB_V20.h"
#elif MB(GT2560_REV_A) #elif MB(GT2560_REV_A)
#include "pins_GT2560_REV_A.h" #include "pins_GT2560_REV_A.h" // ATmega1280, ATmega2560
#elif MB(GT2560_REV_A_PLUS) #elif MB(GT2560_REV_A_PLUS)
#include "pins_GT2560_REV_A_PLUS.h" #include "pins_GT2560_REV_A_PLUS.h" // ATmega1280, ATmega2560
//
// ATmega1281, ATmega2561
//
#elif MB(MINITRONICS)
#include "pins_MINITRONICS.h" // ATmega1281
//
// Sanguinololu and Derivatives - ATmega644P, ATmega1284P
//
#elif MB(SANGUINOLOLU_11)
#include "pins_SANGUINOLOLU_11.h" // ATmega644P, ATmega1284P
#elif MB(SANGUINOLOLU_12)
#include "pins_SANGUINOLOLU_12.h" // ATmega644P, ATmega1284P
#elif MB(MELZI)
#include "pins_MELZI.h" // ATmega644P, ATmega1284P
#elif MB(MELZI_MAKR3D)
#include "pins_MELZI_MAKR3D.h" // ATmega644P, ATmega1284P
#elif MB(MELZI_CREALITY)
#include "pins_MELZI_CREALITY.h" // ATmega644P, ATmega1284P
#elif MB(STB_11)
#include "pins_STB_11.h" // ATmega644P, ATmega1284P
#elif MB(AZTEEG_X1)
#include "pins_AZTEEG_X1.h" // ATmega644P, ATmega1284P
//
// Other ATmega644P, ATmega644, ATmega1284P
//
#elif MB(GEN3_MONOLITHIC)
#include "pins_GEN3_MONOLITHIC.h" // ATmega644P
#elif MB(GEN3_PLUS)
#include "pins_GEN3_PLUS.h" // ATmega644P, ATmega1284P
#elif MB(GEN6)
#include "pins_GEN6.h" // ATmega644P, ATmega1284P
#elif MB(GEN6_DELUXE)
#include "pins_GEN6_DELUXE.h" // ATmega644P, ATmega1284P
#elif MB(GEN7_CUSTOM)
#include "pins_GEN7_CUSTOM.h" // ATmega644P, ATmega644, ATmega1284P
#elif MB(GEN7_12)
#include "pins_GEN7_12.h" // ATmega644P, ATmega644, ATmega1284P
#elif MB(GEN7_13)
#include "pins_GEN7_13.h" // ATmega644P, ATmega644, ATmega1284P
#elif MB(GEN7_14)
#include "pins_GEN7_14.h" // ATmega644P, ATmega644, ATmega1284P
#elif MB(OMCA_A)
#include "pins_OMCA_A.h" // ATmega644
#elif MB(OMCA)
#include "pins_OMCA.h" // ATmega644P, ATmega644
#elif MB(ANET_10)
#include "pins_ANET_10.h" // ATmega1284P
#elif MB(SETHI)
#include "pins_SETHI.h" // ATmega644P, ATmega644, ATmega1284P
//
// Teensyduino - AT90USB1286, AT90USB1286P
//
#elif MB(TEENSYLU)
#include "pins_TEENSYLU.h" // AT90USB1286, AT90USB1286P
#elif MB(PRINTRBOARD)
#include "pins_PRINTRBOARD.h" // AT90USB1286
#elif MB(PRINTRBOARD_REVF)
#include "pins_PRINTRBOARD_REVF.h" // AT90USB1286
#elif MB(BRAINWAVE)
#include "pins_BRAINWAVE.h" // AT90USB646
#elif MB(BRAINWAVE_PRO)
#include "pins_BRAINWAVE_PRO.h" // AT90USB1286
#elif MB(SAV_MKI)
#include "pins_SAV_MKI.h" // AT90USB1286
#elif MB(TEENSY2)
#include "pins_TEENSY2.h" // AT90USB1286
#elif MB(5DPRINT)
#include "pins_5DPRINT.h" // AT90USB1286
#else #else
#error "Unknown MOTHERBOARD value set in Configuration.h" #error "Unknown MOTHERBOARD value set in Configuration.h"
#endif #endif

5
Marlin/pinsDebug.h
View File

@ -272,7 +272,10 @@ const volatile uint8_t* const PWM_OCR[][3] PROGMEM = {
static void err_is_counter() { SERIAL_PROTOCOLPGM(" non-standard PWM mode"); } static void err_is_counter() { SERIAL_PROTOCOLPGM(" non-standard PWM mode"); }
static void err_is_interrupt() { SERIAL_PROTOCOLPGM(" compare interrupt enabled"); } static void err_is_interrupt() { SERIAL_PROTOCOLPGM(" compare interrupt enabled"); }
static void err_prob_interrupt() { SERIAL_PROTOCOLPGM(" overflow interrupt enabled"); } static void err_prob_interrupt() { SERIAL_PROTOCOLPGM(" overflow interrupt enabled"); }
static void print_is_also_tied() { SERIAL_PROTOCOLPGM(" is also tied to this pin"); SERIAL_PROTOCOL_SP(14); }
#if AVR_ATmega2560_FAMILY || AVR_AT90USB1286_FAMILY
static void print_is_also_tied() { SERIAL_PROTOCOLPGM(" is also tied to this pin"); SERIAL_PROTOCOL_SP(14); }
#endif
void com_print(uint8_t N, uint8_t Z) { void com_print(uint8_t N, uint8_t Z) {
const uint8_t *TCCRA = (uint8_t*)TCCR_A(N); const uint8_t *TCCRA = (uint8_t*)TCCR_A(N);

3
Marlin/pins_AZTEEG_X1.h
View File

@ -26,5 +26,4 @@
#define BOARD_NAME "Azteeg X1" #define BOARD_NAME "Azteeg X1"
#define SANGUINOLOLU_V_1_2 #include "pins_SANGUINOLOLU_12.h"
#include "pins_SANGUINOLOLU_11.h"

6
Marlin/pins_GEN6.h
View File

@ -51,10 +51,8 @@
* *
*/ */
#ifndef __AVR_ATmega644P__ #if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega1284P__)
#ifndef __AVR_ATmega1284P__ #error "Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu."
#error "Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu."
#endif
#endif #endif
#ifndef BOARD_NAME #ifndef BOARD_NAME

1
Marlin/pins_GT2560_REV_A_PLUS.h
View File

@ -26,6 +26,7 @@
#include "pins_GT2560_REV_A.h" #include "pins_GT2560_REV_A.h"
#undef BOARD_NAME
#define BOARD_NAME "GT2560 Rev.A+" #define BOARD_NAME "GT2560 Rev.A+"
#define SERVO0_PIN 11 #define SERVO0_PIN 11

9
Marlin/pins_MELZI.h
View File

@ -25,10 +25,5 @@
*/ */
#define BOARD_NAME "Melzi" #define BOARD_NAME "Melzi"
#define IS_MELZI
#ifdef __AVR_ATmega1284P__ #include "pins_SANGUINOLOLU_12.h"
#define LARGE_FLASH true
#endif
#define SANGUINOLOLU_V_1_2
#include "pins_SANGUINOLOLU_11.h"

9
Marlin/pins_MELZI_CREALITY.h
View File

@ -25,17 +25,12 @@
*/ */
#define BOARD_NAME "Melzi (Creality)" #define BOARD_NAME "Melzi (Creality)"
#define IS_MELZI
#ifdef __AVR_ATmega1284P__ #include "pins_SANGUINOLOLU_12.h"
#define LARGE_FLASH true
#endif
// For the stock CR-10 use the REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // For the stock CR-10 use the REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
// option for the display in Configuration.h // option for the display in Configuration.h
#define SANGUINOLOLU_V_1_2
#include "pins_SANGUINOLOLU_11.h"
#undef LCD_SDSS #undef LCD_SDSS
#undef LED_PIN #undef LED_PIN

9
Marlin/pins_MELZI_MAKR3D.h
View File

@ -25,10 +25,5 @@
*/ */
#define BOARD_NAME "Melzi (ATmega1284)" #define BOARD_NAME "Melzi (ATmega1284)"
#define IS_MELZI
#ifdef __AVR_ATmega1284P__ #include "pins_SANGUINOLOLU_12.h"
#define LARGE_FLASH true
#endif
#define SANGUINOLOLU_V_1_2
#include "pins_SANGUINOLOLU_11.h"

29
Marlin/pins_SANGUINOLOLU_11.h
View File

@ -59,7 +59,9 @@
#define BOARD_NAME "Sanguinololu <1.2" #define BOARD_NAME "Sanguinololu <1.2"
#endif #endif
#define IS_MELZI (MB(MELZI) || MB(MELZI_MAKR3D) || MB(MELZI_CREALITY)) #ifdef __AVR_ATmega1284P__
#define LARGE_FLASH true
#endif
// //
// Limit Switches // Limit Switches
@ -116,7 +118,7 @@
#endif #endif
#if MB(AZTEEG_X1) || MB(STB_11) || IS_MELZI #if MB(AZTEEG_X1) || MB(STB_11) || ENABLED(IS_MELZI)
#define FAN_PIN 4 // Works for Panelolu2 too #define FAN_PIN 4 // Works for Panelolu2 too
#endif #endif
@ -133,16 +135,25 @@
//#define SDSS 24 //#define SDSS 24
#define SDSS 31 #define SDSS 31
#if IS_MELZI #if ENABLED(IS_MELZI)
#define LED_PIN 27 #define LED_PIN 27
#elif MB(STB_11) #elif MB(STB_11)
#define LCD_BACKLIGHT_PIN 17 // LCD backlight LED #define LCD_BACKLIGHT_PIN 17 // LCD backlight LED
#endif #endif
#if DISABLED(SPINDLE_LASER_ENABLE) && ENABLED(SANGUINOLOLU_V_1_2) && !(ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)) // try to use IO Header #if DISABLED(SPINDLE_LASER_ENABLE) && ENABLED(SANGUINOLOLU_V_1_2) && !(ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)) // try to use IO Header
#define CASE_LIGHT_PIN 4 // MUST BE HARDWARE PWM - see if IO Header is available #define CASE_LIGHT_PIN 4 // MUST BE HARDWARE PWM - see if IO Header is available
#endif #endif
/**
* Sanguinololu 1.4 AUX pins:
*
* PWM TX1 RX1 SDA SCL
* 12V 5V D12 D11 D10 D17 D16
* GND GND D31 D30 D29 D28 D27
* A4 A3 A2 A1 A0
*/
// //
// LCD / Controller // LCD / Controller
// //
@ -152,7 +163,7 @@
#if ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0 #if ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
#if IS_MELZI // Melzi board #if ENABLED(IS_MELZI)
#define LCD_PINS_RS 30 // CS chip select /SS chip slave select #define LCD_PINS_RS 30 // CS chip select /SS chip slave select
#define LCD_PINS_ENABLE 29 // SID (MOSI) #define LCD_PINS_ENABLE 29 // SID (MOSI)
#define LCD_PINS_D4 17 // SCK (CLK) clock #define LCD_PINS_D4 17 // SCK (CLK) clock
@ -160,7 +171,7 @@
// Marlin so this can be used for BEEPER_PIN. You can use this pin // Marlin so this can be used for BEEPER_PIN. You can use this pin
// with M42 instead of BEEPER_PIN. // with M42 instead of BEEPER_PIN.
#define BEEPER_PIN 27 #define BEEPER_PIN 27
#else // Sanguinololu 1.3 #else // Sanguinololu >=1.3
#define LCD_PINS_RS 4 #define LCD_PINS_RS 4
#define LCD_PINS_ENABLE 17 #define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 30 #define LCD_PINS_D4 30
@ -210,7 +221,7 @@
#if ENABLED(LCD_I2C_PANELOLU2) #if ENABLED(LCD_I2C_PANELOLU2)
#if IS_MELZI #if ENABLED(IS_MELZI)
#define BTN_ENC 29 #define BTN_ENC 29
#define LCD_SDSS 30 // Panelolu2 SD card reader rather than the Melzi #define LCD_SDSS 30 // Panelolu2 SD card reader rather than the Melzi
#else #else
@ -280,7 +291,7 @@
* MS3 O| |O 2A * MS3 O| |O 2A
* /RESET O| |O 1A * /RESET O| |O 1A
* /SLEEP O| |O 1B * /SLEEP O| |O 1B
* SPINDLE_LASER_PWM_PIN STEP O| |O VDD * SPINDLE_LASER_PWM_PIN STEP O| |O VDD
* SPINDLE_LASER_ENABLE_PIN DIR O| |O GND * SPINDLE_LASER_ENABLE_PIN DIR O| |O GND
* ------- * -------
* *

7
Marlin/pins_SANGUINOLOLU_12.h
View File

@ -27,15 +27,14 @@
* *
* AZTEEG_X1 * AZTEEG_X1
* MELZI * MELZI
* MELZI_CREALITY
* MELZI_MAKR3D * MELZI_MAKR3D
* SANGUINOLOLU_12 * SANGUINOLOLU_12
* STB_11 * STB_11
*/ */
#define BOARD_NAME "Sanguinololu 1.2" #ifndef BOARD_NAME
#define BOARD_NAME "Sanguinololu 1.2"
#ifdef __AVR_ATmega1284P__
#define LARGE_FLASH true
#endif #endif
#define SANGUINOLOLU_V_1_2 #define SANGUINOLOLU_V_1_2

8
Marlin/pins_STB_11.h
View File

@ -25,10 +25,4 @@
*/ */
#define BOARD_NAME "STB V1.1" #define BOARD_NAME "STB V1.1"
#include "pins_SANGUINOLOLU_12.h"
#ifdef __AVR_ATmega1284P__
#define LARGE_FLASH true
#endif
#define SANGUINOLOLU_V_1_2
#include "pins_SANGUINOLOLU_11.h"

2
Marlin/temperature.cpp
View File

@ -1559,7 +1559,7 @@ void Temperature::set_current_temp_raw() {
if (endstop_change) { if (endstop_change) {
#if HAS_X_MIN #if HAS_X_MIN
if (TEST(endstop_change, X_MIN)) SERIAL_PROTOCOLPAIR("X_MIN:", !!TEST(current_endstop_bits_local, X_MIN)); if (TEST(endstop_change, X_MIN)) SERIAL_PROTOCOLPAIR(" X_MIN:", !!TEST(current_endstop_bits_local, X_MIN));
#endif #endif
#if HAS_X_MAX #if HAS_X_MAX
if (TEST(endstop_change, X_MAX)) SERIAL_PROTOCOLPAIR(" X_MAX:", !!TEST(current_endstop_bits_local, X_MAX)); if (TEST(endstop_change, X_MAX)) SERIAL_PROTOCOLPAIR(" X_MAX:", !!TEST(current_endstop_bits_local, X_MAX));

6
platformio.ini
View File

@ -74,3 +74,9 @@ framework = arduino
board = sanguino_atmega1284p board = sanguino_atmega1284p
upload_speed = 57600 upload_speed = 57600
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
[env:sanguino_atmega644p]
platform = atmelavr
framework = arduino
board = sanguino_atmega644p
lib_deps = ${common.lib_deps}