From eebaf039499c6ffadf10a55f720bba7d57100b87 Mon Sep 17 00:00:00 2001 From: repetier Date: Tue, 8 Jul 2014 15:30:15 +0200 Subject: [PATCH 01/20] Fixed CoreXY for Arduino Due --- src/ArduinoAVR/Repetier/Printer.cpp | 4 ++-- src/ArduinoAVR/Repetier/Printer.h | 4 ++-- src/ArduinoDUE/Repetier/Printer.cpp | 4 ++-- src/ArduinoDUE/Repetier/Printer.h | 4 ++-- src/ArduinoDUE/Repetier/ui.h | 34 ++++++++++++++--------------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/ArduinoAVR/Repetier/Printer.cpp b/src/ArduinoAVR/Repetier/Printer.cpp index 2e7c5e69d..f2be099d1 100644 --- a/src/ArduinoAVR/Repetier/Printer.cpp +++ b/src/ArduinoAVR/Repetier/Printer.cpp @@ -141,8 +141,8 @@ float Printer::memoryZ; float Printer::memoryE; #endif #ifdef XY_GANTRY -char Printer::motorX; -char Printer::motorY; +int8_t Printer::motorX; +int8_t Printer::motorY; #endif #ifdef DEBUG_SEGMENT_LENGTH float Printer::maxRealSegmentLength = 0; diff --git a/src/ArduinoAVR/Repetier/Printer.h b/src/ArduinoAVR/Repetier/Printer.h index 942248ee0..c324d1fb6 100644 --- a/src/ArduinoAVR/Repetier/Printer.h +++ b/src/ArduinoAVR/Repetier/Printer.h @@ -156,8 +156,8 @@ class Printer static float memoryE; #endif #ifdef XY_GANTRY - static char motorX; - static char motorY; + static int8_t motorX; + static int8_t motorY; #endif #ifdef DEBUG_SEGMENT_LENGTH static float maxRealSegmentLength; diff --git a/src/ArduinoDUE/Repetier/Printer.cpp b/src/ArduinoDUE/Repetier/Printer.cpp index 2e7c5e69d..f2be099d1 100644 --- a/src/ArduinoDUE/Repetier/Printer.cpp +++ b/src/ArduinoDUE/Repetier/Printer.cpp @@ -141,8 +141,8 @@ float Printer::memoryZ; float Printer::memoryE; #endif #ifdef XY_GANTRY -char Printer::motorX; -char Printer::motorY; +int8_t Printer::motorX; +int8_t Printer::motorY; #endif #ifdef DEBUG_SEGMENT_LENGTH float Printer::maxRealSegmentLength = 0; diff --git a/src/ArduinoDUE/Repetier/Printer.h b/src/ArduinoDUE/Repetier/Printer.h index 942248ee0..c324d1fb6 100644 --- a/src/ArduinoDUE/Repetier/Printer.h +++ b/src/ArduinoDUE/Repetier/Printer.h @@ -156,8 +156,8 @@ class Printer static float memoryE; #endif #ifdef XY_GANTRY - static char motorX; - static char motorY; + static int8_t motorX; + static int8_t motorY; #endif #ifdef DEBUG_SEGMENT_LENGTH static float maxRealSegmentLength; diff --git a/src/ArduinoDUE/Repetier/ui.h b/src/ArduinoDUE/Repetier/ui.h index 7822c92a1..7b8ce95cf 100644 --- a/src/ArduinoDUE/Repetier/ui.h +++ b/src/ArduinoDUE/Repetier/ui.h @@ -1015,18 +1015,18 @@ void ui_check_slow_keys(int &action) {} #define UI_DISPLAY_I2C_OUTPUT_START_MASK 0 #define UI_DISPLAY_I2C_PULLUP 31 #define UI_I2C_CLOCKSPEED 400000L -#define UI_DISPLAY_RS_PIN BV(15) -#define UIDISPLAY_RW_PIN BV(14) -#define UIDISPLAY_ENABLE_PIN BV(13) -#define UIDISPLAY_D0_PIN BV(12) -#define UIDISPLAY_D1_PIN BV(11) -#define UIDISPLAY_D2_PIN BV(10) -#define UIDISPLAY_D3_PIN BV(9) -#define UIDISPLAY_D4_PIN BV(12) -#define UIDISPLAY_D5_PIN BV(11) -#define UIDISPLAY_D6_PIN BV(10) -#define UIDISPLAY_D7_PIN BV(9) -#define UIINVERT_MENU_DIRECTION false +#define UI_DISPLAY_RS_PIN _BV(15) +#define UI_DISPLAY_RW_PIN _BV(14) +#define UI_DISPLAY_ENABLE_PIN _BV(13) +#define UI_DISPLAY_D0_PIN _BV(12) +#define UI_DISPLAY_D1_PIN _BV(11) +#define UI_DISPLAY_D2_PIN _BV(10) +#define UI_DISPLAY_D3_PIN _BV(9) +#define UI_DISPLAY_D4_PIN _BV(12) +#define UI_DISPLAY_D5_PIN _BV(11) +#define UI_DISPLAY_D6_PIN _BV(10) +#define UI_DISPLAY_D7_PIN _BV(9) +#define UI_INVERT_MENU_DIRECTION false #define UI_HAS_I2C_KEYS #define UI_HAS_I2C_ENCODER 0 #define UI_I2C_KEY_ADDRESS 0x40 @@ -1051,11 +1051,11 @@ HAL::i2cStartWait(UI_DISPLAY_I2C_ADDRESS+I2C_READ); unsigned int keymask = HAL::i2cReadAck(); keymask = keymask + (HAL::i2cReadNak()<<8); HAL::i2cStop(); -UI_KEYS_I2C_BUTTON_LOW(BV(4),UIACTION_OK); // push button, connects gnd to pin -UI_KEYS_I2C_BUTTON_LOW(BV(1),UIACTION_BACK); // push button, connects gnd to pin -UI_KEYS_I2C_BUTTON_LOW(BV(0),UIACTION_SD_PRINT); // push button, connects gnd to pin -UI_KEYS_I2C_BUTTON_LOW(BV(3),UIACTION_PREVIOUS); // Up button -UI_KEYS_I2C_BUTTON_LOW(BV(2),UIACTION_NEXT); // down button +UI_KEYS_I2C_BUTTON_LOW(_BV(4),UI_ACTION_OK); // push button, connects gnd to pin +UI_KEYS_I2C_BUTTON_LOW(_BV(1),UI_ACTION_BACK); // push button, connects gnd to pin +UI_KEYS_I2C_BUTTON_LOW(_BV(0),UI_ACTION_SD_PRINT); // push button, connects gnd to pin +UI_KEYS_I2C_BUTTON_LOW(_BV(3),UI_ACTION_PREVIOUS); // Up button +UI_KEYS_I2C_BUTTON_LOW(_BV(2),UI_ACTION_NEXT); // down button } #endif #endif // Controller 14 From 4f8a7c897d73e36834da00ac9b8629d6e5da8aec Mon Sep 17 00:00:00 2001 From: repetier Date: Mon, 28 Jul 2014 09:08:07 +0200 Subject: [PATCH 02/20] RADDS display, GLCD display fix --- src/ArduinoAVR/Repetier/HAL.h | 2 +- src/ArduinoAVR/Repetier/ui.h | 10 ++++++++-- src/ArduinoAVR/Repetier/uimenu.h | 6 +++--- src/ArduinoDUE/Repetier/ui.h | 10 ++++++++-- src/ArduinoDUE/Repetier/uimenu.h | 6 +++--- 5 files changed, 23 insertions(+), 11 deletions(-) diff --git a/src/ArduinoAVR/Repetier/HAL.h b/src/ArduinoAVR/Repetier/HAL.h index 7a2f2f6a5..711c524cf 100644 --- a/src/ArduinoAVR/Repetier/HAL.h +++ b/src/ArduinoAVR/Repetier/HAL.h @@ -57,7 +57,7 @@ All known arduino boards use 64. This value is needed for the extruder timing. * #define ANALOG_PRESCALER _BV(ADPS0)|_BV(ADPS1)|_BV(ADPS2) -#if MOTHERBOARD==8 || MOTHERBOARD==9 || CPU_ARCH!=ARCH_AVR +#if MOTHERBOARD==8 || MOTHERBOARD==88 || MOTHERBOARD==9 || CPU_ARCH!=ARCH_AVR #define EXTERNALSERIAL #endif //#define EXTERNALSERIAL // Force using arduino serial diff --git a/src/ArduinoAVR/Repetier/ui.h b/src/ArduinoAVR/Repetier/ui.h index 7b8ce95cf..7cd7ec6a6 100644 --- a/src/ArduinoAVR/Repetier/ui.h +++ b/src/ArduinoAVR/Repetier/ui.h @@ -790,8 +790,11 @@ void ui_check_slow_keys(int &action) { #endif #endif // Controller 6 #if FEATURE_CONTROLLER==7 // RADDS pin assignment for displays +#define SDSS 10 +#define SPI_PIN 77 +#define SPI_CHAN 0 #define UI_HAS_KEYS 1 -#define UI_HAS_BACK_KEY 0 +#define UI_HAS_BACK_KEY 1 #define UI_DISPLAY_TYPE 1 #define UI_DISPLAY_CHARSET 1 #define BEEPER_TYPE 1 @@ -814,15 +817,18 @@ void ui_check_slow_keys(int &action) { #define UI_ENCODER_CLICK 48 #define UI_RESET_PIN -1 #define UI_DELAYPERCHAR 40 -#define UI_INVERT_MENU_DIRECTION false +#define UI_INVERT_MENU_DIRECTION true +#define UI_BUTTON_BACK 71 #ifdef UI_MAIN void ui_init_keys() { UI_KEYS_INIT_CLICKENCODER_LOW(UI_ENCODER_A,UI_ENCODER_B); // click encoder on pins 47 and 45. Phase is connected with gnd for signals. UI_KEYS_INIT_BUTTON_LOW(UI_ENCODER_CLICK); // push button, connects gnd to pin + UI_KEYS_INIT_BUTTON_LOW(UI_BUTTON_BACK); } void ui_check_keys(int &action) { UI_KEYS_CLICKENCODER_LOW_REV(UI_ENCODER_A,UI_ENCODER_B); // click encoder on pins 47 and 45. Phase is connected with gnd for signals. UI_KEYS_BUTTON_LOW(UI_ENCODER_CLICK,UI_ACTION_OK); // push button, connects gnd to pin + UI_KEYS_BUTTON_LOW(UI_BUTTON_BACK,UI_ACTION_BACK); } inline void ui_check_slow_encoder() {} void ui_check_slow_keys(int &action) {} diff --git a/src/ArduinoAVR/Repetier/uimenu.h b/src/ArduinoAVR/Repetier/uimenu.h index cba82802a..c4e14f0ab 100644 --- a/src/ArduinoAVR/Repetier/uimenu.h +++ b/src/ArduinoAVR/Repetier/uimenu.h @@ -180,7 +180,7 @@ UI_PAGE2(name,row1,row2); for 2 row displays. You can add additional pages or change the default pages like you want. */ -#if UI_ROWS>=6 && UI_DISPLAY_TYPE == DISPLAY_U8G +#if UI_ROWS>=6 && UI_DISPLAY_TYPE == 5 //graphic main status @@ -188,12 +188,12 @@ for 2 row displays. You can add additional pages or change the default pages lik #if NUM_EXTRUDER>1 "\xa %e1/%E1\xb0 Y:%x1", #else - "\xa -----/---\xb0 Y:%x1", + " Y:%x1", #endif #if HAVE_HEATED_BED==true "\xe %eb/%Eb\xb0 Z:%x2", #else - "\xb -----/---\xb0 Z:%x2", + "Fan %Fs%%% Z:%x2", #endif "Mul:%om", "Buf:%oB", "%os"); diff --git a/src/ArduinoDUE/Repetier/ui.h b/src/ArduinoDUE/Repetier/ui.h index 7b8ce95cf..7cd7ec6a6 100644 --- a/src/ArduinoDUE/Repetier/ui.h +++ b/src/ArduinoDUE/Repetier/ui.h @@ -790,8 +790,11 @@ void ui_check_slow_keys(int &action) { #endif #endif // Controller 6 #if FEATURE_CONTROLLER==7 // RADDS pin assignment for displays +#define SDSS 10 +#define SPI_PIN 77 +#define SPI_CHAN 0 #define UI_HAS_KEYS 1 -#define UI_HAS_BACK_KEY 0 +#define UI_HAS_BACK_KEY 1 #define UI_DISPLAY_TYPE 1 #define UI_DISPLAY_CHARSET 1 #define BEEPER_TYPE 1 @@ -814,15 +817,18 @@ void ui_check_slow_keys(int &action) { #define UI_ENCODER_CLICK 48 #define UI_RESET_PIN -1 #define UI_DELAYPERCHAR 40 -#define UI_INVERT_MENU_DIRECTION false +#define UI_INVERT_MENU_DIRECTION true +#define UI_BUTTON_BACK 71 #ifdef UI_MAIN void ui_init_keys() { UI_KEYS_INIT_CLICKENCODER_LOW(UI_ENCODER_A,UI_ENCODER_B); // click encoder on pins 47 and 45. Phase is connected with gnd for signals. UI_KEYS_INIT_BUTTON_LOW(UI_ENCODER_CLICK); // push button, connects gnd to pin + UI_KEYS_INIT_BUTTON_LOW(UI_BUTTON_BACK); } void ui_check_keys(int &action) { UI_KEYS_CLICKENCODER_LOW_REV(UI_ENCODER_A,UI_ENCODER_B); // click encoder on pins 47 and 45. Phase is connected with gnd for signals. UI_KEYS_BUTTON_LOW(UI_ENCODER_CLICK,UI_ACTION_OK); // push button, connects gnd to pin + UI_KEYS_BUTTON_LOW(UI_BUTTON_BACK,UI_ACTION_BACK); } inline void ui_check_slow_encoder() {} void ui_check_slow_keys(int &action) {} diff --git a/src/ArduinoDUE/Repetier/uimenu.h b/src/ArduinoDUE/Repetier/uimenu.h index cba82802a..c4e14f0ab 100644 --- a/src/ArduinoDUE/Repetier/uimenu.h +++ b/src/ArduinoDUE/Repetier/uimenu.h @@ -180,7 +180,7 @@ UI_PAGE2(name,row1,row2); for 2 row displays. You can add additional pages or change the default pages like you want. */ -#if UI_ROWS>=6 && UI_DISPLAY_TYPE == DISPLAY_U8G +#if UI_ROWS>=6 && UI_DISPLAY_TYPE == 5 //graphic main status @@ -188,12 +188,12 @@ for 2 row displays. You can add additional pages or change the default pages lik #if NUM_EXTRUDER>1 "\xa %e1/%E1\xb0 Y:%x1", #else - "\xa -----/---\xb0 Y:%x1", + " Y:%x1", #endif #if HAVE_HEATED_BED==true "\xe %eb/%Eb\xb0 Z:%x2", #else - "\xb -----/---\xb0 Z:%x2", + "Fan %Fs%%% Z:%x2", #endif "Mul:%om", "Buf:%oB", "%os"); From 39992790149b5c2c48dac4728a030211dec2abf8 Mon Sep 17 00:00:00 2001 From: repetier Date: Wed, 30 Jul 2014 14:44:07 +0200 Subject: [PATCH 03/20] Fit to use extruder motor pins E3-5 in config tool --- src/ArduinoAVR/Repetier/pins.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/ArduinoAVR/Repetier/pins.h b/src/ArduinoAVR/Repetier/pins.h index 6db80164f..cfd4798bf 100644 --- a/src/ArduinoAVR/Repetier/pins.h +++ b/src/ArduinoAVR/Repetier/pins.h @@ -2239,6 +2239,18 @@ S3(ext)=9 #define E2_DIR_PIN ORIG_E2_DIR_PIN #define E2_ENABLE_PIN ORIG_E2_ENABLE_PIN +#define E3_STEP_PIN ORIG_E3_STEP_PIN +#define E3_DIR_PIN ORIG_E3_DIR_PIN +#define E3_ENABLE_PIN ORIG_E3_ENABLE_PIN + +#define E4_STEP_PIN ORIG_E4_STEP_PIN +#define E4_DIR_PIN ORIG_E4_DIR_PIN +#define E4_ENABLE_PIN ORIG_E4_ENABLE_PIN + +#define E5_STEP_PIN ORIG_E5_STEP_PIN +#define E5_DIR_PIN ORIG_E5_DIR_PIN +#define E5_ENABLE_PIN ORIG_E5_ENABLE_PIN + #define FAN_PIN ORIG_FAN_PIN #define FAN2_PIN ORIG_FAN2_PIN From af1c0b5ac120d85abba43863a046377eab7fd788 Mon Sep 17 00:00:00 2001 From: repetier Date: Sat, 9 Aug 2014 15:44:53 +0200 Subject: [PATCH 04/20] Fixed PID auto tune bug, ditto printing with up to 4 extruder --- src/ArduinoAVR/Repetier/Commands.cpp | 2 +- src/ArduinoAVR/Repetier/Extruder.cpp | 26 +++++++++++++++++++++++++- src/ArduinoAVR/Repetier/Extruder.h | 28 ++++++++++++++++++++++++++++ src/ArduinoAVR/Repetier/Repetier.h | 4 ++-- src/ArduinoAVR/Repetier/Repetier.ino | 2 +- src/ArduinoDUE/Repetier/Commands.cpp | 2 +- src/ArduinoDUE/Repetier/Extruder.cpp | 26 +++++++++++++++++++++++++- src/ArduinoDUE/Repetier/Extruder.h | 28 ++++++++++++++++++++++++++++ src/ArduinoDUE/Repetier/Repetier.h | 4 ++-- src/ArduinoDUE/Repetier/Repetier.ino | 2 +- 10 files changed, 114 insertions(+), 10 deletions(-) diff --git a/src/ArduinoAVR/Repetier/Commands.cpp b/src/ArduinoAVR/Repetier/Commands.cpp index 7b7bd99a8..bfb1ea5b6 100644 --- a/src/ArduinoAVR/Repetier/Commands.cpp +++ b/src/ArduinoAVR/Repetier/Commands.cpp @@ -1053,7 +1053,7 @@ void Commands::executeGCode(GCode *com) break; #if FEATURE_DITTO_PRINTING case 280: - if(com->hasS()) // Set ditto mode S: 0 = off, 1 = on + if(com->hasS()) // Set ditto mode S: 0 = off, 1 = 1 extra extruder, 2 = 2 extra extruder, 3 = 3 extra extruders { Extruder::dittoMode = com->S; } diff --git a/src/ArduinoAVR/Repetier/Extruder.cpp b/src/ArduinoAVR/Repetier/Extruder.cpp index 228b808cb..eb2cfe6c9 100644 --- a/src/ArduinoAVR/Repetier/Extruder.cpp +++ b/src/ArduinoAVR/Repetier/Extruder.cpp @@ -412,6 +412,22 @@ void Extruder::setTemperatureForExtruder(float temperatureInCelsius,uint8_t extr TemperatureController *tc2 = tempController[1]; tc2->setTargetTemperature(temperatureInCelsius); if(temperatureInCelsius>=EXTRUDER_FAN_COOL_TEMP) extruder[1].coolerPWM = extruder[1].coolerSpeed; +#if NUM_EXTRUDER > 2 + if(Extruder::dittoMode > 1 && extr == 0) + { + TemperatureController *tc2 = tempController[2]; + tc2->setTargetTemperature(temperatureInCelsius); + if(temperatureInCelsius>=EXTRUDER_FAN_COOL_TEMP) extruder[2].coolerPWM = extruder[2].coolerSpeed; + } +#endif +#if NUM_EXTRUDER > 3 + if(Extruder::dittoMode > 2 && extr == 0) + { + TemperatureController *tc2 = tempController[3]; + tc2->setTargetTemperature(temperatureInCelsius); + if(temperatureInCelsius>=EXTRUDER_FAN_COOL_TEMP) extruder[3].coolerPWM = extruder[3].coolerSpeed; + } +#endif } #endif // FEATURE_DITTO_PRINTING bool alloff = true; @@ -456,6 +472,14 @@ void Extruder::disableCurrentExtruderMotor() { if(extruder[1].enablePin > -1) digitalWrite(extruder[1].enablePin,!extruder[1].enableOn); +#if NUM_EXTRUDER > 2 + if(Extruder::dittoMode > 1 && extruder[2].enablePin > -1) + digitalWrite(extruder[2].enablePin,!extruder[2].enableOn); +#endif +#if NUM_EXTRUDER > 3 + if(Extruder::dittoMode > 2 && extruder[3].enablePin > -1) + digitalWrite(extruder[3].enablePin,!extruder[3].enableOn); +#endif } #endif } @@ -1021,7 +1045,7 @@ void TemperatureController::autotunePID(float temp,uint8_t controllerId,bool sto Extruder::disableAllHeater(); if(storeValues) { - pidDGain = Kp; + pidPGain = Kp; pidIGain = Ki; pidDGain = Kd; heatManager = 1; diff --git a/src/ArduinoAVR/Repetier/Extruder.h b/src/ArduinoAVR/Repetier/Extruder.h index b65d6fca8..7506d22ba 100644 --- a/src/ArduinoAVR/Repetier/Extruder.h +++ b/src/ArduinoAVR/Repetier/Extruder.h @@ -114,6 +114,16 @@ class Extruder // Size: 12*1 Byte+12*4 Byte+4*2Byte = 68 Byte #if FEATURE_DITTO_PRINTING if(Extruder::dittoMode) { WRITE(EXT1_STEP_PIN,HIGH); +#if NUM_EXTRUDER > 2 + if(Extruder::dittoMode > 1) { + WRITE(EXT2_STEP_PIN,HIGH); + } +#endif +#if NUM_EXTRUDER > 3 + if(Extruder::dittoMode > 2) { + WRITE(EXT3_STEP_PIN,HIGH); + } +#endif } #endif #endif @@ -163,6 +173,16 @@ class Extruder // Size: 12*1 Byte+12*4 Byte+4*2Byte = 68 Byte #if FEATURE_DITTO_PRINTING if(Extruder::dittoMode) { WRITE(EXT1_STEP_PIN,LOW); +#if NUM_EXTRUDER > 2 + if(Extruder::dittoMode > 1) { + WRITE(EXT2_STEP_PIN,LOW); + } +#endif +#if NUM_EXTRUDER > 3 + if(Extruder::dittoMode > 2) { + WRITE(EXT3_STEP_PIN,LOW); + } +#endif } #endif #endif @@ -278,6 +298,14 @@ class Extruder // Size: 12*1 Byte+12*4 Byte+4*2Byte = 68 Byte if(Extruder::dittoMode) { if(extruder[1].enablePin > -1) digitalWrite(extruder[1].enablePin,extruder[1].enableOn); +#if NUM_EXTRUDER > 2 + if(Extruder::dittoMode > 1 && extruder[2].enablePin > -1) + digitalWrite(extruder[2].enablePin,extruder[2].enableOn); +#endif +#if NUM_EXTRUDER > 3 + if(Extruder::dittoMode > 2 && extruder[3].enablePin > -1) + digitalWrite(extruder[3].enablePin,extruder[3].enableOn); +#endif } #endif #endif diff --git a/src/ArduinoAVR/Repetier/Repetier.h b/src/ArduinoAVR/Repetier/Repetier.h index 2d76359a3..b0e4f38e4 100644 --- a/src/ArduinoAVR/Repetier/Repetier.h +++ b/src/ArduinoAVR/Repetier/Repetier.h @@ -369,8 +369,8 @@ extern void linear_move(long steps_remaining[]); #ifndef FEATURE_DITTO_PRINTING #define FEATURE_DITTO_PRINTING false #endif -#if FEATURE_DITTO_PRINTING && NUM_EXTRUDER!=2 -#error Ditto printing requires exactly 2 extruder. +#if FEATURE_DITTO_PRINTING && (NUM_EXTRUDER > 4 || NUM_EXTRUDER < 2) +#error Ditto printing requires 2 - 4 extruder. #endif diff --git a/src/ArduinoAVR/Repetier/Repetier.ino b/src/ArduinoAVR/Repetier/Repetier.ino index 6d3a44058..66c985f3a 100644 --- a/src/ArduinoAVR/Repetier/Repetier.ino +++ b/src/ArduinoAVR/Repetier/Repetier.ino @@ -107,7 +107,7 @@ Custom M Codes - M232 - Read and reset max. advance values - M233 X Y - Set temporary advance K-value to X and linear term advanceL to Y - M251 Measure Z steps from homing stop (Delta printers). S0 - Reset, S1 - Print, S2 - Store to Z length (also EEPROM if enabled) -- M280 S - Set ditto printing mode. mode: 0 = off, 1 = on +- M280 S - Set ditto printing mode. mode: 0 = off, 1 = 2 extruder, 2 = 3 extruder, 3 = 4 extruder printing - M300 S P play frequency - M303 P S X0 - Autodetect pid values. Use P for heated bed. X0 saves result in EEPROM. - M320 - Activate autolevel diff --git a/src/ArduinoDUE/Repetier/Commands.cpp b/src/ArduinoDUE/Repetier/Commands.cpp index 7b7bd99a8..bfb1ea5b6 100644 --- a/src/ArduinoDUE/Repetier/Commands.cpp +++ b/src/ArduinoDUE/Repetier/Commands.cpp @@ -1053,7 +1053,7 @@ void Commands::executeGCode(GCode *com) break; #if FEATURE_DITTO_PRINTING case 280: - if(com->hasS()) // Set ditto mode S: 0 = off, 1 = on + if(com->hasS()) // Set ditto mode S: 0 = off, 1 = 1 extra extruder, 2 = 2 extra extruder, 3 = 3 extra extruders { Extruder::dittoMode = com->S; } diff --git a/src/ArduinoDUE/Repetier/Extruder.cpp b/src/ArduinoDUE/Repetier/Extruder.cpp index 228b808cb..eb2cfe6c9 100644 --- a/src/ArduinoDUE/Repetier/Extruder.cpp +++ b/src/ArduinoDUE/Repetier/Extruder.cpp @@ -412,6 +412,22 @@ void Extruder::setTemperatureForExtruder(float temperatureInCelsius,uint8_t extr TemperatureController *tc2 = tempController[1]; tc2->setTargetTemperature(temperatureInCelsius); if(temperatureInCelsius>=EXTRUDER_FAN_COOL_TEMP) extruder[1].coolerPWM = extruder[1].coolerSpeed; +#if NUM_EXTRUDER > 2 + if(Extruder::dittoMode > 1 && extr == 0) + { + TemperatureController *tc2 = tempController[2]; + tc2->setTargetTemperature(temperatureInCelsius); + if(temperatureInCelsius>=EXTRUDER_FAN_COOL_TEMP) extruder[2].coolerPWM = extruder[2].coolerSpeed; + } +#endif +#if NUM_EXTRUDER > 3 + if(Extruder::dittoMode > 2 && extr == 0) + { + TemperatureController *tc2 = tempController[3]; + tc2->setTargetTemperature(temperatureInCelsius); + if(temperatureInCelsius>=EXTRUDER_FAN_COOL_TEMP) extruder[3].coolerPWM = extruder[3].coolerSpeed; + } +#endif } #endif // FEATURE_DITTO_PRINTING bool alloff = true; @@ -456,6 +472,14 @@ void Extruder::disableCurrentExtruderMotor() { if(extruder[1].enablePin > -1) digitalWrite(extruder[1].enablePin,!extruder[1].enableOn); +#if NUM_EXTRUDER > 2 + if(Extruder::dittoMode > 1 && extruder[2].enablePin > -1) + digitalWrite(extruder[2].enablePin,!extruder[2].enableOn); +#endif +#if NUM_EXTRUDER > 3 + if(Extruder::dittoMode > 2 && extruder[3].enablePin > -1) + digitalWrite(extruder[3].enablePin,!extruder[3].enableOn); +#endif } #endif } @@ -1021,7 +1045,7 @@ void TemperatureController::autotunePID(float temp,uint8_t controllerId,bool sto Extruder::disableAllHeater(); if(storeValues) { - pidDGain = Kp; + pidPGain = Kp; pidIGain = Ki; pidDGain = Kd; heatManager = 1; diff --git a/src/ArduinoDUE/Repetier/Extruder.h b/src/ArduinoDUE/Repetier/Extruder.h index b65d6fca8..7506d22ba 100644 --- a/src/ArduinoDUE/Repetier/Extruder.h +++ b/src/ArduinoDUE/Repetier/Extruder.h @@ -114,6 +114,16 @@ class Extruder // Size: 12*1 Byte+12*4 Byte+4*2Byte = 68 Byte #if FEATURE_DITTO_PRINTING if(Extruder::dittoMode) { WRITE(EXT1_STEP_PIN,HIGH); +#if NUM_EXTRUDER > 2 + if(Extruder::dittoMode > 1) { + WRITE(EXT2_STEP_PIN,HIGH); + } +#endif +#if NUM_EXTRUDER > 3 + if(Extruder::dittoMode > 2) { + WRITE(EXT3_STEP_PIN,HIGH); + } +#endif } #endif #endif @@ -163,6 +173,16 @@ class Extruder // Size: 12*1 Byte+12*4 Byte+4*2Byte = 68 Byte #if FEATURE_DITTO_PRINTING if(Extruder::dittoMode) { WRITE(EXT1_STEP_PIN,LOW); +#if NUM_EXTRUDER > 2 + if(Extruder::dittoMode > 1) { + WRITE(EXT2_STEP_PIN,LOW); + } +#endif +#if NUM_EXTRUDER > 3 + if(Extruder::dittoMode > 2) { + WRITE(EXT3_STEP_PIN,LOW); + } +#endif } #endif #endif @@ -278,6 +298,14 @@ class Extruder // Size: 12*1 Byte+12*4 Byte+4*2Byte = 68 Byte if(Extruder::dittoMode) { if(extruder[1].enablePin > -1) digitalWrite(extruder[1].enablePin,extruder[1].enableOn); +#if NUM_EXTRUDER > 2 + if(Extruder::dittoMode > 1 && extruder[2].enablePin > -1) + digitalWrite(extruder[2].enablePin,extruder[2].enableOn); +#endif +#if NUM_EXTRUDER > 3 + if(Extruder::dittoMode > 2 && extruder[3].enablePin > -1) + digitalWrite(extruder[3].enablePin,extruder[3].enableOn); +#endif } #endif #endif diff --git a/src/ArduinoDUE/Repetier/Repetier.h b/src/ArduinoDUE/Repetier/Repetier.h index 2d76359a3..b0e4f38e4 100644 --- a/src/ArduinoDUE/Repetier/Repetier.h +++ b/src/ArduinoDUE/Repetier/Repetier.h @@ -369,8 +369,8 @@ extern void linear_move(long steps_remaining[]); #ifndef FEATURE_DITTO_PRINTING #define FEATURE_DITTO_PRINTING false #endif -#if FEATURE_DITTO_PRINTING && NUM_EXTRUDER!=2 -#error Ditto printing requires exactly 2 extruder. +#if FEATURE_DITTO_PRINTING && (NUM_EXTRUDER > 4 || NUM_EXTRUDER < 2) +#error Ditto printing requires 2 - 4 extruder. #endif diff --git a/src/ArduinoDUE/Repetier/Repetier.ino b/src/ArduinoDUE/Repetier/Repetier.ino index 6d3a44058..66c985f3a 100644 --- a/src/ArduinoDUE/Repetier/Repetier.ino +++ b/src/ArduinoDUE/Repetier/Repetier.ino @@ -107,7 +107,7 @@ Custom M Codes - M232 - Read and reset max. advance values - M233 X Y - Set temporary advance K-value to X and linear term advanceL to Y - M251 Measure Z steps from homing stop (Delta printers). S0 - Reset, S1 - Print, S2 - Store to Z length (also EEPROM if enabled) -- M280 S - Set ditto printing mode. mode: 0 = off, 1 = on +- M280 S - Set ditto printing mode. mode: 0 = off, 1 = 2 extruder, 2 = 3 extruder, 3 = 4 extruder printing - M300 S P play frequency - M303 P S X0 - Autodetect pid values. Use P for heated bed. X0 saves result in EEPROM. - M320 - Activate autolevel From 8f0ce0c175fa6c955afd3d5a3af42b99b344dd2c Mon Sep 17 00:00:00 2001 From: repetier Date: Sun, 10 Aug 2014 14:51:38 +0200 Subject: [PATCH 05/20] French translation by Doudou --- src/ArduinoAVR/Repetier/Configuration.h | 1 + src/ArduinoAVR/Repetier/uilang.h | 168 ++++++++++++++++++++++++ src/ArduinoDUE/Repetier/uilang.h | 168 ++++++++++++++++++++++++ 3 files changed, 337 insertions(+) diff --git a/src/ArduinoAVR/Repetier/Configuration.h b/src/ArduinoAVR/Repetier/Configuration.h index a4356b15b..3bd39ac1d 100644 --- a/src/ArduinoAVR/Repetier/Configuration.h +++ b/src/ArduinoAVR/Repetier/Configuration.h @@ -1197,6 +1197,7 @@ Select the language to use. 4 = Italian 5 = Spanish 6 = Swedish +7 = French */ #define UI_LANGUAGE 1 diff --git a/src/ArduinoAVR/Repetier/uilang.h b/src/ArduinoAVR/Repetier/uilang.h index bc222b089..6fc5f7a6e 100644 --- a/src/ArduinoAVR/Repetier/uilang.h +++ b/src/ArduinoAVR/Repetier/uilang.h @@ -1197,6 +1197,174 @@ #define UI_TEXT_PRINTER_READY "Utskrift klar." #endif +// *************** French translation **************** +// *************** By Doudou **************** +#if UI_LANGUAGE==7 + +#define UI_TEXT_ON "On" +#define UI_TEXT_OFF "Off" +#define UI_TEXT_NA "N/A" // Output for not available +#define UI_TEXT_YES "Oui" +#define UI_TEXT_NO "Non" +#define UI_TEXT_SEL "\003" +#define UI_TEXT_NOSEL "\004" +#define UI_TEXT_PRINT_POS "Impression..." +#define UI_TEXT_PRINTING "Impression" +#define UI_TEXT_IDLE "Au Repos" +#define UI_TEXT_NOSDCARD "Pas de Carte SD" +#define UI_TEXT_ERROR "**** ERREUR ****" +#define UI_TEXT_BACK "Retour \001" +#define UI_TEXT_QUICK_SETTINGS "Reglages Rapides" +#define UI_TEXT_CONFIGURATION "Configuration" +#define UI_TEXT_POSITION "Position" +#define UI_TEXT_EXTRUDER "Extrudeuse" +#define UI_TEXT_SD_CARD "Carte SD" +#define UI_TEXT_DEBUGGING "Deboguer" +#define UI_TEXT_HOME_ALL "Accueil Tout" +#define UI_TEXT_HOME_X "Accueil X" +#define UI_TEXT_HOME_Y "Accueil Y" +#define UI_TEXT_HOME_Z "Accueil Z" +#define UI_TEXT_PREHEAT_PLA "Prechauf. PLA" +#define UI_TEXT_PREHEAT_ABS "Prechauf. ABS" +#define UI_TEXT_COOLDOWN "Refroidir" +#define UI_TEXT_SET_TO_ORIGIN "Set to Origin" +#define UI_TEXT_DISABLE_STEPPER "Desactiv. Moteurs" +#define UI_TEXT_X_POSITION "Position X" +#define UI_TEXT_X_POS_FAST "Pos. Rapide X" +#define UI_TEXT_Y_POSITION "Position Y" +#define UI_TEXT_Y_POS_FAST "Pos. Rapide Y" +#define UI_TEXT_Z_POSITION "Position Z" +#define UI_TEXT_Z_POS_FAST "Pos. Rapide Z" +#define UI_TEXT_E_POSITION "Position Extr." +#define UI_TEXT_BED_TEMP "Lit Temp.:%Eb\002C" +#define UI_TEXT_EXTR0_TEMP "Temp. 1: %E0\002C" +#define UI_TEXT_EXTR1_TEMP "Temp. 2: %E1\002C" +#define UI_TEXT_EXTR2_TEMP "Temp. 2: %E2\002C" +#define UI_TEXT_EXTR0_OFF "Extrudeuse 1 Off" +#define UI_TEXT_EXTR1_OFF "Extrudeuse 2 Off" +#define UI_TEXT_EXTR2_OFF "Extrudeuse 3 Off" +#define UI_TEXT_EXTR0_SELECT "%X0 Select. Extr.0" +#define UI_TEXT_EXTR1_SELECT "%X1 Select. Extr.1" +#define UI_TEXT_EXTR2_SELECT "%X1 Select. Extr.2" +#define UI_TEXT_EXTR_ORIGIN "Set Origin" +#define UI_TEXT_PRINT_X "Imprim. X:%ax" +#define UI_TEXT_PRINT_Y "Imprim. Y:%ay" +#define UI_TEXT_PRINT_Z "Imprim. Z:%az" +#define UI_TEXT_PRINT_Z_DELTA "Imprim.:%az" +#define UI_TEXT_MOVE_X "Deplac. X:%aX" +#define UI_TEXT_MOVE_Y "Deplac. Y:%aY" +#define UI_TEXT_MOVE_Z "Deplac. Z:%aZ" +#define UI_TEXT_MOVE_Z_DELTA "Deplac.:%aZ" +#define UI_TEXT_JERK "Jerk:%aj" +#define UI_TEXT_ZJERK "Z-Jerk:%aJ" +#define UI_TEXT_ACCELERATION "Acceleration" +#define UI_TEXT_STORE_TO_EEPROM "Stock. Dans EEPROM" +#define UI_TEXT_LOAD_EEPROM "Charg. f. EEPROM" +#define UI_TEXT_DBG_ECHO "Echo :%do" +#define UI_TEXT_DBG_INFO "Info :%di" +#define UI_TEXT_DBG_ERROR "Erreurs :%de" +#define UI_TEXT_DBG_DRYRUN "Fonct. a Vide:%dd" +#define UI_TEXT_OPS_OFF "%O0 OPS Off" +#define UI_TEXT_OPS_CLASSIC "%O1 OPS Classiq." +#define UI_TEXT_OPS_FAST "%O2 OPS Rapide" +#define UI_TEXT_OPS_RETRACT "Retract. :%Or" +#define UI_TEXT_OPS_BACKSLASH "Backsl. :%Ob" +#define UI_TEXT_OPS_MINDIST "Min.dist:%Od" +#define UI_TEXT_OPS_MOVE_AFTER "Déplac. Apres:%Oa" +#define UI_TEXT_ANTI_OOZE "Anti Ooze" +#define UI_TEXT_PRINT_FILE "Imprim. fichier" +#define UI_TEXT_PAUSE_PRINT "Pause Impress." +#define UI_TEXT_CONTINUE_PRINT "Continuer Impress." +#define UI_TEXT_UNMOUNT_CARD "Retirer Carte" +#define UI_TEXT_MOUNT_CARD "Inserer Carte" +#define UI_TEXT_DELETE_FILE "Supp. fichier" +#define UI_TEXT_FEEDRATE "Avance" +#define UI_TEXT_FEED_MAX_X "Max X:%fx" +#define UI_TEXT_FEED_MAX_Y "Max Y:%fy" +#define UI_TEXT_FEED_MAX_Z "Max Z:%fz" +#define UI_TEXT_FEED_MAX_Z_DELTA "Max:%fz" +#define UI_TEXT_FEED_HOME_X "Accueil X:%fX" +#define UI_TEXT_FEED_HOME_Y "Accueil Y:%fY" +#define UI_TEXT_FEED_HOME_Z "Accueil Z:%fZ" +#define UI_TEXT_FEED_HOME_Z_DELTA "Accueil:%fZ" +#define UI_TEXT_ACTION_XPOSITION4 "X:%x0 mm","Min Butée:%sx","Max Butée:%sX","" +#define UI_TEXT_ACTION_YPOSITION4 "Y:%x1 mm","Min Butée:%sy","Max Butée:%sY","" +#define UI_TEXT_ACTION_ZPOSITION4 "Z:%x2 mm","Min Butée:%sz","Max Butée:%sZ","" +#define UI_TEXT_ACTION_XPOSITION_FAST4 "X:%x0 mm","Min Butée:%sx","Max Butée:%sX","" +#define UI_TEXT_ACTION_YPOSITION_FAST4 "Y:%x1 mm","Min Butée:%sy","Max Butée:%sY","" +#define UI_TEXT_ACTION_ZPOSITION_FAST4 "Z:%x2 mm","Min Butée:%sz","Max Butée:%sZ","" +#define UI_TEXT_ACTION_EPOSITION_FAST2 "E:%x3 mm","1 clic = 1 mm" +#define UI_TEXT_ACTION_XPOSITION2 "X:%x0 mm","Min:%sx Max:%sX" +#define UI_TEXT_ACTION_YPOSITION2 "Y:%x1 mm","Min:%sy Max:%sY" +#define UI_TEXT_ACTION_ZPOSITION2 "Z:%x2 mm","Min:%sz Max:%sZ" +#define UI_TEXT_ACTION_XPOSITION_FAST2 "X:%x0 mm","Min:%sx Max:%sX" +#define UI_TEXT_ACTION_YPOSITION_FAST2 "Y:%x1 mm","Min:%sy Max:%sY" +#define UI_TEXT_ACTION_ZPOSITION_FAST2 "Z:%x2 mm","Min:%sz Max:%sZ" +#define UI_TEXT_FANSPEED "Vit. Ventil." +#define UI_TEXT_ACTION_FANSPEED "Vit. Ventil.:%Fs%%%" +#define UI_TEXT_FAN_OFF "Arret Ventil." +#define UI_TEXT_FAN_25 "Ventil. 25%%%" +#define UI_TEXT_FAN_50 "Ventil. 50%%%" +#define UI_TEXT_FAN_75 "Ventil. 75%%%" +#define UI_TEXT_FAN_FULL "Ventil. Max" +#define UI_TEXT_STEPPER_INACTIVE "Arret Moteurs" +#define UI_TEXT_STEPPER_INACTIVE2 "Dis. Apres:%is","[s] 0=Off" +#define UI_TEXT_POWER_INACTIVE "Arret Alim." +#define UI_TEXT_POWER_INACTIVE2 "Dis. Apres:%ip","[s] 0=Off" +#define UI_TEXT_GENERAL "General" +#define UI_TEXT_BAUDRATE "Baudrate:%oc" +#define UI_TEXT_EXTR_STEPS "Pas/MM:%Se" +#define UI_TEXT_EXTR_START_FEED "Start FR:%Xf" +#define UI_TEXT_EXTR_MAX_FEED "Max FR:%XF" +#define UI_TEXT_EXTR_ACCEL "Accel:%XA" +#define UI_TEXT_EXTR_WATCH "Stab.Temps:%Xw" +#define UI_TEXT_EXTR_ADVANCE_L "Avance lin:%Xl" +#define UI_TEXT_EXTR_ADVANCE_K "Avance quad:%Xa" +#define UI_TEXT_EXTR_MANAGER "Controle:%Xh" +#define UI_TEXT_EXTR_PGAIN "DT/PID P:%Xp" +#define UI_TEXT_EXTR_IGAIN "PID I:%Xi" +#define UI_TEXT_EXTR_DGAIN "PID D:%Xd" +#define UI_TEXT_EXTR_DMIN "Drive Min:%Xm" +#define UI_TEXT_EXTR_DMAX "Drive Max:%XM" +#define UI_TEXT_EXTR_PMAX "PID Max:%XD" +#define UI_TEXT_EXTR_XOFF "X-Offset:%Xx" +#define UI_TEXT_EXTR_YOFF "Y-Offset:%Xy" +#define UI_TEXT_STRING_HM_BANGBANG "BangBang" +#define UI_TEXT_STRING_HM_PID "PID" +#define UI_TEXT_STRING_ACTION "Action:%la" +#define UI_TEXT_HEATING_EXTRUDER "Chauff. Extrud." +#define UI_TEXT_HEATING_BED "Chauff. Lit" +#define UI_TEXT_KILLED "Stoppe" +#define UI_TEXT_STEPPER_DISABLED "Moteurs Arretes" +#define UI_TEXT_EEPROM_STORED "Configuration","Stock. Dans EEPROM" +#define UI_TEXT_EEPROM_LOADED "Configuration","Charg. f. EEPROM" +#define UI_TEXT_UPLOADING "Telechargement.." +#define UI_TEXT_PAGE_BUFFER "Buffer:%oB" +#define UI_TEXT_PAGE_EXTRUDER " E:%ec/%Ec\002C\176%oC" +#define UI_TEXT_PAGE_EXTRUDER1 "E1:%e0/%E0\002C\176%o0" +#define UI_TEXT_PAGE_EXTRUDER2 "E2:%e1/%E1\002C\176%o1" +#define UI_TEXT_PAGE_EXTRUDER3 "E3:%e2/%E2\002C\176%o2" +#define UI_TEXT_PAGE_BED " B:%eb/%Eb\002C\176%ob" +#define UI_TEXT_SPEED_MULTIPLY "Vit. Mul.:%om%%%" +#define UI_TEXT_FLOW_MULTIPLY "Flow Mul.:%of%%%" +#define UI_TEXT_EXTR_WAIT_RETRACT_TEMP "Att. Temp.%XT\002C" +#define UI_TEXT_EXTR_WAIT_RETRACT_UNITS "Att. Units:%XUmm" +#define UI_TEXT_PRINTER_READY "imprimante prete" +// Printtime output gets aggregated like UI_TEXT_PRINTTIME_DAYSUI_TEXT_PRINTTIME_HOURSUI_TEXT_PRINTTIME_MINUTES +// ___88 days 12:45 +#define UI_TEXT_PRINTTIME_DAYS " jours " +#define UI_TEXT_PRINTTIME_HOURS ":" +#define UI_TEXT_PRINTTIME_MINUTES "" +#define UI_TEXT_PRINT_TIME "Temps Impression" +#define UI_TEXT_PRINT_FILAMENT "Filament Imprime" +#define UI_TEXT_POWER "ATX power on/off" +#define UI_TEXT_STRING_HM_DEADTIME "Temps Mort" +#define UI_TEXT_STRING_HM_SLOWBANG "SlowBang" +#define UI_TEXT_STOP_PRINT "Arret Impress." + +#endif + + // ************************************************************************************* // User defined language // diff --git a/src/ArduinoDUE/Repetier/uilang.h b/src/ArduinoDUE/Repetier/uilang.h index bc222b089..6fc5f7a6e 100644 --- a/src/ArduinoDUE/Repetier/uilang.h +++ b/src/ArduinoDUE/Repetier/uilang.h @@ -1197,6 +1197,174 @@ #define UI_TEXT_PRINTER_READY "Utskrift klar." #endif +// *************** French translation **************** +// *************** By Doudou **************** +#if UI_LANGUAGE==7 + +#define UI_TEXT_ON "On" +#define UI_TEXT_OFF "Off" +#define UI_TEXT_NA "N/A" // Output for not available +#define UI_TEXT_YES "Oui" +#define UI_TEXT_NO "Non" +#define UI_TEXT_SEL "\003" +#define UI_TEXT_NOSEL "\004" +#define UI_TEXT_PRINT_POS "Impression..." +#define UI_TEXT_PRINTING "Impression" +#define UI_TEXT_IDLE "Au Repos" +#define UI_TEXT_NOSDCARD "Pas de Carte SD" +#define UI_TEXT_ERROR "**** ERREUR ****" +#define UI_TEXT_BACK "Retour \001" +#define UI_TEXT_QUICK_SETTINGS "Reglages Rapides" +#define UI_TEXT_CONFIGURATION "Configuration" +#define UI_TEXT_POSITION "Position" +#define UI_TEXT_EXTRUDER "Extrudeuse" +#define UI_TEXT_SD_CARD "Carte SD" +#define UI_TEXT_DEBUGGING "Deboguer" +#define UI_TEXT_HOME_ALL "Accueil Tout" +#define UI_TEXT_HOME_X "Accueil X" +#define UI_TEXT_HOME_Y "Accueil Y" +#define UI_TEXT_HOME_Z "Accueil Z" +#define UI_TEXT_PREHEAT_PLA "Prechauf. PLA" +#define UI_TEXT_PREHEAT_ABS "Prechauf. ABS" +#define UI_TEXT_COOLDOWN "Refroidir" +#define UI_TEXT_SET_TO_ORIGIN "Set to Origin" +#define UI_TEXT_DISABLE_STEPPER "Desactiv. Moteurs" +#define UI_TEXT_X_POSITION "Position X" +#define UI_TEXT_X_POS_FAST "Pos. Rapide X" +#define UI_TEXT_Y_POSITION "Position Y" +#define UI_TEXT_Y_POS_FAST "Pos. Rapide Y" +#define UI_TEXT_Z_POSITION "Position Z" +#define UI_TEXT_Z_POS_FAST "Pos. Rapide Z" +#define UI_TEXT_E_POSITION "Position Extr." +#define UI_TEXT_BED_TEMP "Lit Temp.:%Eb\002C" +#define UI_TEXT_EXTR0_TEMP "Temp. 1: %E0\002C" +#define UI_TEXT_EXTR1_TEMP "Temp. 2: %E1\002C" +#define UI_TEXT_EXTR2_TEMP "Temp. 2: %E2\002C" +#define UI_TEXT_EXTR0_OFF "Extrudeuse 1 Off" +#define UI_TEXT_EXTR1_OFF "Extrudeuse 2 Off" +#define UI_TEXT_EXTR2_OFF "Extrudeuse 3 Off" +#define UI_TEXT_EXTR0_SELECT "%X0 Select. Extr.0" +#define UI_TEXT_EXTR1_SELECT "%X1 Select. Extr.1" +#define UI_TEXT_EXTR2_SELECT "%X1 Select. Extr.2" +#define UI_TEXT_EXTR_ORIGIN "Set Origin" +#define UI_TEXT_PRINT_X "Imprim. X:%ax" +#define UI_TEXT_PRINT_Y "Imprim. Y:%ay" +#define UI_TEXT_PRINT_Z "Imprim. Z:%az" +#define UI_TEXT_PRINT_Z_DELTA "Imprim.:%az" +#define UI_TEXT_MOVE_X "Deplac. X:%aX" +#define UI_TEXT_MOVE_Y "Deplac. Y:%aY" +#define UI_TEXT_MOVE_Z "Deplac. Z:%aZ" +#define UI_TEXT_MOVE_Z_DELTA "Deplac.:%aZ" +#define UI_TEXT_JERK "Jerk:%aj" +#define UI_TEXT_ZJERK "Z-Jerk:%aJ" +#define UI_TEXT_ACCELERATION "Acceleration" +#define UI_TEXT_STORE_TO_EEPROM "Stock. Dans EEPROM" +#define UI_TEXT_LOAD_EEPROM "Charg. f. EEPROM" +#define UI_TEXT_DBG_ECHO "Echo :%do" +#define UI_TEXT_DBG_INFO "Info :%di" +#define UI_TEXT_DBG_ERROR "Erreurs :%de" +#define UI_TEXT_DBG_DRYRUN "Fonct. a Vide:%dd" +#define UI_TEXT_OPS_OFF "%O0 OPS Off" +#define UI_TEXT_OPS_CLASSIC "%O1 OPS Classiq." +#define UI_TEXT_OPS_FAST "%O2 OPS Rapide" +#define UI_TEXT_OPS_RETRACT "Retract. :%Or" +#define UI_TEXT_OPS_BACKSLASH "Backsl. :%Ob" +#define UI_TEXT_OPS_MINDIST "Min.dist:%Od" +#define UI_TEXT_OPS_MOVE_AFTER "Déplac. Apres:%Oa" +#define UI_TEXT_ANTI_OOZE "Anti Ooze" +#define UI_TEXT_PRINT_FILE "Imprim. fichier" +#define UI_TEXT_PAUSE_PRINT "Pause Impress." +#define UI_TEXT_CONTINUE_PRINT "Continuer Impress." +#define UI_TEXT_UNMOUNT_CARD "Retirer Carte" +#define UI_TEXT_MOUNT_CARD "Inserer Carte" +#define UI_TEXT_DELETE_FILE "Supp. fichier" +#define UI_TEXT_FEEDRATE "Avance" +#define UI_TEXT_FEED_MAX_X "Max X:%fx" +#define UI_TEXT_FEED_MAX_Y "Max Y:%fy" +#define UI_TEXT_FEED_MAX_Z "Max Z:%fz" +#define UI_TEXT_FEED_MAX_Z_DELTA "Max:%fz" +#define UI_TEXT_FEED_HOME_X "Accueil X:%fX" +#define UI_TEXT_FEED_HOME_Y "Accueil Y:%fY" +#define UI_TEXT_FEED_HOME_Z "Accueil Z:%fZ" +#define UI_TEXT_FEED_HOME_Z_DELTA "Accueil:%fZ" +#define UI_TEXT_ACTION_XPOSITION4 "X:%x0 mm","Min Butée:%sx","Max Butée:%sX","" +#define UI_TEXT_ACTION_YPOSITION4 "Y:%x1 mm","Min Butée:%sy","Max Butée:%sY","" +#define UI_TEXT_ACTION_ZPOSITION4 "Z:%x2 mm","Min Butée:%sz","Max Butée:%sZ","" +#define UI_TEXT_ACTION_XPOSITION_FAST4 "X:%x0 mm","Min Butée:%sx","Max Butée:%sX","" +#define UI_TEXT_ACTION_YPOSITION_FAST4 "Y:%x1 mm","Min Butée:%sy","Max Butée:%sY","" +#define UI_TEXT_ACTION_ZPOSITION_FAST4 "Z:%x2 mm","Min Butée:%sz","Max Butée:%sZ","" +#define UI_TEXT_ACTION_EPOSITION_FAST2 "E:%x3 mm","1 clic = 1 mm" +#define UI_TEXT_ACTION_XPOSITION2 "X:%x0 mm","Min:%sx Max:%sX" +#define UI_TEXT_ACTION_YPOSITION2 "Y:%x1 mm","Min:%sy Max:%sY" +#define UI_TEXT_ACTION_ZPOSITION2 "Z:%x2 mm","Min:%sz Max:%sZ" +#define UI_TEXT_ACTION_XPOSITION_FAST2 "X:%x0 mm","Min:%sx Max:%sX" +#define UI_TEXT_ACTION_YPOSITION_FAST2 "Y:%x1 mm","Min:%sy Max:%sY" +#define UI_TEXT_ACTION_ZPOSITION_FAST2 "Z:%x2 mm","Min:%sz Max:%sZ" +#define UI_TEXT_FANSPEED "Vit. Ventil." +#define UI_TEXT_ACTION_FANSPEED "Vit. Ventil.:%Fs%%%" +#define UI_TEXT_FAN_OFF "Arret Ventil." +#define UI_TEXT_FAN_25 "Ventil. 25%%%" +#define UI_TEXT_FAN_50 "Ventil. 50%%%" +#define UI_TEXT_FAN_75 "Ventil. 75%%%" +#define UI_TEXT_FAN_FULL "Ventil. Max" +#define UI_TEXT_STEPPER_INACTIVE "Arret Moteurs" +#define UI_TEXT_STEPPER_INACTIVE2 "Dis. Apres:%is","[s] 0=Off" +#define UI_TEXT_POWER_INACTIVE "Arret Alim." +#define UI_TEXT_POWER_INACTIVE2 "Dis. Apres:%ip","[s] 0=Off" +#define UI_TEXT_GENERAL "General" +#define UI_TEXT_BAUDRATE "Baudrate:%oc" +#define UI_TEXT_EXTR_STEPS "Pas/MM:%Se" +#define UI_TEXT_EXTR_START_FEED "Start FR:%Xf" +#define UI_TEXT_EXTR_MAX_FEED "Max FR:%XF" +#define UI_TEXT_EXTR_ACCEL "Accel:%XA" +#define UI_TEXT_EXTR_WATCH "Stab.Temps:%Xw" +#define UI_TEXT_EXTR_ADVANCE_L "Avance lin:%Xl" +#define UI_TEXT_EXTR_ADVANCE_K "Avance quad:%Xa" +#define UI_TEXT_EXTR_MANAGER "Controle:%Xh" +#define UI_TEXT_EXTR_PGAIN "DT/PID P:%Xp" +#define UI_TEXT_EXTR_IGAIN "PID I:%Xi" +#define UI_TEXT_EXTR_DGAIN "PID D:%Xd" +#define UI_TEXT_EXTR_DMIN "Drive Min:%Xm" +#define UI_TEXT_EXTR_DMAX "Drive Max:%XM" +#define UI_TEXT_EXTR_PMAX "PID Max:%XD" +#define UI_TEXT_EXTR_XOFF "X-Offset:%Xx" +#define UI_TEXT_EXTR_YOFF "Y-Offset:%Xy" +#define UI_TEXT_STRING_HM_BANGBANG "BangBang" +#define UI_TEXT_STRING_HM_PID "PID" +#define UI_TEXT_STRING_ACTION "Action:%la" +#define UI_TEXT_HEATING_EXTRUDER "Chauff. Extrud." +#define UI_TEXT_HEATING_BED "Chauff. Lit" +#define UI_TEXT_KILLED "Stoppe" +#define UI_TEXT_STEPPER_DISABLED "Moteurs Arretes" +#define UI_TEXT_EEPROM_STORED "Configuration","Stock. Dans EEPROM" +#define UI_TEXT_EEPROM_LOADED "Configuration","Charg. f. EEPROM" +#define UI_TEXT_UPLOADING "Telechargement.." +#define UI_TEXT_PAGE_BUFFER "Buffer:%oB" +#define UI_TEXT_PAGE_EXTRUDER " E:%ec/%Ec\002C\176%oC" +#define UI_TEXT_PAGE_EXTRUDER1 "E1:%e0/%E0\002C\176%o0" +#define UI_TEXT_PAGE_EXTRUDER2 "E2:%e1/%E1\002C\176%o1" +#define UI_TEXT_PAGE_EXTRUDER3 "E3:%e2/%E2\002C\176%o2" +#define UI_TEXT_PAGE_BED " B:%eb/%Eb\002C\176%ob" +#define UI_TEXT_SPEED_MULTIPLY "Vit. Mul.:%om%%%" +#define UI_TEXT_FLOW_MULTIPLY "Flow Mul.:%of%%%" +#define UI_TEXT_EXTR_WAIT_RETRACT_TEMP "Att. Temp.%XT\002C" +#define UI_TEXT_EXTR_WAIT_RETRACT_UNITS "Att. Units:%XUmm" +#define UI_TEXT_PRINTER_READY "imprimante prete" +// Printtime output gets aggregated like UI_TEXT_PRINTTIME_DAYSUI_TEXT_PRINTTIME_HOURSUI_TEXT_PRINTTIME_MINUTES +// ___88 days 12:45 +#define UI_TEXT_PRINTTIME_DAYS " jours " +#define UI_TEXT_PRINTTIME_HOURS ":" +#define UI_TEXT_PRINTTIME_MINUTES "" +#define UI_TEXT_PRINT_TIME "Temps Impression" +#define UI_TEXT_PRINT_FILAMENT "Filament Imprime" +#define UI_TEXT_POWER "ATX power on/off" +#define UI_TEXT_STRING_HM_DEADTIME "Temps Mort" +#define UI_TEXT_STRING_HM_SLOWBANG "SlowBang" +#define UI_TEXT_STOP_PRINT "Arret Impress." + +#endif + + // ************************************************************************************* // User defined language // From 0d60ecb847a5d90bfa38d929f649daecc0a7f2a4 Mon Sep 17 00:00:00 2001 From: repetier Date: Mon, 11 Aug 2014 18:56:28 +0200 Subject: [PATCH 06/20] Fixed TEMP_X pin definition for azteeg x3 pro --- src/ArduinoAVR/Repetier/pins.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ArduinoAVR/Repetier/pins.h b/src/ArduinoAVR/Repetier/pins.h index cfd4798bf..a0cae7979 100644 --- a/src/ArduinoAVR/Repetier/pins.h +++ b/src/ArduinoAVR/Repetier/pins.h @@ -477,12 +477,12 @@ STEPPER_CURRENT_CONTROL #define TEMP_0_PIN 13 // ANALOG NUMBERING #define TEMP_1_PIN 14 // BED , ANALOG NUMBERING #define TEMP_2_PIN 15 -#define TEMP_4_PIN 12 // ANALOG NUMBERING -#define TEMP_5_PIN 11 // ANALOG NUMBERING -#define TEMP_6_PIN 10 +#define TEMP_3_PIN 12 // ANALOG NUMBERING +#define TEMP_4_PIN 11 // ANALOG NUMBERING +#define TEMP_5_PIN 10 -#define TEMP_7_PIN 4 // Thermocouple 1 -#define TEMP_8_PIN 5 // Thermocouple 2 +#define TEMP_6_PIN 4 // Thermocouple 1 +#define TEMP_7_PIN 5 // Thermocouple 2 #define E1_PINS ORIG_E1_STEP_PIN,ORIG_E1_DIR_PIN,ORIG_E1_ENABLE_PIN, From 6895137b2f96200859d264188f2a9a799431137b Mon Sep 17 00:00:00 2001 From: repetier Date: Sat, 16 Aug 2014 17:45:38 +0200 Subject: [PATCH 07/20] Fixed M401/M402 memory position bug --- src/ArduinoAVR/Repetier/Printer.cpp | 6 +++--- src/ArduinoAVR/Repetier/pins.h | 6 ++++-- src/ArduinoDUE/Repetier/Printer.cpp | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/ArduinoAVR/Repetier/Printer.cpp b/src/ArduinoAVR/Repetier/Printer.cpp index f2be099d1..647db4fbf 100644 --- a/src/ArduinoAVR/Repetier/Printer.cpp +++ b/src/ArduinoAVR/Repetier/Printer.cpp @@ -848,9 +848,9 @@ void Printer::GoToMemoryPosition(bool x,bool y,bool z,bool e,float feed) { bool all = !(x || y || z); float oldFeedrate = feedrate; - moveToReal((all || x ? memoryX : IGNORE_COORDINATE) - ,(all || y ? memoryY : IGNORE_COORDINATE) - ,(all || z ? memoryZ : IGNORE_COORDINATE) + moveToReal((all || x ? (lastCmdPos[X_AXIS] = memoryX) : IGNORE_COORDINATE) + ,(all || y ?(lastCmdPos[Y_AXIS] = memoryY) : IGNORE_COORDINATE) + ,(all || z ? (lastCmdPos[Z_AXIS] = memoryZ) : IGNORE_COORDINATE) ,(e ? memoryE:IGNORE_COORDINATE), feed); feedrate = oldFeedrate; diff --git a/src/ArduinoAVR/Repetier/pins.h b/src/ArduinoAVR/Repetier/pins.h index a0cae7979..de886f751 100644 --- a/src/ArduinoAVR/Repetier/pins.h +++ b/src/ArduinoAVR/Repetier/pins.h @@ -2255,7 +2255,9 @@ S3(ext)=9 #define FAN2_PIN ORIG_FAN2_PIN -#define SENSITIVE_PINS {0, 1, X_STEP_PIN, X_DIR_PIN, X_ENABLE_PIN, ORIG_X_MIN_PIN, X_MAX_PIN, Y_STEP_PIN, Y_DIR_PIN, Y_ENABLE_PIN, Y_MIN_PIN, Y_MAX_PIN, Z_STEP_PIN, Z_DIR_PIN, Z_ENABLE_PIN, Z_MIN_PIN, Z_MAX_PIN, LED_PIN, PS_ON_PIN, \ - HEATER_0_PIN, HEATER_1_PIN, ORIG_FAN_PIN, E0_PINS E1_PINS E2_PINS TEMP_0_PIN, TEMP_1_PIN,SDSS } +#define SENSITIVE_PINS {0, 1, ORIG_X_STEP_PIN, ORIG_X_DIR_PIN, ORIG_X_ENABLE_PIN, ORIG_X_MIN_PIN, ORIG_X_MAX_PIN, \ + ORIG_Y_STEP_PIN, ORIG_Y_DIR_PIN, ORIG_Y_ENABLE_PIN, ORIG_Y_MIN_PIN, ORIG_Y_MAX_PIN, ORIG_Z_STEP_PIN,\ + ORIG_Z_DIR_PIN, ORIG_Z_ENABLE_PIN, ORIG_Z_MIN_PIN, ORIG_Z_MAX_PIN, LED_PIN, PS_ON_PIN, \ + HEATER_0_PIN, HEATER_1_PIN, ORIG_FAN_PIN, E0_PINS E1_PINS E2_PINS TEMP_0_PIN, TEMP_1_PIN,SDSS } #endif diff --git a/src/ArduinoDUE/Repetier/Printer.cpp b/src/ArduinoDUE/Repetier/Printer.cpp index f2be099d1..647db4fbf 100644 --- a/src/ArduinoDUE/Repetier/Printer.cpp +++ b/src/ArduinoDUE/Repetier/Printer.cpp @@ -848,9 +848,9 @@ void Printer::GoToMemoryPosition(bool x,bool y,bool z,bool e,float feed) { bool all = !(x || y || z); float oldFeedrate = feedrate; - moveToReal((all || x ? memoryX : IGNORE_COORDINATE) - ,(all || y ? memoryY : IGNORE_COORDINATE) - ,(all || z ? memoryZ : IGNORE_COORDINATE) + moveToReal((all || x ? (lastCmdPos[X_AXIS] = memoryX) : IGNORE_COORDINATE) + ,(all || y ?(lastCmdPos[Y_AXIS] = memoryY) : IGNORE_COORDINATE) + ,(all || z ? (lastCmdPos[Z_AXIS] = memoryZ) : IGNORE_COORDINATE) ,(e ? memoryE:IGNORE_COORDINATE), feed); feedrate = oldFeedrate; From ba42357969478e31f5e397054edf9ee6bc0082b0 Mon Sep 17 00:00:00 2001 From: repetier Date: Wed, 20 Aug 2014 14:41:47 +0200 Subject: [PATCH 08/20] Improved pause handling, Rumba fan 2 fix, virtual eeprom for due --- src/ArduinoAVR/Repetier/Printer.cpp | 5 +-- src/ArduinoAVR/Repetier/Printer.h | 1 + src/ArduinoAVR/Repetier/SDCard.cpp | 8 ++--- src/ArduinoAVR/Repetier/pins.h | 2 +- src/ArduinoDUE/Repetier/HAL.cpp | 1 + src/ArduinoDUE/Repetier/HAL.h | 49 +++++++++++++++++++++-------- src/ArduinoDUE/Repetier/Printer.cpp | 5 +-- src/ArduinoDUE/Repetier/Printer.h | 1 + src/ArduinoDUE/Repetier/SDCard.cpp | 8 ++--- 9 files changed, 54 insertions(+), 26 deletions(-) diff --git a/src/ArduinoAVR/Repetier/Printer.cpp b/src/ArduinoAVR/Repetier/Printer.cpp index 647db4fbf..1e424e3e6 100644 --- a/src/ArduinoAVR/Repetier/Printer.cpp +++ b/src/ArduinoAVR/Repetier/Printer.cpp @@ -139,6 +139,7 @@ float Printer::memoryX; float Printer::memoryY; float Printer::memoryZ; float Printer::memoryE; +float Printer::memoryF; #endif #ifdef XY_GANTRY int8_t Printer::motorX; @@ -842,18 +843,18 @@ void Printer::MemoryPosition() updateCurrentPosition(false); realPosition(memoryX,memoryY,memoryZ); memoryE = currentPositionSteps[E_AXIS]*axisStepsPerMM[E_AXIS]; + memoryF = feedrate; } void Printer::GoToMemoryPosition(bool x,bool y,bool z,bool e,float feed) { bool all = !(x || y || z); - float oldFeedrate = feedrate; moveToReal((all || x ? (lastCmdPos[X_AXIS] = memoryX) : IGNORE_COORDINATE) ,(all || y ?(lastCmdPos[Y_AXIS] = memoryY) : IGNORE_COORDINATE) ,(all || z ? (lastCmdPos[Z_AXIS] = memoryZ) : IGNORE_COORDINATE) ,(e ? memoryE:IGNORE_COORDINATE), feed); - feedrate = oldFeedrate; + feedrate = memoryF; } #endif diff --git a/src/ArduinoAVR/Repetier/Printer.h b/src/ArduinoAVR/Repetier/Printer.h index c324d1fb6..de7ddaf34 100644 --- a/src/ArduinoAVR/Repetier/Printer.h +++ b/src/ArduinoAVR/Repetier/Printer.h @@ -154,6 +154,7 @@ class Printer static float memoryY; static float memoryZ; static float memoryE; + static float memoryF; #endif #ifdef XY_GANTRY static int8_t motorX; diff --git a/src/ArduinoAVR/Repetier/SDCard.cpp b/src/ArduinoAVR/Repetier/SDCard.cpp index cbce84e9c..3d6d79193 100644 --- a/src/ArduinoAVR/Repetier/SDCard.cpp +++ b/src/ArduinoAVR/Repetier/SDCard.cpp @@ -134,9 +134,9 @@ void SDCard::pausePrint(bool intern) Commands::waitUntilEndOfAllBuffers(); Printer::MemoryPosition(); #if DRIVE_SYSTEM==3 - Printer::moveToReal(0,0.9*EEPROM::deltaMaxRadius(),IGNORE_COORDINATE,IGNORE_COORDINATE,Printer::maxFeedrate[X_AXIS]); + Printer::moveToReal(0,0.9*EEPROM::deltaMaxRadius(),IGNORE_COORDINATE,IGNORE_COORDINATE,0.5*Printer::maxFeedrate[Z_AXIS]); #else - Printer::moveToReal(Printer::xMin,Printer::yMin+Printer::yLength,IGNORE_COORDINATE,IGNORE_COORDINATE,Printer::maxFeedrate[X_AXIS]); + Printer::moveToReal(Printer::xMin,Printer::yMin+Printer::yLength,IGNORE_COORDINATE,IGNORE_COORDINATE,0.5*Printer::maxFeedrate[X_AXIS]); #endif } #endif @@ -147,8 +147,8 @@ void SDCard::continuePrint(bool intern) Printer::setMenuMode(MENU_MODE_SD_PAUSED,false); #if FEATURE_MEMORY_POSITION if(intern) { - Printer::GoToMemoryPosition(true,true,false,true,Printer::maxFeedrate[X_AXIS]); - Printer::GoToMemoryPosition(false,false,true,false,Printer::maxFeedrate[Z_AXIS]); + Printer::GoToMemoryPosition(true,true,false,true,0.5*Printer::maxFeedrate[X_AXIS]); + Printer::GoToMemoryPosition(false,false,true,false,0.8*Printer::maxFeedrate[Z_AXIS]); } #endif sdmode = true; diff --git a/src/ArduinoAVR/Repetier/pins.h b/src/ArduinoAVR/Repetier/pins.h index de886f751..98f1e1014 100644 --- a/src/ArduinoAVR/Repetier/pins.h +++ b/src/ArduinoAVR/Repetier/pins.h @@ -606,7 +606,7 @@ STEPPER_CURRENT_CONTROL #define LED_PIN 13 #define ORIG_FAN_PIN 7 -#define FAN1 PIN 8 // (e.g. useful for electronics fan or light on/off) on PIN 8 +#define ORIG_FAN2_PIN 8 // (e.g. useful for electronics fan or light on/off) on PIN 8 #define PS_ON_PIN 45 diff --git a/src/ArduinoDUE/Repetier/HAL.cpp b/src/ArduinoDUE/Repetier/HAL.cpp index a45d33762..0966c7d71 100644 --- a/src/ArduinoDUE/Repetier/HAL.cpp +++ b/src/ArduinoDUE/Repetier/HAL.cpp @@ -32,6 +32,7 @@ extern "C" char *sbrk(int i); extern long bresenham_step(); +char HAL::virtualEeprom[EEPROM_BYTES]; volatile uint8_t HAL::insideTimer1=0; #ifndef DUE_SOFTWARE_SPI int spiDueDividors[] = {10,21,42,84,168,255,255}; diff --git a/src/ArduinoDUE/Repetier/HAL.h b/src/ArduinoDUE/Repetier/HAL.h index cf7d49b9a..eadb283ff 100644 --- a/src/ArduinoDUE/Repetier/HAL.h +++ b/src/ArduinoDUE/Repetier/HAL.h @@ -41,6 +41,7 @@ // which would otherwise have problems with int overflow. #define F_CPU 21000000 // should be factor of F_CPU_TRUE #define F_CPU_TRUE 84000000 // actual CPU clock frequency +#define EEPROM_BYTES 4096 // bytes of eeprom we simulate // another hack to keep AVR code happy (i.e. SdFat.cpp) #define SPR0 0 @@ -214,6 +215,10 @@ union eeval_t { class HAL { public: + // we use ram instead of eeprom, so reads are faster and safer. Writes store in real eeprom as well + // as long as hal eeprom functions are used. + static char virtualEeprom[EEPROM_BYTES]; + HAL(); virtual ~HAL(); @@ -230,6 +235,14 @@ class HAL TC_Configure(DELAY_TIMER, DELAY_TIMER_CHANNEL, TC_CMR_WAVSEL_UP | TC_CMR_WAVE | DELAY_TIMER_CLOCK); TC_Start(DELAY_TIMER, DELAY_TIMER_CHANNEL); +#if EEPROM_AVAILABLE + // Copy eeprom to ram for faster access + int i,n = EEPROM_BYTES; + for(i=0;i Date: Thu, 21 Aug 2014 15:18:58 +0200 Subject: [PATCH 09/20] Fixed pins for due causing eeprom problems --- src/ArduinoDUE/Repetier/pins.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ArduinoDUE/Repetier/pins.h b/src/ArduinoDUE/Repetier/pins.h index 981b3d512..8816b47e8 100644 --- a/src/ArduinoDUE/Repetier/pins.h +++ b/src/ArduinoDUE/Repetier/pins.h @@ -94,7 +94,7 @@ STEPPER_CURRENT_CONTROL #define EEPROM_PAGE_WRITE_TIME 7 // page write time in milliseconds (docs say 5ms but that is too short) // TWI_MMR_IADRSZ_1_BYTE for 1 byte, or TWI_MMR_IADRSZ_2_BYTE for 2 byte #define EEPROM_ADDRSZ_BYTES TWI_MMR_IADRSZ_2_BYTE - +#define EEPROM_AVAILABLE 1 #endif // RADDS Board @@ -179,7 +179,7 @@ STEPPER_CURRENT_CONTROL // specify size of eeprom address register // TWI_MMR_IADRSZ_1_BYTE for 1 byte, or TWI_MMR_IADRSZ_2_BYTE for 2 byte #define EEPROM_ADDRSZ_BYTES TWI_MMR_IADRSZ_2_BYTE - +#define EEPROM_AVAILABLE 1 #endif /****************************************************************************/ @@ -273,7 +273,7 @@ STEPPER_CURRENT_CONTROL // specify size of eeprom address register // TWI_MMR_IADRSZ_1_BYTE for 1 byte, or TWI_MMR_IADRSZ_2_BYTE for 2 byte #define EEPROM_ADDRSZ_BYTES TWI_MMR_IADRSZ_2_BYTE - +#define EEPROM_AVAILABLE 1 #endif #if MOTHERBOARD == 999 From 7b08d274c1be14b7775c151995f71b8d59c102ed Mon Sep 17 00:00:00 2001 From: repetier Date: Sun, 24 Aug 2014 09:24:24 +0200 Subject: [PATCH 10/20] Fixed delta ui menu, due hangs fixed, RAMPS-FD V2 --- src/ArduinoAVR/Repetier/ui.h | 2 +- src/ArduinoAVR/Repetier/uimenu.h | 2 +- src/ArduinoDUE/Repetier/Configuration.h | 11 +++++++---- src/ArduinoDUE/Repetier/HAL.h | 10 +++++----- src/ArduinoDUE/Repetier/pins.h | 8 ++++++-- src/ArduinoDUE/Repetier/ui.h | 2 +- src/ArduinoDUE/Repetier/uimenu.h | 2 +- 7 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/ArduinoAVR/Repetier/ui.h b/src/ArduinoAVR/Repetier/ui.h index 7cd7ec6a6..a54f5aac3 100644 --- a/src/ArduinoAVR/Repetier/ui.h +++ b/src/ArduinoAVR/Repetier/ui.h @@ -817,7 +817,7 @@ void ui_check_slow_keys(int &action) { #define UI_ENCODER_CLICK 48 #define UI_RESET_PIN -1 #define UI_DELAYPERCHAR 40 -#define UI_INVERT_MENU_DIRECTION true +#define UI_INVERT_MENU_DIRECTION 0 #define UI_BUTTON_BACK 71 #ifdef UI_MAIN void ui_init_keys() { diff --git a/src/ArduinoAVR/Repetier/uimenu.h b/src/ArduinoAVR/Repetier/uimenu.h index c4e14f0ab..a69bdf766 100644 --- a/src/ArduinoAVR/Repetier/uimenu.h +++ b/src/ArduinoAVR/Repetier/uimenu.h @@ -366,7 +366,7 @@ UI_MENU_ACTIONSELECTOR(ui_menu_go_zfast_notest,UI_TEXT_Z_POS_FAST,ui_menu_zpos_f #define UI_SPEED_Z_NOTEST ,&ui_menu_go_zpos_notest #endif -#if DRIVE_SYSTEM != DELTA //Positioning menu for non-delta +#if DRIVE_SYSTEM != 3 //Positioning menu for non-delta #define UI_MENU_POSITIONS {UI_MENU_ADDCONDBACK &ui_menu_home_all,&ui_menu_home_x,&ui_menu_home_y,&ui_menu_home_z UI_SPEED_X UI_SPEED_Y UI_SPEED_Z ,&ui_menu_go_epos} UI_MENU(ui_menu_positions,UI_MENU_POSITIONS,5 + 3 * UI_SPEED + UI_MENU_BACKCNT); #else //Positioning menu for delta (removes individual x,y,z homing) diff --git a/src/ArduinoDUE/Repetier/Configuration.h b/src/ArduinoDUE/Repetier/Configuration.h index 150826a10..46215b54c 100644 --- a/src/ArduinoDUE/Repetier/Configuration.h +++ b/src/ArduinoDUE/Repetier/Configuration.h @@ -49,9 +49,10 @@ To override EEPROM settings with config settings, set EEPROM_MODE 0 #define NUM_EXTRUDER 1 //// The following define selects which electronics board you have. Please choose the one that matches your setup -// Arduino Due = 401 // This is only experimental -// Arduino Due with RADDS = 402 -// Arduino Due with RAMPS-FD = 403 +// Arduino Due = 401 // This is only experimental +// Arduino Due with RADDS = 402 +// Arduino Due with RAMPS-FD = 403 +// Arduino Due with RAMPS-FD V2 = 404 #define MOTHERBOARD 402 @@ -74,7 +75,9 @@ is a full cartesian system where x, y and z moves are handled by separate motors 3 = Delta printers (Rostock, Kossel, RostockMax, Cerberus, etc) 4 = Tuga printer (Scott-Russell mechanism) 5 = Bipod system (not implemented) -Cases 1 and 2 cover all needed xy H gantry systems. If you get results mirrored etc. you can swap motor connections for x and y. +8 = y axis + xz H-gantry (x_motor = x+z, z_motor = x-z) +9 = y axis + xz H-gantry (x_motor = x+z, z_motor = z-x) +Cases 1, 2, 8 and 9 cover all needed xy and xz H gantry systems. If you get results mirrored etc. you can swap motor connections for x and y. If a motor turns in the wrong direction change INVERT_X_DIR or INVERT_Y_DIR. */ #define DRIVE_SYSTEM 3 diff --git a/src/ArduinoDUE/Repetier/HAL.h b/src/ArduinoDUE/Repetier/HAL.h index eadb283ff..a9748dd29 100644 --- a/src/ArduinoDUE/Repetier/HAL.h +++ b/src/ArduinoDUE/Repetier/HAL.h @@ -152,9 +152,9 @@ typedef char prog_char; #define LOW 0 #define HIGH 1 -#define BEGIN_INTERRUPT_PROTECTED __disable_irq(); //noInterrupts(); -#define END_INTERRUPT_PROTECTED __enable_irq(); //interrupts(); -#define ESCAPE_INTERRUPT_PROTECTED __enable_irq(); //interrupts(); +#define BEGIN_INTERRUPT_PROTECTED {uint32_t oldInt = __get_PRIMASK();__disable_irq(); +#define END_INTERRUPT_PROTECTED __set_PRIMASK(oldInt);} //__enable_irq(); +#define ESCAPE_INTERRUPT_PROTECTED __set_PRIMASK(oldInt);//__enable_irq(); #define EEPROM_OFFSET 0 #define SECONDS_TO_TICKS(s) (unsigned long)(s*(float)F_CPU) @@ -429,11 +429,11 @@ class HAL static inline void allowInterrupts() { -// __enable_irq(); + __enable_irq(); } static inline void forbidInterrupts() { -// __disable_irq(); + __disable_irq(); } static inline unsigned long timeInMilliseconds() { diff --git a/src/ArduinoDUE/Repetier/pins.h b/src/ArduinoDUE/Repetier/pins.h index 8816b47e8..693e8ea52 100644 --- a/src/ArduinoDUE/Repetier/pins.h +++ b/src/ArduinoDUE/Repetier/pins.h @@ -185,7 +185,7 @@ STEPPER_CURRENT_CONTROL /****************************************************************************/ // RAMPS-FD Board // -#if MOTHERBOARD == 403 +#if MOTHERBOARD == 403 || MOTHERBOARD == 404 #ifndef __SAM3X8E__ #error Oops! Make sure you have 'Arduino Due' selected from the 'Tools -> Boards' menu. #endif @@ -193,7 +193,11 @@ STEPPER_CURRENT_CONTROL #define KNOWN_BOARD #define CPU_ARCH ARCH_ARM -#define HEATER_PINS_INVERTED 1 +#if MOTHERBOARD == 403 +#define HEATER_PINS_INVERTED 1 // only old boards had the output inverted +#else +#define HEATER_PINS_INVERTED 0 +#endif /***************************************************************** * Arduino Due Pin Assignments diff --git a/src/ArduinoDUE/Repetier/ui.h b/src/ArduinoDUE/Repetier/ui.h index 7cd7ec6a6..a54f5aac3 100644 --- a/src/ArduinoDUE/Repetier/ui.h +++ b/src/ArduinoDUE/Repetier/ui.h @@ -817,7 +817,7 @@ void ui_check_slow_keys(int &action) { #define UI_ENCODER_CLICK 48 #define UI_RESET_PIN -1 #define UI_DELAYPERCHAR 40 -#define UI_INVERT_MENU_DIRECTION true +#define UI_INVERT_MENU_DIRECTION 0 #define UI_BUTTON_BACK 71 #ifdef UI_MAIN void ui_init_keys() { diff --git a/src/ArduinoDUE/Repetier/uimenu.h b/src/ArduinoDUE/Repetier/uimenu.h index c4e14f0ab..a69bdf766 100644 --- a/src/ArduinoDUE/Repetier/uimenu.h +++ b/src/ArduinoDUE/Repetier/uimenu.h @@ -366,7 +366,7 @@ UI_MENU_ACTIONSELECTOR(ui_menu_go_zfast_notest,UI_TEXT_Z_POS_FAST,ui_menu_zpos_f #define UI_SPEED_Z_NOTEST ,&ui_menu_go_zpos_notest #endif -#if DRIVE_SYSTEM != DELTA //Positioning menu for non-delta +#if DRIVE_SYSTEM != 3 //Positioning menu for non-delta #define UI_MENU_POSITIONS {UI_MENU_ADDCONDBACK &ui_menu_home_all,&ui_menu_home_x,&ui_menu_home_y,&ui_menu_home_z UI_SPEED_X UI_SPEED_Y UI_SPEED_Z ,&ui_menu_go_epos} UI_MENU(ui_menu_positions,UI_MENU_POSITIONS,5 + 3 * UI_SPEED + UI_MENU_BACKCNT); #else //Positioning menu for delta (removes individual x,y,z homing) From 1b5dc103f94b604628e7891d00a793807b91fddf Mon Sep 17 00:00:00 2001 From: Michal Vondracek Date: Wed, 27 Aug 2014 17:44:58 +0200 Subject: [PATCH 11/20] czech translation - UI_LANGUAGE=8 --- src/ArduinoDUE/Repetier/uilang.h | 172 +++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) diff --git a/src/ArduinoDUE/Repetier/uilang.h b/src/ArduinoDUE/Repetier/uilang.h index 6fc5f7a6e..ef831d542 100644 --- a/src/ArduinoDUE/Repetier/uilang.h +++ b/src/ArduinoDUE/Repetier/uilang.h @@ -1365,6 +1365,178 @@ #endif +// *************** Czech translation **************** +// *************** By Majkl **************** +// version: 2014/08/27 + +#if UI_LANGUAGE==8 + +#define UI_TEXT_ON "Zap" +#define UI_TEXT_OFF "Vyp" +#define UI_TEXT_NA "neni" // Output for not available +#define UI_TEXT_YES "Ano" +#define UI_TEXT_NO "Ne" +#define UI_TEXT_SEL "\003" +#define UI_TEXT_NOSEL "\004" +#define UI_TEXT_PRINT_POS "Tisknu..." +#define UI_TEXT_PRINTING "Tisknu" +#define UI_TEXT_IDLE "V klidu" +#define UI_TEXT_NOSDCARD "Neni SD karta" +#define UI_TEXT_ERROR "**** CHYBA ****" +#define UI_TEXT_BACK "Zpet \001" +#define UI_TEXT_QUICK_SETTINGS "Zakladni nastaveni" +#define UI_TEXT_CONFIGURATION "Nastaveni" +#define UI_TEXT_POSITION "Pozice" +#define UI_TEXT_EXTRUDER "Extruder" +#define UI_TEXT_SD_CARD "SD karta" +#define UI_TEXT_DEBUGGING "Debug" +#define UI_TEXT_HOME_ALL "Home vsech" +#define UI_TEXT_HOME_X "Home X" +#define UI_TEXT_HOME_Y "Home Y" +#define UI_TEXT_HOME_Z "Home Z" +#define UI_TEXT_PREHEAT_PLA "Ohrat pro PLA" +#define UI_TEXT_PREHEAT_ABS "Ohrat pro ABS" +#define UI_TEXT_COOLDOWN "Zchladit" +#define UI_TEXT_SET_TO_ORIGIN "Nastavit pocatek" +#define UI_TEXT_DISABLE_STEPPER "Vypnout motory" +#define UI_TEXT_X_POSITION "X pozice" +#define UI_TEXT_X_POS_FAST "X rychle" +#define UI_TEXT_Y_POSITION "Y pozice" +#define UI_TEXT_Y_POS_FAST "Y rychle" +#define UI_TEXT_Z_POSITION "Z pozice" +#define UI_TEXT_Z_POS_FAST "Z rychle" +#define UI_TEXT_E_POSITION "Pozice extruderu" +#define UI_TEXT_BED_TEMP "Teplota desky: %Eb\002C" +#define UI_TEXT_EXTR0_TEMP "Teplota 1: %E0\002C" +#define UI_TEXT_EXTR1_TEMP "Teplota 2: %E1\002C" +#define UI_TEXT_EXTR2_TEMP "Teplota 2: %E2\002C" +#define UI_TEXT_EXTR0_OFF "Extruder 1 vyp." +#define UI_TEXT_EXTR1_OFF "Extruder 2 vyp." +#define UI_TEXT_EXTR2_OFF "Extruder 3 vyp." +#define UI_TEXT_EXTR0_SELECT "%X0 Zvolit Extr. 1" +#define UI_TEXT_EXTR1_SELECT "%X1 Zvolit Extr. 2" +#define UI_TEXT_EXTR2_SELECT "%X1 Zvolit Extr. 3" +#define UI_TEXT_EXTR_ORIGIN "Nastavit pocatek" +#define UI_TEXT_PRINT_X "Tisk X:%ax" +#define UI_TEXT_PRINT_Y "Tisk Y:%ay" +#define UI_TEXT_PRINT_Z "Tisk Z:%az" +#define UI_TEXT_PRINT_Z_DELTA "Tisk:%az" +#define UI_TEXT_MOVE_X "Posun X:%aX" +#define UI_TEXT_MOVE_Y "Posun Y:%aY" +#define UI_TEXT_MOVE_Z "Posun Z:%aZ" +#define UI_TEXT_MOVE_Z_DELTA "Posun:%aZ" +#define UI_TEXT_JERK "Jerk:%aj" +#define UI_TEXT_ZJERK "Z-Jerk:%aJ" +#define UI_TEXT_ACCELERATION "Akcelerace" +#define UI_TEXT_STORE_TO_EEPROM "Ulozit do EEPROM" +#define UI_TEXT_LOAD_EEPROM "Nahrat z EEPROM" +#define UI_TEXT_DBG_ECHO "Echo :%do" +#define UI_TEXT_DBG_INFO "Info :%di" +#define UI_TEXT_DBG_ERROR "Chyby :%de" +#define UI_TEXT_DBG_DRYRUN "Beh nanecisto:%dd" +#define UI_TEXT_OPS_OFF "%O0 OPS Vypnuto" +#define UI_TEXT_OPS_CLASSIC "%O1 OPS Klasicke" +#define UI_TEXT_OPS_FAST "%O2 OPS Rychle" +#define UI_TEXT_OPS_RETRACT "Retrakce :%Or" +#define UI_TEXT_OPS_BACKSLASH "Vule. :%Ob" +#define UI_TEXT_OPS_MINDIST "Min.vzd,:%Od" +#define UI_TEXT_OPS_MOVE_AFTER "Posunuti po:%Oa" +#define UI_TEXT_ANTI_OOZE "Proti kapani" +#define UI_TEXT_PRINT_FILE "Tisknout soubor" +#define UI_TEXT_PAUSE_PRINT "Pozastavit tisk" +#define UI_TEXT_CONTINUE_PRINT "Pokracovani tisku" +#define UI_TEXT_UNMOUNT_CARD "Odpojit kartu" +#define UI_TEXT_MOUNT_CARD "Pripojit kartu" +#define UI_TEXT_DELETE_FILE "Smazat soubor" +#define UI_TEXT_FEEDRATE "Rychlost" +#define UI_TEXT_FEED_MAX_X "Max X:%fx" +#define UI_TEXT_FEED_MAX_Y "Max Y:%fy" +#define UI_TEXT_FEED_MAX_Z "Max Z:%fz" +#define UI_TEXT_FEED_MAX_Z_DELTA "Max:%fz" +#define UI_TEXT_FEED_HOME_X "Home X:%fX" +#define UI_TEXT_FEED_HOME_Y "Home Y:%fY" +#define UI_TEXT_FEED_HOME_Z "Home Z:%fZ" +#define UI_TEXT_FEED_HOME_Z_DELTA "Home:%fZ" +#define UI_TEXT_ACTION_XPOSITION4 "X:%x0 mm","Min koncak:%sx","Max koncak:%sX","" +#define UI_TEXT_ACTION_YPOSITION4 "Y:%x1 mm","Min koncak:%sy","Max koncak:%sY","" +#define UI_TEXT_ACTION_ZPOSITION4 "Z:%x2 mm","Min koncak:%sz","Max koncak:%sZ","" +#define UI_TEXT_ACTION_XPOSITION_FAST4 "X:%x0 mm","Min koncak:%sx","Max koncak:%sX","" +#define UI_TEXT_ACTION_YPOSITION_FAST4 "Y:%x1 mm","Min koncak:%sy","Max koncak:%sY","" +#define UI_TEXT_ACTION_ZPOSITION_FAST4 "Z:%x2 mm","Min koncak:%sz","Max koncak:%sZ","" +#define UI_TEXT_ACTION_EPOSITION_FAST2 "E:%x3 mm","1 kliknuti = 1 mm" +#define UI_TEXT_ACTION_XPOSITION2 "X:%x0 mm","Min:%sx Max:%sX" +#define UI_TEXT_ACTION_YPOSITION2 "Y:%x1 mm","Min:%sy Max:%sY" +#define UI_TEXT_ACTION_ZPOSITION2 "Z:%x2 mm","Min:%sz Max:%sZ" +#define UI_TEXT_ACTION_XPOSITION_FAST2 "X:%x0 mm","Min:%sx Max:%sX" +#define UI_TEXT_ACTION_YPOSITION_FAST2 "Y:%x1 mm","Min:%sy Max:%sY" +#define UI_TEXT_ACTION_ZPOSITION_FAST2 "Z:%x2 mm","Min:%sz Max:%sZ" +#define UI_TEXT_FANSPEED "Rychlost vetraku" +#define UI_TEXT_ACTION_FANSPEED "Aktualni rychlost:%Fs%%%" +#define UI_TEXT_FAN_OFF "Vypnout" +#define UI_TEXT_FAN_25 "Vetrak na 25%%%" +#define UI_TEXT_FAN_50 "Vetrak na 50%%%" +#define UI_TEXT_FAN_75 "Vetrak na 75%%%" +#define UI_TEXT_FAN_FULL "Vetrak na plno" +#define UI_TEXT_STEPPER_INACTIVE "Neaktivni motory" +#define UI_TEXT_STEPPER_INACTIVE2 "Vypnout po:%is","[s] 0=Off" +#define UI_TEXT_POWER_INACTIVE "Max. neaktivni" +#define UI_TEXT_POWER_INACTIVE2 "Vypnout po:%ip","[s] 0=Off" +#define UI_TEXT_GENERAL "Zakladni" +#define UI_TEXT_BAUDRATE "Rychlost:%oc" +#define UI_TEXT_EXTR_STEPS "kroku/MM:%Se" +#define UI_TEXT_EXTR_START_FEED "Start FR:%Xf" +#define UI_TEXT_EXTR_MAX_FEED "Max FR:%XF" +#define UI_TEXT_EXTR_ACCEL "Zrychl.:%XA" +#define UI_TEXT_EXTR_WATCH "Stab.cas:%Xw" +#define UI_TEXT_EXTR_ADVANCE_L "Rozsir. lin:%Xl" +#define UI_TEXT_EXTR_ADVANCE_K "Rozsir. quad:%Xa" +#define UI_TEXT_EXTR_MANAGER "Control:%Xh" +#define UI_TEXT_EXTR_PGAIN "DT/PID P:%Xp" +#define UI_TEXT_EXTR_IGAIN "PID I:%Xi" +#define UI_TEXT_EXTR_DGAIN "PID D:%Xd" +#define UI_TEXT_EXTR_DMIN "Drive Min:%Xm" +#define UI_TEXT_EXTR_DMAX "Drive Max:%XM" +#define UI_TEXT_EXTR_PMAX "PID Max:%XD" +#define UI_TEXT_EXTR_XOFF "X-Offset:%Xx" +#define UI_TEXT_EXTR_YOFF "Y-Offset:%Xy" +#define UI_TEXT_STRING_HM_BANGBANG "BangBang" +#define UI_TEXT_STRING_HM_PID "PID" +#define UI_TEXT_STRING_ACTION "Akce:%la" +#define UI_TEXT_HEATING_EXTRUDER "Ohrivani extruderu" +#define UI_TEXT_HEATING_BED "Ohrivani desky" +#define UI_TEXT_KILLED "Zastaveno" +#define UI_TEXT_STEPPER_DISABLED "Motor vypnut" +#define UI_TEXT_EEPROM_STORED "Konfigurace","ulozena v EEPROM" +#define UI_TEXT_EEPROM_LOADED "Konfigurace","nactena z EEPROM" +#define UI_TEXT_UPLOADING "Nahravam..." +#define UI_TEXT_PAGE_BUFFER "Buffer:%oB" +#define UI_TEXT_PAGE_EXTRUDER " E:%ec/%Ec\002C\176%oC" +#define UI_TEXT_PAGE_EXTRUDER1 "E1:%e0/%E0\002C\176%o0" +#define UI_TEXT_PAGE_EXTRUDER2 "E2:%e1/%E1\002C\176%o1" +#define UI_TEXT_PAGE_EXTRUDER3 "E3:%e2/%E2\002C\176%o2" +#define UI_TEXT_PAGE_BED " B:%eb/%Eb\002C\176%ob" +#define UI_TEXT_SPEED_MULTIPLY "Rychlost:%om%%%" +#define UI_TEXT_FLOW_MULTIPLY "Extruder:%of%%%" +#define UI_TEXT_EXTR_WAIT_RETRACT_TEMP "Tepl. cekani%XT\002C" +#define UI_TEXT_EXTR_WAIT_RETRACT_UNITS "Jedn. cekani:%XUmm" +#define UI_TEXT_PRINTER_READY "Tiskarna OK" +#define UI_TEXT_SD_REMOVED "SD karta vyjmuta." +#define UI_TEXT_SD_INSERTED "Vlozena SD karta" +// Printtime output gets aggregated like UI_TEXT_PRINTTIME_DAYSUI_TEXT_PRINTTIME_HOURSUI_TEXT_PRINTTIME_MINUTES +// ___88 days 12:45 +#define UI_TEXT_PRINTTIME_DAYS " dnu " +#define UI_TEXT_PRINTTIME_HOURS ":" +#define UI_TEXT_PRINTTIME_MINUTES "" +#define UI_TEXT_PRINT_TIME "Cas tisku" +#define UI_TEXT_PRINT_FILAMENT "Protisknuto" +#define UI_TEXT_POWER "Zapnout ATX zdroj" +#define UI_TEXT_STRING_HM_DEADTIME "Dead Time" +#define UI_TEXT_STRING_HM_SLOWBANG "SlowBang" +#define UI_TEXT_STOP_PRINT "Zastavit tisk" + +#endif + + // ************************************************************************************* // User defined language // From 31e4d62fe0a15176bb1955ee6517dbd427a6f620 Mon Sep 17 00:00:00 2001 From: Michal Vondracek Date: Wed, 27 Aug 2014 17:47:53 +0200 Subject: [PATCH 12/20] avr - czech translation - UI_LANGUAGE=8 --- src/ArduinoAVR/Repetier/uilang.h | 170 +++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+) diff --git a/src/ArduinoAVR/Repetier/uilang.h b/src/ArduinoAVR/Repetier/uilang.h index 6fc5f7a6e..17f51f6c4 100644 --- a/src/ArduinoAVR/Repetier/uilang.h +++ b/src/ArduinoAVR/Repetier/uilang.h @@ -1364,6 +1364,176 @@ #endif +// *************** Czech translation **************** +// *************** By Majkl **************** +// version: 2014/08/27 +#if UI_LANGUAGE==8 + +#define UI_TEXT_ON "Zap" +#define UI_TEXT_OFF "Vyp" +#define UI_TEXT_NA "neni" // Output for not available +#define UI_TEXT_YES "Ano" +#define UI_TEXT_NO "Ne" +#define UI_TEXT_SEL "\003" +#define UI_TEXT_NOSEL "\004" +#define UI_TEXT_PRINT_POS "Tisknu..." +#define UI_TEXT_PRINTING "Tisknu" +#define UI_TEXT_IDLE "V klidu" +#define UI_TEXT_NOSDCARD "Neni SD karta" +#define UI_TEXT_ERROR "**** CHYBA ****" +#define UI_TEXT_BACK "Zpet \001" +#define UI_TEXT_QUICK_SETTINGS "Zakladni nastaveni" +#define UI_TEXT_CONFIGURATION "Nastaveni" +#define UI_TEXT_POSITION "Pozice" +#define UI_TEXT_EXTRUDER "Extruder" +#define UI_TEXT_SD_CARD "SD karta" +#define UI_TEXT_DEBUGGING "Debug" +#define UI_TEXT_HOME_ALL "Home vsech" +#define UI_TEXT_HOME_X "Home X" +#define UI_TEXT_HOME_Y "Home Y" +#define UI_TEXT_HOME_Z "Home Z" +#define UI_TEXT_PREHEAT_PLA "Ohrat pro PLA" +#define UI_TEXT_PREHEAT_ABS "Ohrat pro ABS" +#define UI_TEXT_COOLDOWN "Zchladit" +#define UI_TEXT_SET_TO_ORIGIN "Nastavit pocatek" +#define UI_TEXT_DISABLE_STEPPER "Vypnout motory" +#define UI_TEXT_X_POSITION "X pozice" +#define UI_TEXT_X_POS_FAST "X rychle" +#define UI_TEXT_Y_POSITION "Y pozice" +#define UI_TEXT_Y_POS_FAST "Y rychle" +#define UI_TEXT_Z_POSITION "Z pozice" +#define UI_TEXT_Z_POS_FAST "Z rychle" +#define UI_TEXT_E_POSITION "Pozice extruderu" +#define UI_TEXT_BED_TEMP "Teplota desky: %Eb\002C" +#define UI_TEXT_EXTR0_TEMP "Teplota 1: %E0\002C" +#define UI_TEXT_EXTR1_TEMP "Teplota 2: %E1\002C" +#define UI_TEXT_EXTR2_TEMP "Teplota 2: %E2\002C" +#define UI_TEXT_EXTR0_OFF "Extruder 1 vyp." +#define UI_TEXT_EXTR1_OFF "Extruder 2 vyp." +#define UI_TEXT_EXTR2_OFF "Extruder 3 vyp." +#define UI_TEXT_EXTR0_SELECT "%X0 Zvolit Extr. 1" +#define UI_TEXT_EXTR1_SELECT "%X1 Zvolit Extr. 2" +#define UI_TEXT_EXTR2_SELECT "%X1 Zvolit Extr. 3" +#define UI_TEXT_EXTR_ORIGIN "Nastavit pocatek" +#define UI_TEXT_PRINT_X "Tisk X:%ax" +#define UI_TEXT_PRINT_Y "Tisk Y:%ay" +#define UI_TEXT_PRINT_Z "Tisk Z:%az" +#define UI_TEXT_PRINT_Z_DELTA "Tisk:%az" +#define UI_TEXT_MOVE_X "Posun X:%aX" +#define UI_TEXT_MOVE_Y "Posun Y:%aY" +#define UI_TEXT_MOVE_Z "Posun Z:%aZ" +#define UI_TEXT_MOVE_Z_DELTA "Posun:%aZ" +#define UI_TEXT_JERK "Jerk:%aj" +#define UI_TEXT_ZJERK "Z-Jerk:%aJ" +#define UI_TEXT_ACCELERATION "Akcelerace" +#define UI_TEXT_STORE_TO_EEPROM "Ulozit do EEPROM" +#define UI_TEXT_LOAD_EEPROM "Nahrat z EEPROM" +#define UI_TEXT_DBG_ECHO "Echo :%do" +#define UI_TEXT_DBG_INFO "Info :%di" +#define UI_TEXT_DBG_ERROR "Chyby :%de" +#define UI_TEXT_DBG_DRYRUN "Beh nanecisto:%dd" +#define UI_TEXT_OPS_OFF "%O0 OPS Vypnuto" +#define UI_TEXT_OPS_CLASSIC "%O1 OPS Klasicke" +#define UI_TEXT_OPS_FAST "%O2 OPS Rychle" +#define UI_TEXT_OPS_RETRACT "Retrakce :%Or" +#define UI_TEXT_OPS_BACKSLASH "Vule. :%Ob" +#define UI_TEXT_OPS_MINDIST "Min.vzd,:%Od" +#define UI_TEXT_OPS_MOVE_AFTER "Posunuti po:%Oa" +#define UI_TEXT_ANTI_OOZE "Proti kapani" +#define UI_TEXT_PRINT_FILE "Tisknout soubor" +#define UI_TEXT_PAUSE_PRINT "Pozastavit tisk" +#define UI_TEXT_CONTINUE_PRINT "Pokracovani tisku" +#define UI_TEXT_UNMOUNT_CARD "Odpojit kartu" +#define UI_TEXT_MOUNT_CARD "Pripojit kartu" +#define UI_TEXT_DELETE_FILE "Smazat soubor" +#define UI_TEXT_FEEDRATE "Rychlost" +#define UI_TEXT_FEED_MAX_X "Max X:%fx" +#define UI_TEXT_FEED_MAX_Y "Max Y:%fy" +#define UI_TEXT_FEED_MAX_Z "Max Z:%fz" +#define UI_TEXT_FEED_MAX_Z_DELTA "Max:%fz" +#define UI_TEXT_FEED_HOME_X "Home X:%fX" +#define UI_TEXT_FEED_HOME_Y "Home Y:%fY" +#define UI_TEXT_FEED_HOME_Z "Home Z:%fZ" +#define UI_TEXT_FEED_HOME_Z_DELTA "Home:%fZ" +#define UI_TEXT_ACTION_XPOSITION4 "X:%x0 mm","Min koncak:%sx","Max koncak:%sX","" +#define UI_TEXT_ACTION_YPOSITION4 "Y:%x1 mm","Min koncak:%sy","Max koncak:%sY","" +#define UI_TEXT_ACTION_ZPOSITION4 "Z:%x2 mm","Min koncak:%sz","Max koncak:%sZ","" +#define UI_TEXT_ACTION_XPOSITION_FAST4 "X:%x0 mm","Min koncak:%sx","Max koncak:%sX","" +#define UI_TEXT_ACTION_YPOSITION_FAST4 "Y:%x1 mm","Min koncak:%sy","Max koncak:%sY","" +#define UI_TEXT_ACTION_ZPOSITION_FAST4 "Z:%x2 mm","Min koncak:%sz","Max koncak:%sZ","" +#define UI_TEXT_ACTION_EPOSITION_FAST2 "E:%x3 mm","1 kliknuti = 1 mm" +#define UI_TEXT_ACTION_XPOSITION2 "X:%x0 mm","Min:%sx Max:%sX" +#define UI_TEXT_ACTION_YPOSITION2 "Y:%x1 mm","Min:%sy Max:%sY" +#define UI_TEXT_ACTION_ZPOSITION2 "Z:%x2 mm","Min:%sz Max:%sZ" +#define UI_TEXT_ACTION_XPOSITION_FAST2 "X:%x0 mm","Min:%sx Max:%sX" +#define UI_TEXT_ACTION_YPOSITION_FAST2 "Y:%x1 mm","Min:%sy Max:%sY" +#define UI_TEXT_ACTION_ZPOSITION_FAST2 "Z:%x2 mm","Min:%sz Max:%sZ" +#define UI_TEXT_FANSPEED "Rychlost vetraku" +#define UI_TEXT_ACTION_FANSPEED "Aktualni rychlost:%Fs%%%" +#define UI_TEXT_FAN_OFF "Vypnout" +#define UI_TEXT_FAN_25 "Vetrak na 25%%%" +#define UI_TEXT_FAN_50 "Vetrak na 50%%%" +#define UI_TEXT_FAN_75 "Vetrak na 75%%%" +#define UI_TEXT_FAN_FULL "Vetrak na plno" +#define UI_TEXT_STEPPER_INACTIVE "Neaktivni motory" +#define UI_TEXT_STEPPER_INACTIVE2 "Vypnout po:%is","[s] 0=Off" +#define UI_TEXT_POWER_INACTIVE "Max. neaktivni" +#define UI_TEXT_POWER_INACTIVE2 "Vypnout po:%ip","[s] 0=Off" +#define UI_TEXT_GENERAL "Zakladni" +#define UI_TEXT_BAUDRATE "Rychlost:%oc" +#define UI_TEXT_EXTR_STEPS "kroku/MM:%Se" +#define UI_TEXT_EXTR_START_FEED "Start FR:%Xf" +#define UI_TEXT_EXTR_MAX_FEED "Max FR:%XF" +#define UI_TEXT_EXTR_ACCEL "Zrychl.:%XA" +#define UI_TEXT_EXTR_WATCH "Stab.cas:%Xw" +#define UI_TEXT_EXTR_ADVANCE_L "Rozsir. lin:%Xl" +#define UI_TEXT_EXTR_ADVANCE_K "Rozsir. quad:%Xa" +#define UI_TEXT_EXTR_MANAGER "Control:%Xh" +#define UI_TEXT_EXTR_PGAIN "DT/PID P:%Xp" +#define UI_TEXT_EXTR_IGAIN "PID I:%Xi" +#define UI_TEXT_EXTR_DGAIN "PID D:%Xd" +#define UI_TEXT_EXTR_DMIN "Drive Min:%Xm" +#define UI_TEXT_EXTR_DMAX "Drive Max:%XM" +#define UI_TEXT_EXTR_PMAX "PID Max:%XD" +#define UI_TEXT_EXTR_XOFF "X-Offset:%Xx" +#define UI_TEXT_EXTR_YOFF "Y-Offset:%Xy" +#define UI_TEXT_STRING_HM_BANGBANG "BangBang" +#define UI_TEXT_STRING_HM_PID "PID" +#define UI_TEXT_STRING_ACTION "Akce:%la" +#define UI_TEXT_HEATING_EXTRUDER "Ohrivani extruderu" +#define UI_TEXT_HEATING_BED "Ohrivani desky" +#define UI_TEXT_KILLED "Zastaveno" +#define UI_TEXT_STEPPER_DISABLED "Motor vypnut" +#define UI_TEXT_EEPROM_STORED "Konfigurace","ulozena v EEPROM" +#define UI_TEXT_EEPROM_LOADED "Konfigurace","nactena z EEPROM" +#define UI_TEXT_UPLOADING "Nahravam..." +#define UI_TEXT_PAGE_BUFFER "Buffer:%oB" +#define UI_TEXT_PAGE_EXTRUDER " E:%ec/%Ec\002C\176%oC" +#define UI_TEXT_PAGE_EXTRUDER1 "E1:%e0/%E0\002C\176%o0" +#define UI_TEXT_PAGE_EXTRUDER2 "E2:%e1/%E1\002C\176%o1" +#define UI_TEXT_PAGE_EXTRUDER3 "E3:%e2/%E2\002C\176%o2" +#define UI_TEXT_PAGE_BED " B:%eb/%Eb\002C\176%ob" +#define UI_TEXT_SPEED_MULTIPLY "Rychlost:%om%%%" +#define UI_TEXT_FLOW_MULTIPLY "Extruder:%of%%%" +#define UI_TEXT_EXTR_WAIT_RETRACT_TEMP "Tepl. cekani%XT\002C" +#define UI_TEXT_EXTR_WAIT_RETRACT_UNITS "Jedn. cekani:%XUmm" +#define UI_TEXT_PRINTER_READY "Tiskarna OK" +#define UI_TEXT_SD_REMOVED "SD karta vyjmuta." +#define UI_TEXT_SD_INSERTED "Vlozena SD karta" +// Printtime output gets aggregated like UI_TEXT_PRINTTIME_DAYSUI_TEXT_PRINTTIME_HOURSUI_TEXT_PRINTTIME_MINUTES +// ___88 days 12:45 +#define UI_TEXT_PRINTTIME_DAYS " dnu " +#define UI_TEXT_PRINTTIME_HOURS ":" +#define UI_TEXT_PRINTTIME_MINUTES "" +#define UI_TEXT_PRINT_TIME "Cas tisku" +#define UI_TEXT_PRINT_FILAMENT "Protisknuto" +#define UI_TEXT_POWER "Zapnout ATX zdroj" +#define UI_TEXT_STRING_HM_DEADTIME "Dead Time" +#define UI_TEXT_STRING_HM_SLOWBANG "SlowBang" +#define UI_TEXT_STOP_PRINT "Zastavit tisk" + +#endif + // ************************************************************************************* // User defined language From d03331ceb38e410ad286ac2bdd9ccf1c6494877b Mon Sep 17 00:00:00 2001 From: Doudou14 Date: Thu, 28 Aug 2014 19:26:36 +0200 Subject: [PATCH 13/20] french Correction --- src/ArduinoDUE/Repetier/uilang.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/ArduinoDUE/Repetier/uilang.h b/src/ArduinoDUE/Repetier/uilang.h index ef831d542..e05b53235 100644 --- a/src/ArduinoDUE/Repetier/uilang.h +++ b/src/ArduinoDUE/Repetier/uilang.h @@ -1226,6 +1226,7 @@ #define UI_TEXT_HOME_Z "Accueil Z" #define UI_TEXT_PREHEAT_PLA "Prechauf. PLA" #define UI_TEXT_PREHEAT_ABS "Prechauf. ABS" +#define UI_TEXT_LIGHTS_ONOFF "Eclairage :%lo" #define UI_TEXT_COOLDOWN "Refroidir" #define UI_TEXT_SET_TO_ORIGIN "Set to Origin" #define UI_TEXT_DISABLE_STEPPER "Desactiv. Moteurs" @@ -1287,12 +1288,12 @@ #define UI_TEXT_FEED_HOME_Y "Accueil Y:%fY" #define UI_TEXT_FEED_HOME_Z "Accueil Z:%fZ" #define UI_TEXT_FEED_HOME_Z_DELTA "Accueil:%fZ" -#define UI_TEXT_ACTION_XPOSITION4 "X:%x0 mm","Min Butée:%sx","Max Butée:%sX","" -#define UI_TEXT_ACTION_YPOSITION4 "Y:%x1 mm","Min Butée:%sy","Max Butée:%sY","" -#define UI_TEXT_ACTION_ZPOSITION4 "Z:%x2 mm","Min Butée:%sz","Max Butée:%sZ","" -#define UI_TEXT_ACTION_XPOSITION_FAST4 "X:%x0 mm","Min Butée:%sx","Max Butée:%sX","" -#define UI_TEXT_ACTION_YPOSITION_FAST4 "Y:%x1 mm","Min Butée:%sy","Max Butée:%sY","" -#define UI_TEXT_ACTION_ZPOSITION_FAST4 "Z:%x2 mm","Min Butée:%sz","Max Butée:%sZ","" +#define UI_TEXT_ACTION_XPOSITION4 "X:%x0 mm","Min Butee:%sx","Max Butee:%sX","" +#define UI_TEXT_ACTION_YPOSITION4 "Y:%x1 mm","Min Butee:%sy","Max Butee:%sY","" +#define UI_TEXT_ACTION_ZPOSITION4 "Z:%x2 mm","Min Butee:%sz","Max Butee:%sZ","" +#define UI_TEXT_ACTION_XPOSITION_FAST4 "X:%x0 mm","Min Butee:%sx","Max Butee:%sX","" +#define UI_TEXT_ACTION_YPOSITION_FAST4 "Y:%x1 mm","Min Butee:%sy","Max Butee:%sY","" +#define UI_TEXT_ACTION_ZPOSITION_FAST4 "Z:%x2 mm","Min Butee:%sz","Max Butee:%sZ","" #define UI_TEXT_ACTION_EPOSITION_FAST2 "E:%x3 mm","1 clic = 1 mm" #define UI_TEXT_ACTION_XPOSITION2 "X:%x0 mm","Min:%sx Max:%sX" #define UI_TEXT_ACTION_YPOSITION2 "Y:%x1 mm","Min:%sy Max:%sY" @@ -1339,7 +1340,7 @@ #define UI_TEXT_EEPROM_STORED "Configuration","Stock. Dans EEPROM" #define UI_TEXT_EEPROM_LOADED "Configuration","Charg. f. EEPROM" #define UI_TEXT_UPLOADING "Telechargement.." -#define UI_TEXT_PAGE_BUFFER "Buffer:%oB" +#define UI_TEXT_PAGE_BUFFER "Tampon:%oB" #define UI_TEXT_PAGE_EXTRUDER " E:%ec/%Ec\002C\176%oC" #define UI_TEXT_PAGE_EXTRUDER1 "E1:%e0/%E0\002C\176%o0" #define UI_TEXT_PAGE_EXTRUDER2 "E2:%e1/%E1\002C\176%o1" @@ -1358,8 +1359,8 @@ #define UI_TEXT_PRINT_TIME "Temps Impression" #define UI_TEXT_PRINT_FILAMENT "Filament Imprime" #define UI_TEXT_POWER "ATX power on/off" -#define UI_TEXT_STRING_HM_DEADTIME "Temps Mort" -#define UI_TEXT_STRING_HM_SLOWBANG "SlowBang" +#define UI_TEXT_STRING_HM_DEADTIME "PWM" +#define UI_TEXT_STRING_HM_SLOWBANG "Tout ou Rien" #define UI_TEXT_STOP_PRINT "Arret Impress." #endif From 8d20015c8aee7034a2ae32c4e8c62c808889caca Mon Sep 17 00:00:00 2001 From: repetier Date: Sun, 31 Aug 2014 10:23:48 +0200 Subject: [PATCH 14/20] New languages french and Czech --- src/ArduinoAVR/Repetier/Configuration.h | 1 + src/ArduinoAVR/Repetier/uilang.h | 21 +++++++++++---------- src/ArduinoDUE/Repetier/Configuration.h | 2 ++ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/ArduinoAVR/Repetier/Configuration.h b/src/ArduinoAVR/Repetier/Configuration.h index 3bd39ac1d..30c3c8a71 100644 --- a/src/ArduinoAVR/Repetier/Configuration.h +++ b/src/ArduinoAVR/Repetier/Configuration.h @@ -1198,6 +1198,7 @@ Select the language to use. 5 = Spanish 6 = Swedish 7 = French +8 = Czech */ #define UI_LANGUAGE 1 diff --git a/src/ArduinoAVR/Repetier/uilang.h b/src/ArduinoAVR/Repetier/uilang.h index 17f51f6c4..9dff50f09 100644 --- a/src/ArduinoAVR/Repetier/uilang.h +++ b/src/ArduinoAVR/Repetier/uilang.h @@ -1226,6 +1226,7 @@ #define UI_TEXT_HOME_Z "Accueil Z" #define UI_TEXT_PREHEAT_PLA "Prechauf. PLA" #define UI_TEXT_PREHEAT_ABS "Prechauf. ABS" +#define UI_TEXT_LIGHTS_ONOFF "Eclairage :%lo" #define UI_TEXT_COOLDOWN "Refroidir" #define UI_TEXT_SET_TO_ORIGIN "Set to Origin" #define UI_TEXT_DISABLE_STEPPER "Desactiv. Moteurs" @@ -1270,7 +1271,7 @@ #define UI_TEXT_OPS_RETRACT "Retract. :%Or" #define UI_TEXT_OPS_BACKSLASH "Backsl. :%Ob" #define UI_TEXT_OPS_MINDIST "Min.dist:%Od" -#define UI_TEXT_OPS_MOVE_AFTER "Déplac. Apres:%Oa" +#define UI_TEXT_OPS_MOVE_AFTER "Déplac. Apres:%Oa" #define UI_TEXT_ANTI_OOZE "Anti Ooze" #define UI_TEXT_PRINT_FILE "Imprim. fichier" #define UI_TEXT_PAUSE_PRINT "Pause Impress." @@ -1287,12 +1288,12 @@ #define UI_TEXT_FEED_HOME_Y "Accueil Y:%fY" #define UI_TEXT_FEED_HOME_Z "Accueil Z:%fZ" #define UI_TEXT_FEED_HOME_Z_DELTA "Accueil:%fZ" -#define UI_TEXT_ACTION_XPOSITION4 "X:%x0 mm","Min Butée:%sx","Max Butée:%sX","" -#define UI_TEXT_ACTION_YPOSITION4 "Y:%x1 mm","Min Butée:%sy","Max Butée:%sY","" -#define UI_TEXT_ACTION_ZPOSITION4 "Z:%x2 mm","Min Butée:%sz","Max Butée:%sZ","" -#define UI_TEXT_ACTION_XPOSITION_FAST4 "X:%x0 mm","Min Butée:%sx","Max Butée:%sX","" -#define UI_TEXT_ACTION_YPOSITION_FAST4 "Y:%x1 mm","Min Butée:%sy","Max Butée:%sY","" -#define UI_TEXT_ACTION_ZPOSITION_FAST4 "Z:%x2 mm","Min Butée:%sz","Max Butée:%sZ","" +#define UI_TEXT_ACTION_XPOSITION4 "X:%x0 mm","Min Butee:%sx","Max Butee:%sX","" +#define UI_TEXT_ACTION_YPOSITION4 "Y:%x1 mm","Min Butee:%sy","Max Butee:%sY","" +#define UI_TEXT_ACTION_ZPOSITION4 "Z:%x2 mm","Min Butee:%sz","Max Butee:%sZ","" +#define UI_TEXT_ACTION_XPOSITION_FAST4 "X:%x0 mm","Min Butee:%sx","Max Butee:%sX","" +#define UI_TEXT_ACTION_YPOSITION_FAST4 "Y:%x1 mm","Min Butee:%sy","Max Butee:%sY","" +#define UI_TEXT_ACTION_ZPOSITION_FAST4 "Z:%x2 mm","Min Butee:%sz","Max Butee:%sZ","" #define UI_TEXT_ACTION_EPOSITION_FAST2 "E:%x3 mm","1 clic = 1 mm" #define UI_TEXT_ACTION_XPOSITION2 "X:%x0 mm","Min:%sx Max:%sX" #define UI_TEXT_ACTION_YPOSITION2 "Y:%x1 mm","Min:%sy Max:%sY" @@ -1339,7 +1340,7 @@ #define UI_TEXT_EEPROM_STORED "Configuration","Stock. Dans EEPROM" #define UI_TEXT_EEPROM_LOADED "Configuration","Charg. f. EEPROM" #define UI_TEXT_UPLOADING "Telechargement.." -#define UI_TEXT_PAGE_BUFFER "Buffer:%oB" +#define UI_TEXT_PAGE_BUFFER "Tampon:%oB" #define UI_TEXT_PAGE_EXTRUDER " E:%ec/%Ec\002C\176%oC" #define UI_TEXT_PAGE_EXTRUDER1 "E1:%e0/%E0\002C\176%o0" #define UI_TEXT_PAGE_EXTRUDER2 "E2:%e1/%E1\002C\176%o1" @@ -1358,8 +1359,8 @@ #define UI_TEXT_PRINT_TIME "Temps Impression" #define UI_TEXT_PRINT_FILAMENT "Filament Imprime" #define UI_TEXT_POWER "ATX power on/off" -#define UI_TEXT_STRING_HM_DEADTIME "Temps Mort" -#define UI_TEXT_STRING_HM_SLOWBANG "SlowBang" +#define UI_TEXT_STRING_HM_DEADTIME "PWM" +#define UI_TEXT_STRING_HM_SLOWBANG "Tout ou Rien" #define UI_TEXT_STOP_PRINT "Arret Impress." #endif diff --git a/src/ArduinoDUE/Repetier/Configuration.h b/src/ArduinoDUE/Repetier/Configuration.h index 46215b54c..a2f6c82fb 100644 --- a/src/ArduinoDUE/Repetier/Configuration.h +++ b/src/ArduinoDUE/Repetier/Configuration.h @@ -1162,6 +1162,8 @@ Select the language to use. 4 = Italian 5 = Spanish 6 = Swedish +7 = French +8 = Czech */ #define UI_LANGUAGE 1 From 3bc3cffbd88b9abcc2ed22d8a20d402daadb6b27 Mon Sep 17 00:00:00 2001 From: repetier Date: Sat, 4 Oct 2014 08:40:06 +0200 Subject: [PATCH 15/20] Fixed echo command call --- changelog.txt | 3 +++ src/ArduinoAVR/Repetier/gcode.cpp | 6 +++--- src/ArduinoDUE/Repetier/gcode.cpp | 6 +++--- src/ArduinoDUE/Repetier/uilang.h | 4 +--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/changelog.txt b/changelog.txt index 562c19380..fcbdddc61 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,6 @@ +Version 0.91.8 + New languages french and Czech + Version 0.91.7 15-03-2014 Babystepping. Z-Calib allows Z < 0. diff --git a/src/ArduinoAVR/Repetier/gcode.cpp b/src/ArduinoAVR/Repetier/gcode.cpp index 865c952b2..8e6f25e8f 100644 --- a/src/ArduinoAVR/Repetier/gcode.cpp +++ b/src/ArduinoAVR/Repetier/gcode.cpp @@ -209,11 +209,11 @@ void GCode::checkAndPushCommand() } void GCode::pushCommand() { - bufferWriteIndex = (bufferWriteIndex+1) % GCODE_BUFFER_SIZE; - bufferLength++; #ifndef ECHO_ON_EXECUTE - echoCommand(); + commandsBuffered[bufferWriteIndex].echoCommand(); #endif + bufferWriteIndex = (bufferWriteIndex+1) % GCODE_BUFFER_SIZE; + bufferLength++; } /** Get the next buffered command. Returns 0 if no more commands are buffered. For each diff --git a/src/ArduinoDUE/Repetier/gcode.cpp b/src/ArduinoDUE/Repetier/gcode.cpp index 865c952b2..8e6f25e8f 100644 --- a/src/ArduinoDUE/Repetier/gcode.cpp +++ b/src/ArduinoDUE/Repetier/gcode.cpp @@ -209,11 +209,11 @@ void GCode::checkAndPushCommand() } void GCode::pushCommand() { - bufferWriteIndex = (bufferWriteIndex+1) % GCODE_BUFFER_SIZE; - bufferLength++; #ifndef ECHO_ON_EXECUTE - echoCommand(); + commandsBuffered[bufferWriteIndex].echoCommand(); #endif + bufferWriteIndex = (bufferWriteIndex+1) % GCODE_BUFFER_SIZE; + bufferLength++; } /** Get the next buffered command. Returns 0 if no more commands are buffered. For each diff --git a/src/ArduinoDUE/Repetier/uilang.h b/src/ArduinoDUE/Repetier/uilang.h index e05b53235..9dff50f09 100644 --- a/src/ArduinoDUE/Repetier/uilang.h +++ b/src/ArduinoDUE/Repetier/uilang.h @@ -1271,7 +1271,7 @@ #define UI_TEXT_OPS_RETRACT "Retract. :%Or" #define UI_TEXT_OPS_BACKSLASH "Backsl. :%Ob" #define UI_TEXT_OPS_MINDIST "Min.dist:%Od" -#define UI_TEXT_OPS_MOVE_AFTER "Déplac. Apres:%Oa" +#define UI_TEXT_OPS_MOVE_AFTER "Déplac. Apres:%Oa" #define UI_TEXT_ANTI_OOZE "Anti Ooze" #define UI_TEXT_PRINT_FILE "Imprim. fichier" #define UI_TEXT_PAUSE_PRINT "Pause Impress." @@ -1365,11 +1365,9 @@ #endif - // *************** Czech translation **************** // *************** By Majkl **************** // version: 2014/08/27 - #if UI_LANGUAGE==8 #define UI_TEXT_ON "Zap" From bbac01a5479a2bf600567c159c4465bb53d2af27 Mon Sep 17 00:00:00 2001 From: repetier Date: Sat, 11 Oct 2014 09:47:20 +0200 Subject: [PATCH 16/20] Fixed due hang, but due users should still use 0.92 with watchdog support. --- src/ArduinoDUE/Repetier/HAL.cpp | 23 ----------------------- src/ArduinoDUE/Repetier/HAL.h | 11 ++++++++--- 2 files changed, 8 insertions(+), 26 deletions(-) diff --git a/src/ArduinoDUE/Repetier/HAL.cpp b/src/ArduinoDUE/Repetier/HAL.cpp index 0966c7d71..43a973cc4 100644 --- a/src/ArduinoDUE/Repetier/HAL.cpp +++ b/src/ArduinoDUE/Repetier/HAL.cpp @@ -547,29 +547,6 @@ unsigned char HAL::i2cReadNak(void) return data; } - -// Wait for X microseconds -// this could be simpler but its used inside interrupts so must be reentrant -void HAL::microsecondsWait(uint32_t us) -{ - uint32_t usStart, goal; - - // get the current count - usStart = TC_ReadCV(DELAY_TIMER, DELAY_TIMER_CHANNEL); - - // funny math here to give good accuracy with no overflow - goal = usStart + 10*us-5; //((F_CPU_TRUE / (DELAY_TIMER_PRESCALE * 100000)) * us) / 10; - - // goal may have wrapped, if so wait for counter to catch up - if(goal < usStart) { - while(goal < TC_ReadCV(DELAY_TIMER, DELAY_TIMER_CHANNEL)); - } - // wait for counter to reach requested value - while(goal > TC_ReadCV(DELAY_TIMER, DELAY_TIMER_CHANNEL)); -} - - - #if FEATURE_SERVO // may need further restrictions here in the future #if defined (__SAM3X8E__) diff --git a/src/ArduinoDUE/Repetier/HAL.h b/src/ArduinoDUE/Repetier/HAL.h index a9748dd29..7dce86f23 100644 --- a/src/ArduinoDUE/Repetier/HAL.h +++ b/src/ArduinoDUE/Repetier/HAL.h @@ -285,9 +285,15 @@ class HAL static long CPUDivU2(speed_t divisor) { return F_CPU/divisor; } - static inline void delayMicroseconds(unsigned int delayUs) + static inline void delayMicroseconds(uint32_t usec) { - microsecondsWait(delayUs); + uint32_t n = usec * (F_CPU_TRUE / 3000000); + asm volatile( + "L2_%=_delayMicroseconds:" "\n\t" + "subs %0, #1" "\n\t" + "bge L2_%=_delayMicroseconds" "\n" + : "+r" (n) : + ); } static inline void delayMilliseconds(unsigned int delayMs) { @@ -608,7 +614,6 @@ class HAL #if ANALOG_INPUTS>0 static void analogStart(void); #endif - static void microsecondsWait(uint32_t us); static volatile uint8_t insideTimer1; protected: From cb53d0c5e8c3b565f3bd6bce90beaa5b0924399b Mon Sep 17 00:00:00 2001 From: repetier Date: Sat, 18 Oct 2014 11:35:41 +0200 Subject: [PATCH 17/20] Fix compile error with SOFTWARE_LEVELING --- src/ArduinoAVR/Repetier/uimenu.h | 4 ++-- src/ArduinoDUE/Repetier/uimenu.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ArduinoAVR/Repetier/uimenu.h b/src/ArduinoAVR/Repetier/uimenu.h index a69bdf766..dfcc71daa 100644 --- a/src/ArduinoAVR/Repetier/uimenu.h +++ b/src/ArduinoAVR/Repetier/uimenu.h @@ -382,7 +382,7 @@ UI_MENU(ui_menu_delta,UI_MENU_DELTA,2 + UI_SPEED + UI_MENU_BACKCNT); #endif // **** Bed leveling menu -#if SOFTWARE_LEVELING +#ifdef SOFTWARE_LEVELING UI_MENU_ACTIONCOMMAND(ui_menu_set_p1,UI_TEXT_SET_P1,UI_ACTION_SET_P1); UI_MENU_ACTIONCOMMAND(ui_menu_set_p2,UI_TEXT_SET_P2,UI_ACTION_SET_P2); UI_MENU_ACTIONCOMMAND(ui_menu_set_p3,UI_TEXT_SET_P3,UI_ACTION_SET_P3); @@ -653,7 +653,7 @@ UI_MENU_ACTION2C(ui_menu_eeprom_loaded, UI_ACTION_DUMMY, UI_TEXT_EEPROM_LOADED); #define UI_MENU_EEPROM_COND #define UI_MENU_EEPROM_CNT 0 #endif -#if SOFTWARE_LEVELING +#ifdef SOFTWARE_LEVELING #define UI_MENU_SL_COND ,&ui_menu_conf_level #define UI_MENU_SL_CNT 1 UI_MENU_SUBMENU(ui_menu_conf_level, UI_TEXT_LEVEL, ui_menu_level); diff --git a/src/ArduinoDUE/Repetier/uimenu.h b/src/ArduinoDUE/Repetier/uimenu.h index a69bdf766..dfcc71daa 100644 --- a/src/ArduinoDUE/Repetier/uimenu.h +++ b/src/ArduinoDUE/Repetier/uimenu.h @@ -382,7 +382,7 @@ UI_MENU(ui_menu_delta,UI_MENU_DELTA,2 + UI_SPEED + UI_MENU_BACKCNT); #endif // **** Bed leveling menu -#if SOFTWARE_LEVELING +#ifdef SOFTWARE_LEVELING UI_MENU_ACTIONCOMMAND(ui_menu_set_p1,UI_TEXT_SET_P1,UI_ACTION_SET_P1); UI_MENU_ACTIONCOMMAND(ui_menu_set_p2,UI_TEXT_SET_P2,UI_ACTION_SET_P2); UI_MENU_ACTIONCOMMAND(ui_menu_set_p3,UI_TEXT_SET_P3,UI_ACTION_SET_P3); @@ -653,7 +653,7 @@ UI_MENU_ACTION2C(ui_menu_eeprom_loaded, UI_ACTION_DUMMY, UI_TEXT_EEPROM_LOADED); #define UI_MENU_EEPROM_COND #define UI_MENU_EEPROM_CNT 0 #endif -#if SOFTWARE_LEVELING +#ifdef SOFTWARE_LEVELING #define UI_MENU_SL_COND ,&ui_menu_conf_level #define UI_MENU_SL_CNT 1 UI_MENU_SUBMENU(ui_menu_conf_level, UI_TEXT_LEVEL, ui_menu_level); From 8824cff881b9f4bab02bb46cdf27e5fc62cd5bf5 Mon Sep 17 00:00:00 2001 From: Jan Phillip Willmann Date: Thu, 5 Mar 2015 17:02:24 +0100 Subject: [PATCH 18/20] Simplified the bulding of the transformation matrix for autoleveling. Maybe there was a mistake with autolevelTransformation[1] --- src/ArduinoAVR/Repetier/Printer.cpp | 7 ++++--- src/ArduinoDUE/Repetier/Printer.cpp | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/ArduinoAVR/Repetier/Printer.cpp b/src/ArduinoAVR/Repetier/Printer.cpp index 1e424e3e6..c91cb2771 100644 --- a/src/ArduinoAVR/Repetier/Printer.cpp +++ b/src/ArduinoAVR/Repetier/Printer.cpp @@ -1392,10 +1392,11 @@ void Printer::buildTransformationMatrix(float h1,float h2,float h3) autolevelTransformation[5] = -autolevelTransformation[7]; // cross(y,z) autolevelTransformation[0] = autolevelTransformation[4]*autolevelTransformation[8]-autolevelTransformation[5]*autolevelTransformation[7]; - autolevelTransformation[1] = autolevelTransformation[5]*autolevelTransformation[6]-autolevelTransformation[3]*autolevelTransformation[8]; - autolevelTransformation[2] = autolevelTransformation[3]*autolevelTransformation[7]-autolevelTransformation[4]*autolevelTransformation[6]; - len = sqrt(autolevelTransformation[0]*autolevelTransformation[0]+autolevelTransformation[2]*autolevelTransformation[2]); + autolevelTransformation[1] = autolevelTransformation[5]*autolevelTransformation[6]/*-autolevelTransformation[3]*autolevelTransformation[8]*/; //autolevelTransformation[3] == 0 ! + autolevelTransformation[2] = /*autolevelTransformation[3]*autolevelTransformation[7]*/-autolevelTransformation[4]*autolevelTransformation[6]; + len = sqrt(autolevelTransformation[0]*autolevelTransformation[0]+autolevelTransformation[1]*autolevelTransformation[1]+autolevelTransformation[2]*autolevelTransformation[2]); //Shouldn't autolevelTransformation[1] also get normed?!? autolevelTransformation[0] /= len; + autolevelTransformation[1] /= len; autolevelTransformation[2] /= len; len = sqrt(autolevelTransformation[4]*autolevelTransformation[4]+autolevelTransformation[5]*autolevelTransformation[5]); autolevelTransformation[4] /= len; diff --git a/src/ArduinoDUE/Repetier/Printer.cpp b/src/ArduinoDUE/Repetier/Printer.cpp index 1e424e3e6..c91cb2771 100644 --- a/src/ArduinoDUE/Repetier/Printer.cpp +++ b/src/ArduinoDUE/Repetier/Printer.cpp @@ -1392,10 +1392,11 @@ void Printer::buildTransformationMatrix(float h1,float h2,float h3) autolevelTransformation[5] = -autolevelTransformation[7]; // cross(y,z) autolevelTransformation[0] = autolevelTransformation[4]*autolevelTransformation[8]-autolevelTransformation[5]*autolevelTransformation[7]; - autolevelTransformation[1] = autolevelTransformation[5]*autolevelTransformation[6]-autolevelTransformation[3]*autolevelTransformation[8]; - autolevelTransformation[2] = autolevelTransformation[3]*autolevelTransformation[7]-autolevelTransformation[4]*autolevelTransformation[6]; - len = sqrt(autolevelTransformation[0]*autolevelTransformation[0]+autolevelTransformation[2]*autolevelTransformation[2]); + autolevelTransformation[1] = autolevelTransformation[5]*autolevelTransformation[6]/*-autolevelTransformation[3]*autolevelTransformation[8]*/; //autolevelTransformation[3] == 0 ! + autolevelTransformation[2] = /*autolevelTransformation[3]*autolevelTransformation[7]*/-autolevelTransformation[4]*autolevelTransformation[6]; + len = sqrt(autolevelTransformation[0]*autolevelTransformation[0]+autolevelTransformation[1]*autolevelTransformation[1]+autolevelTransformation[2]*autolevelTransformation[2]); //Shouldn't autolevelTransformation[1] also get normed?!? autolevelTransformation[0] /= len; + autolevelTransformation[1] /= len; autolevelTransformation[2] /= len; len = sqrt(autolevelTransformation[4]*autolevelTransformation[4]+autolevelTransformation[5]*autolevelTransformation[5]); autolevelTransformation[4] /= len; From dd9155d5d373cd668f9b070437e13f88c8e94282 Mon Sep 17 00:00:00 2001 From: mkile Date: Mon, 13 Jul 2015 15:15:56 +0500 Subject: [PATCH 19/20] Update README.md Added 'w' to windoWs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index df011e19f..6b6171cd3 100644 --- a/README.md +++ b/README.md @@ -108,7 +108,7 @@ Also you can control the firmware with any reprap compatible host, you will only the full benefits with the following products, which have special code for this firmware: -* [Repetier-Host for Windos/Linux](http://www.repetier.com/download/) +* [Repetier-Host for Windows/Linux](http://www.repetier.com/download/) * [Repetier-Host for Mac](http://www.repetier.com/download/) * [Repetier-Server](http://www.repetier.com/repetier-server-download/) From c52fb92ed11c4fa90ed5a5ad856e2b5ed8eff465 Mon Sep 17 00:00:00 2001 From: "Jason S. McMullan" Date: Wed, 7 Oct 2015 09:25:19 -0400 Subject: [PATCH 20/20] pins.h & ui.h: Improve support for UltiMaker - SD Detect and LCD Signed-off-by: Jason S. McMullan --- src/ArduinoAVR/Repetier/pins.h | 13 +++---------- src/ArduinoAVR/Repetier/ui.h | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/ArduinoAVR/Repetier/pins.h b/src/ArduinoAVR/Repetier/pins.h index 98f1e1014..1f276dd74 100644 --- a/src/ArduinoAVR/Repetier/pins.h +++ b/src/ArduinoAVR/Repetier/pins.h @@ -555,10 +555,11 @@ STEPPER_CURRENT_CONTROL #define MOSI_PIN 51 #define SDPOWER -1 #define SDSS 53 +#define SDCARDETECT 38 +#define E0_PINS ORIG_E0_STEP_PIN,ORIG_E0_DIR_PIN,ORIG_E0_ENABLE_PIN, #define E1_PINS ORIG_E1_STEP_PIN,ORIG_E1_DIR_PIN,ORIG_E1_ENABLE_PIN, -#define E2_PINS ORIG_E2_STEP_PIN,ORIG_E2_DIR_PIN,ORIG_E2_ENABLE_PIN, -#define E3_PINS E3_STEP_PIN,E3_DIR_PIN,E3_ENABLE_PIN, +#define E2_PINS #endif @@ -2196,14 +2197,6 @@ S3(ext)=9 #define FAN_BOARD_PIN -1 #endif -#if NUM_EXTRUDER==1 -#define E1_PINS -#endif - -#if NUM_EXTRUDER<3 -#define E2_PINS -#endif - #ifndef HEATER_PINS_INVERTED #define HEATER_PINS_INVERTED 0 #endif diff --git a/src/ArduinoAVR/Repetier/ui.h b/src/ArduinoAVR/Repetier/ui.h index a54f5aac3..b2439fecb 100644 --- a/src/ArduinoAVR/Repetier/ui.h +++ b/src/ArduinoAVR/Repetier/ui.h @@ -486,6 +486,23 @@ void ui_check_slow_keys(int &action) {} #define UI_ENCODER_B 11 #define UI_ENCODER_CLICK 43 #define UI_RESET_PIN 46 +#elif MOTHERBOARD == 37 // UltiMaker 1.5.7 +#define BEEPER_PIN 18 +#define UI_DISPLAY_RS_PIN 20 +#define UI_DISPLAY_RW_PIN -1 +#define UI_DISPLAY_ENABLE_PIN 17 +#define UI_DISPLAY_D0_PIN -1 +#define UI_DISPLAY_D1_PIN -1 +#define UI_DISPLAY_D2_PIN -1 +#define UI_DISPLAY_D3_PIN -1 +#define UI_DISPLAY_D4_PIN 16 +#define UI_DISPLAY_D5_PIN 21 +#define UI_DISPLAY_D6_PIN 5 +#define UI_DISPLAY_D7_PIN 6 +#define UI_ENCODER_A 42 +#define UI_ENCODER_B 40 +#define UI_ENCODER_CLICK 19 +#define UI_RESET_PIN -1 #else #define BEEPER_PIN 37 #define UI_DISPLAY_RS_PIN 16 @@ -511,12 +528,16 @@ void ui_check_slow_keys(int &action) {} void ui_init_keys() { UI_KEYS_INIT_CLICKENCODER_LOW(UI_ENCODER_A,UI_ENCODER_B); // click encoder on pins 47 and 45. Phase is connected with gnd for signals. UI_KEYS_INIT_BUTTON_LOW(UI_ENCODER_CLICK); // push button, connects gnd to pin +#if UI_RESET_PIN > -1 UI_KEYS_INIT_BUTTON_LOW(UI_RESET_PIN); // Kill pin +#endif } void ui_check_keys(int &action) { UI_KEYS_CLICKENCODER_LOW_REV(UI_ENCODER_A,UI_ENCODER_B); // click encoder on pins 47 and 45. Phase is connected with gnd for signals. UI_KEYS_BUTTON_LOW(UI_ENCODER_CLICK,UI_ACTION_OK); // push button, connects gnd to pin +#if UI_RESET_PIN > -1 UI_KEYS_BUTTON_LOW(UI_RESET_PIN,UI_ACTION_RESET); +#endif } inline void ui_check_slow_encoder() {} void ui_check_slow_keys(int &action) {}