Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: MarlinFirmware/Marlin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bugfix-2.1.x
Choose a base ref
...
head repository: xoan/Marlin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: Release
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 8 commits
  • 7 files changed
  • 4 contributors

Commits on May 9, 2015

  1. Copy the full SHA
    0d8c6f8 View commit details
  2. Copy the full SHA
    ac36cd7 View commit details

Commits on May 11, 2015

  1. Copy the full SHA
    5ce0bf0 View commit details

Commits on May 14, 2015

  1. More active authors

    thinkyhead committed May 14, 2015
    Copy the full SHA
    c411cb1 View commit details
  2. Hardtung

    thinkyhead committed May 14, 2015
    2
    Copy the full SHA
    77fc28c View commit details

Commits on May 15, 2015

  1. More authors

    thinkyhead committed May 15, 2015
    Copy the full SHA
    df46297 View commit details

Commits on May 18, 2015

  1. Update language_pt.h

    I've changed a few words to better comprehension.
    YanMolinos committed May 18, 2015
    1
    Copy the full SHA
    fed690d View commit details
  2. Merge pull request #2110 from YanFM/patch-1

    Update language_pt.h
    thinkyhead committed May 18, 2015
    Copy the full SHA
    de70315 View commit details
Binary file added Documentation/Logo/Marlin Logo GitHub.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Documentation/Logo/Marlin Logo LCD High.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Documentation/Logo/Marlin Logo LCD Low.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Documentation/Logo/marlinwiki.png

Unable to render rich display

Invalid image source.

3 changes: 3 additions & 0 deletions Marlin/Configuration.h
Original file line number Diff line number Diff line change
@@ -24,6 +24,9 @@
// User-specified version info of this build to display in [Pronterface, etc] terminal window during
// startup. Implementation of an idea by Prof Braino to inform user that any changes made to this
// build by the user have been successfully uploaded into firmware.

//#define STRING_VERSION "1.0.2"

#define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time
#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.

58 changes: 29 additions & 29 deletions Marlin/language_pt.h
Original file line number Diff line number Diff line change
@@ -13,39 +13,39 @@
#define MSG_SD_REMOVED "Cartao removido"
#define MSG_MAIN " Menu principal \003"
#define MSG_AUTOSTART "Autostart"
#define MSG_DISABLE_STEPPERS " Apagar motores"
#define MSG_DISABLE_STEPPERS " Parar motores"
#define MSG_AUTO_HOME "Ir para origen"
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_SET_HOME_OFFSETS "def. orig. offset"
#define MSG_SET_ORIGIN "Estabelecer orig."
#define MSG_PREHEAT_PLA "Pre-aquecer PLA"
#define MSG_PREHEAT_PLA0 " pre-aquecer PLA 1"
#define MSG_PREHEAT_PLA1 " pre-aquecer PLA 2"
#define MSG_PREHEAT_PLA2 " pre-aquecer PLA 3"
#define MSG_PREHEAT_PLA012 " pre-aq. PLA Tudo"
#define MSG_PREHEAT_PLA_BEDONLY " pre-aq. PLA \002Base"
#define MSG_PREHEAT_PLA_SETTINGS "PLA setting"
#define MSG_PREHEAT_PLA_SETTINGS "Config. PLA"
#define MSG_PREHEAT_ABS "Pre-aquecer ABS"
#define MSG_PREHEAT_ABS0 " pre-aquecer ABS 1"
#define MSG_PREHEAT_ABS1 " pre-aquecer ABS 2"
#define MSG_PREHEAT_ABS2 " pre-aquecer ABS 3"
#define MSG_PREHEAT_ABS012 " pre-aq. ABS Tudo"
#define MSG_PREHEAT_ABS_BEDONLY " pre-aq. ABS \002Base"
#define MSG_PREHEAT_ABS_SETTINGS "ABS setting"
#define MSG_PREHEAT_ABS_SETTINGS "Config. ABS"
#define MSG_COOLDOWN "Esfriar"
#define MSG_SWITCH_PS_ON "Switch Power On"
#define MSG_SWITCH_PS_OFF "Switch Power Off"
#define MSG_SWITCH_PS_ON "Interruptor On"
#define MSG_SWITCH_PS_OFF "Interruptor Off"
#define MSG_EXTRUDE "Extrudar"
#define MSG_RETRACT "Retrair"
#define MSG_MOVE_AXIS "Mover eixo \x7E"
#define MSG_MOVE_X "Move X"
#define MSG_MOVE_Y "Move Y"
#define MSG_MOVE_Z "Move Z"
#define MSG_MOVE_E "Extruder"
#define MSG_MOVE_E1 "Extruder2"
#define MSG_MOVE_E2 "Extruder3"
#define MSG_MOVE_01MM "Move 0.1mm"
#define MSG_MOVE_1MM "Move 1mm"
#define MSG_MOVE_10MM "Move 10mm"
#define MSG_MOVE_X "Mover X"
#define MSG_MOVE_Y "Mover Y"
#define MSG_MOVE_Z "Mover Z"
#define MSG_MOVE_E "Extrusor"
#define MSG_MOVE_E1 "Extrusor2"
#define MSG_MOVE_E2 "Extrusor3"
#define MSG_MOVE_01MM "Mover 0.1mm"
#define MSG_MOVE_1MM "Mover 1mm"
#define MSG_MOVE_10MM "Mover 10mm"
#define MSG_SPEED "Velocidade:"
#define MSG_NOZZLE "\002Nozzle:"
#define MSG_NOZZLE1 "\002Nozzle2:"
@@ -86,12 +86,12 @@
#define MSG_ESTEPS "Epasso/mm:"
#define MSG_TEMPERATURE "Temperatura"
#define MSG_MOTION "Movimento"
#define MSG_VOLUMETRIC "Filament"
#define MSG_VOLUMETRIC "Filamento"
#define MSG_VOLUMETRIC_ENABLED "E in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER_0 "Fil. Dia. 1"
#define MSG_FILAMENT_SIZE_EXTRUDER_1 "Fil. Dia. 2"
#define MSG_FILAMENT_SIZE_EXTRUDER_2 "Fil. Dia. 3"
#define MSG_CONTRAST "Contrast"
#define MSG_CONTRAST "Contraste"
#define MSG_STORE_EPROM "Guardar memoria"
#define MSG_LOAD_EPROM "Carregar memoria"
#define MSG_RESTORE_FAILSAFE "Rest. de emergen."
@@ -106,8 +106,8 @@
#define MSG_NO_CARD "Sem cartao SD"
#define MSG_DWELL "Repouso..."
#define MSG_USERWAIT "Esperando ordem"
#define MSG_RESUMING "Resuming print"
#define MSG_PRINT_ABORTED "Print aborted"
#define MSG_RESUMING "Resum. impressao"
#define MSG_PRINT_ABORTED "impress. abortada"
#define MSG_NO_MOVE "Sem movimento"
#define MSG_KILLED "PARADA DE EMERG."
#define MSG_STOPPED "PARADA. "
@@ -118,10 +118,10 @@
#define MSG_CONTROL_RETRACT_RECOVER " DesRet +mm:"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "Troca DesRet +mm:"
#define MSG_CONTROL_RETRACT_RECOVERF " DesRet V:"
#define MSG_AUTORETRACT " AutoRetr.:"
#define MSG_FILAMENTCHANGE "Change filament"
#define MSG_INIT_SDCARD "Init. SD-Card"
#define MSG_CNG_SDCARD "Change SD-Card"
#define MSG_AUTORETRACT " Auto Retr.:"
#define MSG_FILAMENTCHANGE "Trocar filamento"
#define MSG_INIT_SDCARD "Cartao SD Inic."
#define MSG_CNG_SDCARD "Cartao SD trocado"
#define MSG_ZPROBE_OUT "Son. fora da mesa"
#define MSG_POSITION_UNKNOWN "XY antes de Z"
#define MSG_ZPROBE_ZOFFSET "Z Offset"
@@ -135,14 +135,14 @@
#define MSG_PREPARE_ALT "Preparar \003"
#define MSG_CONTROL_ARROW "Controle \x7E"
#define MSG_RETRACT_ARROW "Retrair \x7E"
#define MSG_STEPPER_RELEASED "Lancado."
#define MSG_STEPPER_RELEASED "Iniciado."

#ifdef DELTA_CALIBRATION_MENU
#define MSG_DELTA_CALIBRATE "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X "Calibrate X"
#define MSG_DELTA_CALIBRATE_Y "Calibrate Y"
#define MSG_DELTA_CALIBRATE_Z "Calibrate Z"
#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center"
#define MSG_DELTA_CALIBRATE "Calibracao Delta"
#define MSG_DELTA_CALIBRATE_X "Calibrar X"
#define MSG_DELTA_CALIBRATE_Y "Calibrar Y"
#define MSG_DELTA_CALIBRATE_Z "Calibrar Z"
#define MSG_DELTA_CALIBRATE_CENTER "Calibrar Centro"
#endif // DELTA_CALIBRATION_MENU

#endif // LANGUAGE_PT_H
443 changes: 30 additions & 413 deletions README.md

Large diffs are not rendered by default.