Commit 51f681c3 authored by MagoKimbra's avatar MagoKimbra

Uèdate

parent 9d2107e2
### Version 4.1.4 ### Version 4.1.4
* Add support for Piggy Alligator board
* Add Debug_info. Repetier button info for enabled or disabled, or M111 S2 for enabled and M111 S0 for disabled. * Add Debug_info. Repetier button info for enabled or disabled, or M111 S2 for enabled and M111 S0 for disabled.
* Improved Topography Auto Bed Level. * Improved Topography Auto Bed Level.
* Add Dryrun ABL and verbose width command G29 D or G29 V(0-4). * Add Dryrun ABL and verbose width command G29 D or G29 V(0-4).
......
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
#define MICROSTEP_MODES {16, 16, 16, 16} // X Y Z E - [1,2,4,8,16,32] #define MICROSTEP_MODES {16, 16, 16, 16} // X Y Z E - [1,2,4,8,16,32]
// Motor Current setting (Only functional on ALLIGATOR BOARD) // Motor Current setting (Only functional on ALLIGATOR BOARD)
#define MOTOR_CURRENT {1, 1, 1, 1} // X Y Z E - Values 0 - 2.5 A #define MOTOR_CURRENT {1, 1, 1, 1, 1, 1, 1} // X Y Z E0 E1 E2 E3 - Values 0 - 2.5 A
// Motor Current setting (Only functional when motor driver current ref pins are connected to a digital trimpot on supported boards) // Motor Current setting (Only functional when motor driver current ref pins are connected to a digital trimpot on supported boards)
#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)
......
...@@ -2488,28 +2488,26 @@ ...@@ -2488,28 +2488,26 @@
#define Z_MS1_PIN 44 // PC19 #define Z_MS1_PIN 44 // PC19
#define Z_PROBE_PIN 39 // PC7 #define Z_PROBE_PIN 39 // PC7
// E AXIS // E0 AXIS
#define ORIG_E0_STEP_PIN 5 // PC25 #define ORIG_E0_STEP_PIN 5 // PC25
#define ORIG_E0_DIR_PIN 4 // PC26 #define ORIG_E0_DIR_PIN 4 // PC26
#define ORIG_E0_ENABLE_PIN 24 // PA15, motor RESET pin #define ORIG_E0_ENABLE_PIN 24 // PA15, motor RESET pin
#define E0_MS1_PIN 45 // PC18 #define E0_MS1_PIN 45 // PC18
/* // E1 AXIS
#define ORIG_E1_STEP_PIN 28 // PD3 on piggy #define ORIG_E1_STEP_PIN 28 // PD3 on piggy
#define ORIG_E1_DIR_PIN 27 // PD2 on piggy #define ORIG_E1_DIR_PIN 27 // PD2 on piggy
#define ORIG_E1_ENABLE_PIN -1 #define ORIG_E1_ENABLE_PIN 24 // PA15, motor RESET pin
#define E1_MS1_PIN -1
// E2 AXIS
#define ORIG_E2_STEP_PIN 11 // PD7 on piggy #define ORIG_E2_STEP_PIN 11 // PD7 on piggy
#define ORIG_E2_DIR_PIN 29 // PD6 on piggy #define ORIG_E2_DIR_PIN 29 // PD6 on piggy
#define ORIG_E2_ENABLE_PIN -1 #define ORIG_E2_ENABLE_PIN 24 // PA15, motor RESET pin
#define E2_MS_PIN -1
// E3 AXIS
#define ORIG_E3_STEP_PIN 30 // PD9 on piggy #define ORIG_E3_STEP_PIN 30 // PD9 on piggy
#define ORIG_E3_DIR_PIN 12 // PD8 on piggy #define ORIG_E3_DIR_PIN 12 // PD8 on piggy
#define ORIG_E3_ENABLE_PIN -1 #define ORIG_E3_ENABLE_PIN 24 // PA15, motor RESET pin
#define E3_MS_PIN -1
*/
#define MOTOR_FAULT_PIN 22 // PB26 , motor X-Y-Z-E0 motor FAULT #define MOTOR_FAULT_PIN 22 // PB26 , motor X-Y-Z-E0 motor FAULT
...@@ -2525,25 +2523,19 @@ ...@@ -2525,25 +2523,19 @@
#define PS_ON_PIN -1 #define PS_ON_PIN -1
#define KILL_PIN -1 #define KILL_PIN -1
#define SUICIDE_PIN -1 //PIN that has to be turned on right after start, to keep power flowing. #define SUICIDE_PIN -1 //PIN that has to be turned on right after start, to keep power flowing.
#define HEAT_OFF_INT_PIN 50 // PC13 on raspberry expansion
// Note that on the Due pin A0 on the board is channel 2 on the ARM chip // Note that on the Due pin A0 on the board is channel 2 on the ARM chip
#define ORIG_HEATER_BED_PIN 69 // PA0 #define ORIG_HEATER_BED_PIN 69 // PA0
#define ORIG_HEATER_0_PIN 68 // PA1 #define ORIG_HEATER_0_PIN 68 // PA1
/* #define ORIG_HEATER_1_PIN 8 // PC22 on piggy
#define ORIG_HEATER_1_PIN 8 // PC22 on piggy #define ORIG_HEATER_2_PIN 9 // PC21 on piggy
#define ORIG_HEATER_2_PIN 9 // PC21 on piggy #define ORIG_HEATER_3_PIN 97 // PC20 on piggy
#define ORIG_HEATER_3_PIN 97 // PC20 on piggy
*/ #define ORIG_TEMP_BED_PIN 0 // PA16
#define ORIG_TEMP_0_PIN 1 // PA24, analog pin
#define ORIG_TEMP_BED_PIN 0 // PA16 #define ORIG_TEMP_1_PIN 2 // PA23 analog pin on piggy
#define ORIG_TEMP_0_PIN 1 // PA24, analog pin #define ORIG_TEMP_2_PIN 3 // PA22, analog pin on piggy
/* #define ORIG_TEMP_3_PIN 4 // PA6, analog on piggy
#define ORIG_TEMP_1_PIN 5 // PA23 analog pin on piggy
#define ORIG_TEMP_2_PIN 4 // PA22, analog pin on piggy
#define ORIG_TEMP_3_PIN 3 // PA6, analog on piggy
*/
#define LED_RED_PIN 40 // PC8 #define LED_RED_PIN 40 // PC8
#define LED_GREEN_PIN 41 // PC9 #define LED_GREEN_PIN 41 // PC9
...@@ -2551,7 +2543,8 @@ ...@@ -2551,7 +2543,8 @@
#define EXP_VOLTAGE_LEVEL_PIN 65 #define EXP_VOLTAGE_LEVEL_PIN 65
#define DAC_SYNC 53 // PB14 #define DAC0_SYNC 53 // PB14
#define DAC1_SYNC 6 // PC24
//64K SPI EEPROM //64K SPI EEPROM
#define SPI_CHAN_EEPROM1 2 #define SPI_CHAN_EEPROM1 2
......
...@@ -289,7 +289,14 @@ void checkHitEndstops() { ...@@ -289,7 +289,14 @@ void checkHitEndstops() {
} }
} }
void enable_endstops(bool check) { check_endstops = check; } void enable_endstops(bool check) {
if (debugLevel & DEBUG_INFO) {
ECHO_SM(DB, "setup_for_endstop_move > enable_endstops");
if (check) ECHO_EM("(true)");
else ECHO_EM("(false)");
}
check_endstops = check;
}
// Check endstops // Check endstops
inline void update_endstops() { inline void update_endstops() {
...@@ -1251,7 +1258,7 @@ void digipot_init() { ...@@ -1251,7 +1258,7 @@ void digipot_init() {
#if MB(ALLIGATOR) #if MB(ALLIGATOR)
const float motor_current[] = MOTOR_CURRENT; const float motor_current[] = MOTOR_CURRENT;
unsigned int digipot_motor = 0; unsigned int digipot_motor = 0;
for (uint8_t i = 0; i < 4; i++) { for (uint8_t i = 0; i < 3 + DRIVER_EXTRUDERS; i++) {
digipot_motor = 255 * (motor_current[i] / 2.5); digipot_motor = 255 * (motor_current[i] / 2.5);
ExternalDac::setValue(i, digipot_motor); ExternalDac::setValue(i, digipot_motor);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment