Tweak pins formatting
This commit is contained in:
parent
ed96b507b9
commit
f4e15967e8
15 changed files with 17 additions and 17 deletions
|
@ -171,7 +171,7 @@
|
||||||
#define TEMP_2_PIN P0_26_A3 // A3 - (63) - J5-3 & AUX-2
|
#define TEMP_2_PIN P0_26_A3 // A3 - (63) - J5-3 & AUX-2
|
||||||
#define TEMP_3_PIN P1_30_A4 // A4 - (37) - BUZZER_PIN
|
#define TEMP_3_PIN P1_30_A4 // A4 - (37) - BUZZER_PIN
|
||||||
//#define TEMP_4_PIN P1_31_A5 // A5 - (49) - SD_DETECT_PIN
|
//#define TEMP_4_PIN P1_31_A5 // A5 - (49) - SD_DETECT_PIN
|
||||||
//#define ?? P0_03_A6 // A6 - ( 0) - RXD0 - J4-4 & AUX-1
|
//#define ?? P0_03_A6 // A6 - ( 0) - RXD0 - J4-4 & AUX-1
|
||||||
#define FILWIDTH_PIN P0_02_A7 // A7 - ( 1) - TXD0 - J4-5 & AUX-1
|
#define FILWIDTH_PIN P0_02_A7 // A7 - ( 1) - TXD0 - J4-5 & AUX-1
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
@ -112,7 +112,7 @@
|
||||||
#define E1_MS2_PIN 64
|
#define E1_MS2_PIN 64
|
||||||
|
|
||||||
#define DIGIPOTSS_PIN 38
|
#define DIGIPOTSS_PIN 38
|
||||||
#define DIGIPOT_CHANNELS { 4,5,3,0,1 } // X Y Z E0 E1 digipot channels to stepper driver mapping
|
#define DIGIPOT_CHANNELS { 4,5,3,0,1 } // X Y Z E0 E1 digipot channels to stepper driver mapping
|
||||||
#ifndef DIGIPOT_MOTOR_CURRENT
|
#ifndef DIGIPOT_MOTOR_CURRENT
|
||||||
#define DIGIPOT_MOTOR_CURRENT { 135,135,135,135,135 } // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
|
#define DIGIPOT_MOTOR_CURRENT { 135,135,135,135,135 } // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -92,7 +92,7 @@
|
||||||
#define E1_MS2_PIN 64
|
#define E1_MS2_PIN 64
|
||||||
|
|
||||||
#define DIGIPOTSS_PIN 38
|
#define DIGIPOTSS_PIN 38
|
||||||
#define DIGIPOT_CHANNELS {4,5,3,0,1} // X Y Z E0 E1 digipot channels to stepper driver mapping
|
#define DIGIPOT_CHANNELS {4,5,3,0,1} // X Y Z E0 E1 digipot channels to stepper driver mapping
|
||||||
|
|
||||||
//
|
//
|
||||||
// Temperature Sensors
|
// Temperature Sensors
|
||||||
|
|
|
@ -175,12 +175,12 @@ A stepper for E0 extruder
|
||||||
|
|
||||||
#define ADC_BUTTONS_VALUE_SCALE (5.0/AREF_VOLTS) // The LCD module pullup voltage is 5.0V but ADC reference voltage is 3.3V
|
#define ADC_BUTTONS_VALUE_SCALE (5.0/AREF_VOLTS) // The LCD module pullup voltage is 5.0V but ADC reference voltage is 3.3V
|
||||||
|
|
||||||
#define ADC_BUTTONS_R_PULLDOWN 4.7 // Moves voltage down to be bellow 3.3V instead of 5V
|
#define ADC_BUTTONS_R_PULLDOWN 4.7 // Moves voltage down to be bellow 3.3V instead of 5V
|
||||||
// the resistors values will be scaled because of 4.7K pulldown parallel resistor
|
// the resistors values will be scaled because of 4.7K pulldown parallel resistor
|
||||||
#define _ADC_BUTTONS_R_SCALED(R) ((R) * (ADC_BUTTONS_R_PULLDOWN) / ((R) + ADC_BUTTONS_R_PULLDOWN))
|
#define _ADC_BUTTONS_R_SCALED(R) ((R) * (ADC_BUTTONS_R_PULLDOWN) / ((R) + ADC_BUTTONS_R_PULLDOWN))
|
||||||
|
|
||||||
// buttons pullup resistor
|
// buttons pullup resistor
|
||||||
#define ADC_BUTTONS_R_PULLUP 4.7 // the resistor on the 2004 LCD panel
|
#define ADC_BUTTONS_R_PULLUP 4.7 // the resistor on the 2004 LCD panel
|
||||||
// buttons resistors with scaled values because of parallel pulldown resistor
|
// buttons resistors with scaled values because of parallel pulldown resistor
|
||||||
#define ADC_BUTTONS_LEFT_R_PULLDOWN _ADC_BUTTONS_R_SCALED(0.47)
|
#define ADC_BUTTONS_LEFT_R_PULLDOWN _ADC_BUTTONS_R_SCALED(0.47)
|
||||||
#define ADC_BUTTONS_RIGHT_R_PULLDOWN _ADC_BUTTONS_R_SCALED(4.7)
|
#define ADC_BUTTONS_RIGHT_R_PULLDOWN _ADC_BUTTONS_R_SCALED(4.7)
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
|
|
||||||
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||||
#define FLASH_EEPROM_EMULATION
|
#define FLASH_EEPROM_EMULATION
|
||||||
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
|
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
|
||||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
|
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
|
|
||||||
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||||
#define FLASH_EEPROM_EMULATION
|
#define FLASH_EEPROM_EMULATION
|
||||||
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
|
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
|
||||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
|
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
|
|
||||||
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||||
#define FLASH_EEPROM_EMULATION
|
#define FLASH_EEPROM_EMULATION
|
||||||
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
|
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
|
||||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
|
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
#if ENABLED(FLASH_EEPROM_EMULATION)
|
#if ENABLED(FLASH_EEPROM_EMULATION)
|
||||||
// SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
|
// SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
|
||||||
#define EEPROM_START_ADDRESS (0x8000000UL + (512 * 1024) - 2 * EEPROM_PAGE_SIZE)
|
#define EEPROM_START_ADDRESS (0x8000000UL + (512 * 1024) - 2 * EEPROM_PAGE_SIZE)
|
||||||
#define EEPROM_PAGE_SIZE (0x800U) // 2KB, but will use 2x more (4KB)
|
#define EEPROM_PAGE_SIZE (0x800U) // 2KB, but will use 2x more (4KB)
|
||||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
|
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
|
||||||
#else
|
#else
|
||||||
#define MARLIN_EEPROM_SIZE 0x800U // On SD, Limit to 2KB, require this amount of RAM
|
#define MARLIN_EEPROM_SIZE 0x800U // On SD, Limit to 2KB, require this amount of RAM
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
#if ENABLED(FLASH_EEPROM_EMULATION)
|
#if ENABLED(FLASH_EEPROM_EMULATION)
|
||||||
// SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
|
// SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
|
||||||
#define EEPROM_START_ADDRESS (0x8000000UL + (512 * 1024) - 2 * EEPROM_PAGE_SIZE)
|
#define EEPROM_START_ADDRESS (0x8000000UL + (512 * 1024) - 2 * EEPROM_PAGE_SIZE)
|
||||||
#define EEPROM_PAGE_SIZE (0x800U) // 2KB, but will use 2x more (4KB)
|
#define EEPROM_PAGE_SIZE (0x800U) // 2KB, but will use 2x more (4KB)
|
||||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
|
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
|
||||||
#else
|
#else
|
||||||
#define MARLIN_EEPROM_SIZE 0x800U // On SD, Limit to 2KB, require this amount of RAM
|
#define MARLIN_EEPROM_SIZE 0x800U // On SD, Limit to 2KB, require this amount of RAM
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
|
|
||||||
#define DISABLE_JTAG
|
#define DISABLE_JTAG
|
||||||
|
|
||||||
#define pins_v2_20190128 // new pins define
|
#define pins_v2_20190128 // new pins define
|
||||||
|
|
||||||
// Ignore temp readings during development.
|
// Ignore temp readings during development.
|
||||||
//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
|
//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
|
||||||
|
@ -40,7 +40,7 @@
|
||||||
//
|
//
|
||||||
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||||
#define FLASH_EEPROM_EMULATION
|
#define FLASH_EEPROM_EMULATION
|
||||||
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
|
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
|
||||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
|
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
|
|
||||||
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||||
#define FLASH_EEPROM_EMULATION
|
#define FLASH_EEPROM_EMULATION
|
||||||
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
|
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
|
||||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
|
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -163,7 +163,7 @@
|
||||||
#define MARLIN_EEPROM_SIZE 16UL * (EEPROM_PAGE_SIZE) // Limit to 64KB for now...
|
#define MARLIN_EEPROM_SIZE 16UL * (EEPROM_PAGE_SIZE) // Limit to 64KB for now...
|
||||||
#elif ENABLED(FLASH_EEPROM_EMULATION)
|
#elif ENABLED(FLASH_EEPROM_EMULATION)
|
||||||
// SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
|
// SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
|
||||||
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
|
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
|
||||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||||
#define MARLIN_EEPROM_SIZE (EEPROM_PAGE_SIZE)
|
#define MARLIN_EEPROM_SIZE (EEPROM_PAGE_SIZE)
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
//
|
//
|
||||||
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||||
#define FLASH_EEPROM_EMULATION
|
#define FLASH_EEPROM_EMULATION
|
||||||
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
|
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
|
||||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
|
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||||
#define FLASH_EEPROM_EMULATION
|
#define FLASH_EEPROM_EMULATION
|
||||||
// 2K in a AT24C16N
|
// 2K in a AT24C16N
|
||||||
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
|
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
|
||||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
|
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -144,7 +144,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define SDIO_SUPPORT
|
#define SDIO_SUPPORT
|
||||||
#define SDIO_CLOCK 4500000 // 4.5 MHz
|
#define SDIO_CLOCK 4500000 // 4.5 MHz
|
||||||
#define SD_DETECT_PIN PD12
|
#define SD_DETECT_PIN PD12
|
||||||
#define ONBOARD_SD_CS_PIN PC11
|
#define ONBOARD_SD_CS_PIN PC11
|
||||||
|
|
||||||
|
|
Reference in a new issue