Skip to content

Commit

Permalink
Update Russian and Ukrainian languages
Browse files Browse the repository at this point in the history
  • Loading branch information
Serhiy-K committed Jul 3, 2021
1 parent de93f93 commit 6f12202
Show file tree
Hide file tree
Showing 5 changed files with 150 additions and 24 deletions.
30 changes: 18 additions & 12 deletions Marlin/src/lcd/language/language_ru.h
Original file line number Diff line number Diff line change
Expand Up @@ -127,23 +127,28 @@ namespace Language_ru {
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Охлаждение");
PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Частота");
PROGMEM Language_Str MSG_LASER_MENU = _UxGT("Управление лазером");
PROGMEM Language_Str MSG_LASER_TOGGLE = _UxGT("Переключить лазер");
PROGMEM Language_Str MSG_SPINDLE_MENU = _UxGT("Управление шпинделем");
PROGMEM Language_Str MSG_SPINDLE_TOGGLE = _UxGT("Переключить шпиндель");
#if LCD_WIDTH > 21
PROGMEM Language_Str MSG_SPINDLE_MENU = _UxGT("Управление шпинделем");
PROGMEM Language_Str MSG_LASER_TOGGLE = _UxGT("Переключить лазер");
PROGMEM Language_Str MSG_SPINDLE_TOGGLE = _UxGT("Переключ.шпиндель");
PROGMEM Language_Str MSG_SPINDLE_POWER = _UxGT("Мощность шпинделя");
PROGMEM Language_Str MSG_LASER_POWER = _UxGT("Мощность лазера");
PROGMEM Language_Str MSG_LASER_PULSE_MS = _UxGT("Тестовый импульс мс");
PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE = _UxGT("Переключить обдув");
PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE = _UxGT("Переключить вакуум");
#else
PROGMEM Language_Str MSG_SPINDLE_MENU = _UxGT("Управление шпинд.");
PROGMEM Language_Str MSG_LASER_TOGGLE = _UxGT("Переключ.лазер");
PROGMEM Language_Str MSG_SPINDLE_TOGGLE = _UxGT("Переключ.шпинд");
PROGMEM Language_Str MSG_SPINDLE_POWER = _UxGT("Мощн.шпинделя");
PROGMEM Language_Str MSG_LASER_POWER = _UxGT("Мощн. лазера");
PROGMEM Language_Str MSG_LASER_PULSE_MS = _UxGT("Тест. имп. мс");
PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE = _UxGT("Переключ. обдув");
PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE = _UxGT("Переключ. вакуум");
#endif
PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE = _UxGT("Переключить обдув");
PROGMEM Language_Str MSG_LASER_ASSIST_TOGGLE = _UxGT("Управление обдувом");
PROGMEM Language_Str MSG_FLOWMETER_FAULT = _UxGT("Ошибка обдува");
PROGMEM Language_Str MSG_LASER_FIRE_PULSE = _UxGT("Импульс лазера");
PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE = _UxGT("Переключить вакуум");
PROGMEM Language_Str MSG_SPINDLE_FORWARD = _UxGT("Шпиндель вперёд");
PROGMEM Language_Str MSG_SPINDLE_REVERSE = _UxGT("Инверсия шпинделя");

Expand Down Expand Up @@ -356,13 +361,14 @@ namespace Language_ru {
PROGMEM Language_Str MSG_NOZZLE_STANDBY = _UxGT("Сопло ожидает");
PROGMEM Language_Str MSG_BED = _UxGT("Стол, ") LCD_STR_DEGREE "C";
PROGMEM Language_Str MSG_CHAMBER = _UxGT("Камера,") LCD_STR_DEGREE "C";
PROGMEM Language_Str MSG_COOLER = _UxGT("Охлаждение лазера");
#if LCD_WIDTH > 21
PROGMEM Language_Str MSG_COOLER_TOGGLE = _UxGT("Переключить охлаждение");
PROGMEM Language_Str MSG_FLOWMETER_SAFETY = _UxGT("Безопасность потока");
#else
PROGMEM Language_Str MSG_COOLER_TOGGLE = _UxGT("Переключить охлажд.");
PROGMEM Language_Str MSG_COOLER = _UxGT("Охлаждение лазера");
PROGMEM Language_Str MSG_COOLER_TOGGLE = _UxGT("Переключ. охлажд.");
PROGMEM Language_Str MSG_FLOWMETER_SAFETY = _UxGT("Безопасн. потока");
#else
PROGMEM Language_Str MSG_COOLER = _UxGT("Охлажд. лазера");
PROGMEM Language_Str MSG_COOLER_TOGGLE = _UxGT("Переключ. охл.");
PROGMEM Language_Str MSG_FLOWMETER_SAFETY = _UxGT("Безопас.потока");
#endif
PROGMEM Language_Str MSG_LASER = _UxGT("Лазер");
PROGMEM Language_Str MSG_FAN_SPEED = _UxGT("Кулер");
Expand Down Expand Up @@ -776,7 +782,7 @@ namespace Language_ru {
PROGMEM Language_Str MSG_GRADIENT_MIX = _UxGT("Градиент смешивания");
PROGMEM Language_Str MSG_REVERSE_GRADIENT = _UxGT("Сменить градиент");
#if LCD_WIDTH > 21
PROGMEM Language_Str MSG_TOGGLE_MIX = _UxGT("Переключить смешивание");
PROGMEM Language_Str MSG_TOGGLE_MIX = _UxGT("Переключ. смешив.");
PROGMEM Language_Str MSG_ACTIVE_VTOOL = _UxGT("Активация В-инструм.");
PROGMEM Language_Str MSG_START_VTOOL = _UxGT("Начало В-инструмента");
PROGMEM Language_Str MSG_END_VTOOL = _UxGT("Конец В-инструмента");
Expand All @@ -785,7 +791,7 @@ namespace Language_ru {
PROGMEM Language_Str MSG_COMMIT_VTOOL = _UxGT("Смешать В-инструменты");
PROGMEM Language_Str MSG_VTOOLS_RESET = _UxGT("В-инструменты сброшены");
#else
PROGMEM Language_Str MSG_TOGGLE_MIX = _UxGT("Перекл. смешивание");
PROGMEM Language_Str MSG_TOGGLE_MIX = _UxGT("Перекл.смешив.");
PROGMEM Language_Str MSG_ACTIVE_VTOOL = _UxGT("Актив.В-инструм.");
PROGMEM Language_Str MSG_START_VTOOL = _UxGT("В-инструм.нач.");
PROGMEM Language_Str MSG_END_VTOOL = _UxGT("В-инструм.кон.");
Expand Down
23 changes: 12 additions & 11 deletions Marlin/src/lcd/language/language_uk.h
Original file line number Diff line number Diff line change
Expand Up @@ -133,23 +133,23 @@ namespace Language_uk {
PROGMEM Language_Str MSG_SPINDLE_MENU = _UxGT("Керування шпінделем");
#if LCD_WIDTH > 21
PROGMEM Language_Str MSG_LASER_POWER = _UxGT("Потужність лазера");
#else
PROGMEM Language_Str MSG_LASER_POWER = _UxGT("Потуж.лазера");
#endif
PROGMEM Language_Str MSG_SPINDLE_TOGGLE = _UxGT("Перемкнути шпіндель");
PROGMEM Language_Str MSG_LASER_TOGGLE = _UxGT("Перемкнути лазер");
#if LCD_WIDTH > 21
PROGMEM Language_Str MSG_SPINDLE_TOGGLE = _UxGT("Перемкн. шпіндель");
PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE = _UxGT("Перемкнути вакуум");
PROGMEM Language_Str MSG_LASER_TOGGLE = _UxGT("Перемкнути лазер");
PROGMEM Language_Str MSG_SPINDLE_POWER = _UxGT("Потуж. шпінделя");
PROGMEM Language_Str MSG_LASER_PULSE_MS = _UxGT("Тестовий імпульс мс");
#else
PROGMEM Language_Str MSG_LASER_POWER = _UxGT("Потуж.лазера");
PROGMEM Language_Str MSG_SPINDLE_TOGGLE = _UxGT("Перемк. шпінд.");
PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE = _UxGT("Перемкн.вакуум");
PROGMEM Language_Str MSG_LASER_TOGGLE = _UxGT("Перемкн. лазер");
PROGMEM Language_Str MSG_SPINDLE_POWER = _UxGT("Потуж. шпінд.");
PROGMEM Language_Str MSG_LASER_PULSE_MS = _UxGT("Тест. імп. мс");
#endif
PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE = _UxGT("Перемкнути обдув");
PROGMEM Language_Str MSG_LASER_ASSIST_TOGGLE = _UxGT("Керування обдувом");
PROGMEM Language_Str MSG_FLOWMETER_FAULT = _UxGT("Помилка обдуву");
PROGMEM Language_Str MSG_LASER_FIRE_PULSE = _UxGT("Імпульс лазеру");
PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE = _UxGT("Перемкнути вакуум");
PROGMEM Language_Str MSG_SPINDLE_FORWARD = _UxGT("Шпіндель вперед");
PROGMEM Language_Str MSG_SPINDLE_REVERSE = _UxGT("Шпіндель назад");

Expand Down Expand Up @@ -361,18 +361,19 @@ namespace Language_uk {
PROGMEM Language_Str MSG_NOZZLE_STANDBY = _UxGT("Сопло очікує");
PROGMEM Language_Str MSG_BED = _UxGT("Стіл, ") LCD_STR_DEGREE "C";
PROGMEM Language_Str MSG_CHAMBER = _UxGT("Камера,") LCD_STR_DEGREE "C";
PROGMEM Language_Str MSG_COOLER = _UxGT("Охолодження лазеру");
#if LCD_WIDTH > 21
PROGMEM Language_Str MSG_COOLER_TOGGLE = _UxGT("Перемкнути охолодження");
PROGMEM Language_Str MSG_COOLER = _UxGT("Охолодження лазеру");
PROGMEM Language_Str MSG_COOLER_TOGGLE = _UxGT("Перемкн.охолодження");
#else
PROGMEM Language_Str MSG_COOLER_TOGGLE = _UxGT("Перемкнути охолодж.");
PROGMEM Language_Str MSG_COOLER = _UxGT("Охолодж. лазеру");
PROGMEM Language_Str MSG_COOLER_TOGGLE = _UxGT("Перемкн.охолодж");
#endif
PROGMEM Language_Str MSG_FLOWMETER_SAFETY = _UxGT("Безпека потоку");
PROGMEM Language_Str MSG_LASER = _UxGT("Лазер");
PROGMEM Language_Str MSG_FAN_SPEED = _UxGT("Швидк. вент.");
PROGMEM Language_Str MSG_FAN_SPEED_N = _UxGT("Швидк. вент. ~");
#if LCD_WIDTH > 21
PROGMEM Language_Str MSG_STORED_FAN_N = _UxGT("Збереж. швидк. вент. ~");
PROGMEM Language_Str MSG_STORED_FAN_N = _UxGT("Збереж.швидк.вент. ~");
PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N = _UxGT("Дод. швидк. вент. ~");
#else
PROGMEM Language_Str MSG_STORED_FAN_N = _UxGT("Збереж. вент. ~");
Expand Down
4 changes: 4 additions & 0 deletions Marlin/src/pins/pins.h
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,8 @@
#include "lpc1768/pins_BTT_SKR_V1_3.h" // LPC1768 env:LPC1768
#elif MB(BTT_SKR_V1_4)
#include "lpc1768/pins_BTT_SKR_V1_4.h" // LPC1768 env:LPC1768
#elif MB(MY_LPC)
#include "lpc1768/pins_MY_LPC.h" // LPC1768 env:LPC1768

//
// LPC1769 ARM Cortex M3
Expand Down Expand Up @@ -629,6 +631,8 @@
#include "stm32f4/pins_ANET_ET4P.h" // STM32F4 env:Anet_ET4_OpenBLT
#elif MB(FYSETC_CHEETAH_V20)
#include "stm32f4/pins_FYSETC_CHEETAH_V20.h" // STM32F4 env:FYSETC_CHEETAH_V20
#elif MB(PILL_F401XX)
#include "stm32f4/pins_PILL_F401XX.h" // STM32F4 env:PILL_F401XX

//
// ARM Cortex M7
Expand Down
109 changes: 109 additions & 0 deletions Marlin/src/pins/stm32f4/pins_PILL_F401XX.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#pragma once

/**
* To build with Arduino IDE use "Discovery F407VG"
* To build with PlatformIO use environment "STM32F4"
*/
#if NOT_TARGET(STM32F4)
#error "Oops! Select an STM32F4 board in 'Tools > Board.'"
#elif HOTENDS > 2 || E_STEPPERS > 2
#error "STM32F4 supports up to 2 hotends / E-steppers."
#endif

#define DEFAULT_MACHINE_NAME "STM32F401CC"
#define BOARD_INFO_NAME "BlackPill STM32F4x"

//
// Limit Switches
//
#define X_MIN_PIN PB12
#define Y_MIN_PIN PB13
#define Z_MIN_PIN PB14

//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
#define Z_MIN_PROBE_PIN PB14
#endif

//
// Steppers
//
// X & Y enable are the same
#define X_STEP_PIN PB9
#define X_DIR_PIN PC15
#define X_ENABLE_PIN PC13

#define Y_STEP_PIN PB8
#define Y_DIR_PIN PC14
#define Y_ENABLE_PIN PC13

#define Z_STEP_PIN PB5
#define Z_DIR_PIN PB3
#define Z_ENABLE_PIN PC13

#define E0_STEP_PIN PB4
#define E0_DIR_PIN PA15
#define E0_ENABLE_PIN PC13

//
// Temperature Sensors
//
#define TEMP_0_PIN PB0 // Analog Input (HOTEND thermistor)
#define TEMP_BED_PIN PB1 // Analog Input (BED thermistor)

//
// Heaters / Fans
//
#define HEATER_0_PIN PA0 // HOTEND MOSFET
#define HEATER_BED_PIN PA1 // BED MOSFET

#define FAN_PIN PB10 // FAN1

//
// For Spindle/Laser
//
#define SPINDLE_LASER_PWM_PIN E0_STEP_PIN
#define SPINDLE_LASER_ENA_PIN E0_ENABLE_PIN
#define TEMP_COOLER_PIN TEMP_BED_PIN
#define FLOWMETER_PIN E0_DIR_PIN

//
// Misc.
//
//#define LED_PIN PC13

#define SDSS PA3
#define TFTGLCD_CS PA4
#define SD_DETECT_PIN PB15

// On-board LED pin number
//#define LED_BUILTIN PC13
//#define LED_BLUE LED_BUILTIN

//PA5-PA7 - SPI
//PA11, PA12 - USB OTG
//PB2 - BOOT1
//PB6, PB7 - I2C_SCL, I2C_SDA
8 changes: 7 additions & 1 deletion platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@
[platformio]
src_dir = Marlin
boards_dir = buildroot/share/PlatformIO/boards
default_envs = mega2560

#default_envs = mega2560
#default_envs = LPC1768
#default_envs = bluepill_stm32
#default_envs = bluepill_maple
default_envs = PILL_F401XX

include_dir = Marlin
extra_configs =
ini/avr.ini
Expand Down

0 comments on commit 6f12202

Please sign in to comment.