andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Malyan M200 V2 (#17840)

vanilla_fb_2.0.x
Scott Lahteine 5 years ago
committed by GitHub
parent
1c32f10039
commit
38d1587091
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 132 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 51
      Marlin/src/core/boards.h
  2. 10
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp
  3. 4
      Marlin/src/lcd/extui/ui_api.cpp
  4. 13
      Marlin/src/lcd/extui_dgus_lcd.cpp
  5. 48
      Marlin/src/lcd/extui_malyan_lcd.cpp
  6. 4
      Marlin/src/lcd/language/language_en.h
  7. 2
      Marlin/src/pins/pins.h
  8. 31
      Marlin/src/pins/stm32f0/pins_MALYAN_M200_V2.h
  9. 4
      Marlin/src/pins/stm32f1/pins_MALYAN_M200.h
  10. 1
      buildroot/share/PlatformIO/boards/malyanM200.json
  11. 2
      buildroot/share/PlatformIO/boards/malyanM200v2.json
  12. 18
      platformio.ini

51
Marlin/src/core/boards.h
View File

@ -277,31 +277,32 @@
#define BOARD_STM32F103RE 4000 // STM32F103RE Libmaple-based STM32F1 controller #define BOARD_STM32F103RE 4000 // STM32F103RE Libmaple-based STM32F1 controller
#define BOARD_MALYAN_M200 4001 // STM32C8T6 Libmaple-based STM32F1 controller #define BOARD_MALYAN_M200 4001 // STM32C8T6 Libmaple-based STM32F1 controller
#define BOARD_STM3R_MINI 4002 // STM32F103RE Libmaple-based STM32F1 controller #define BOARD_MALYAN_M200_V2 4002 // STM32F070RB Libmaple-based STM32F0 controller
#define BOARD_GTM32_PRO_VB 4003 // STM32F103VET6 controller #define BOARD_STM3R_MINI 4003 // STM32F103RE Libmaple-based STM32F1 controller
#define BOARD_MORPHEUS 4004 // STM32F103C8 / STM32F103CB Libmaple-based STM32F1 controller #define BOARD_GTM32_PRO_VB 4004 // STM32F103VET6 controller
#define BOARD_CHITU3D 4005 // Chitu3D (STM32F103RET6) #define BOARD_MORPHEUS 4005 // STM32F103C8 / STM32F103CB Libmaple-based STM32F1 controller
#define BOARD_MKS_ROBIN 4006 // MKS Robin (STM32F103ZET6) #define BOARD_CHITU3D 4006 // Chitu3D (STM32F103RET6)
#define BOARD_MKS_ROBIN_MINI 4007 // MKS Robin Mini (STM32F103VET6) #define BOARD_MKS_ROBIN 4007 // MKS Robin (STM32F103ZET6)
#define BOARD_MKS_ROBIN_NANO 4008 // MKS Robin Nano (STM32F103VET6) #define BOARD_MKS_ROBIN_MINI 4008 // MKS Robin Mini (STM32F103VET6)
#define BOARD_MKS_ROBIN_LITE 4009 // MKS Robin Lite/Lite2 (STM32F103RCT6) #define BOARD_MKS_ROBIN_NANO 4009 // MKS Robin Nano (STM32F103VET6)
#define BOARD_MKS_ROBIN_LITE3 4010 // MKS Robin Lite3 (STM32F103RCT6) #define BOARD_MKS_ROBIN_LITE 4010 // MKS Robin Lite/Lite2 (STM32F103RCT6)
#define BOARD_MKS_ROBIN_PRO 4011 // MKS Robin Pro (STM32F103ZET6) #define BOARD_MKS_ROBIN_LITE3 4011 // MKS Robin Lite3 (STM32F103RCT6)
#define BOARD_BTT_SKR_MINI_V1_1 4012 // BigTreeTech SKR Mini v1.1 (STM32F103RC) #define BOARD_MKS_ROBIN_PRO 4012 // MKS Robin Pro (STM32F103ZET6)
#define BOARD_BTT_SKR_MINI_E3_V1_0 4013 // BigTreeTech SKR Mini E3 (STM32F103RC) #define BOARD_BTT_SKR_MINI_V1_1 4013 // BigTreeTech SKR Mini v1.1 (STM32F103RC)
#define BOARD_BTT_SKR_MINI_E3_V1_2 4014 // BigTreeTech SKR Mini E3 V1.2 (STM32F103RC) #define BOARD_BTT_SKR_MINI_E3_V1_0 4014 // BigTreeTech SKR Mini E3 (STM32F103RC)
#define BOARD_BTT_SKR_E3_DIP 4015 // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC / STM32F103RE) #define BOARD_BTT_SKR_MINI_E3_V1_2 4015 // BigTreeTech SKR Mini E3 V1.2 (STM32F103RC)
#define BOARD_JGAURORA_A5S_A1 4016 // JGAurora A5S A1 (STM32F103ZET6) #define BOARD_BTT_SKR_E3_DIP 4016 // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC / STM32F103RE)
#define BOARD_FYSETC_AIO_II 4017 // FYSETC AIO_II #define BOARD_JGAURORA_A5S_A1 4017 // JGAurora A5S A1 (STM32F103ZET6)
#define BOARD_FYSETC_CHEETAH 4018 // FYSETC Cheetah #define BOARD_FYSETC_AIO_II 4018 // FYSETC AIO_II
#define BOARD_FYSETC_CHEETAH_V12 4019 // FYSETC Cheetah V1.2 #define BOARD_FYSETC_CHEETAH 4019 // FYSETC Cheetah
#define BOARD_LONGER3D_LK 4020 // Alfawise U20/U20+/U30 (Longer3D LK1/2) / STM32F103VET6 #define BOARD_FYSETC_CHEETAH_V12 4020 // FYSETC Cheetah V1.2
#define BOARD_GTM32_MINI 4021 // STM32F103VET6 controller #define BOARD_LONGER3D_LK 4021 // Alfawise U20/U20+/U30 (Longer3D LK1/2) / STM32F103VET6
#define BOARD_GTM32_MINI_A30 4022 // STM32F103VET6 controller #define BOARD_GTM32_MINI 4022 // STM32F103VET6 controller
#define BOARD_GTM32_REV_B 4023 // STM32F103VET6 controller #define BOARD_GTM32_MINI_A30 4023 // STM32F103VET6 controller
#define BOARD_MKS_ROBIN_E3D 4024 // MKS Robin E3D(STM32F103RCT6) #define BOARD_GTM32_REV_B 4024 // STM32F103VET6 controller
#define BOARD_MKS_ROBIN_E3 4025 // MKS Robin E3(STM32F103RCT6) #define BOARD_MKS_ROBIN_E3D 4025 // MKS Robin E3D(STM32F103RCT6)
#define BOARD_MALYAN_M300 4026 // STM32F070-based delta #define BOARD_MKS_ROBIN_E3 4026 // MKS Robin E3(STM32F103RCT6)
#define BOARD_MALYAN_M300 4027 // STM32F070-based delta
// //
// ARM Cortex-M4F // ARM Cortex-M4F

10
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp
View File

@ -150,19 +150,19 @@ namespace ExtUI {
#if HAS_PID_HEATING #if HAS_PID_HEATING
void onPidTuning(const result_t rst) { void onPidTuning(const result_t rst) {
// Called for temperature PID tuning result // Called for temperature PID tuning result
SERIAL_ECHOLNPAIR("OnPidTuning:", rst); //SERIAL_ECHOLNPAIR("OnPidTuning:", rst);
switch (rst) { switch (rst) {
case PID_BAD_EXTRUDER_NUM: case PID_BAD_EXTRUDER_NUM:
StatusScreen::setStatusMessage(STR_PID_BAD_EXTRUDER_NUM); StatusScreen::setstatusmessagePGM(GET_TEXT(MSG_PID_BAD_EXTRUDER_NUM));
break; break;
case PID_TEMP_TOO_HIGH: case PID_TEMP_TOO_HIGH:
StatusScreen::setStatusMessage(STR_PID_TEMP_TOO_HIGH); StatusScreen::setstatusmessagePGM(GET_TEXT(MSG_PID_TEMP_TOO_HIGH));
break; break;
case PID_TUNING_TIMEOUT: case PID_TUNING_TIMEOUT:
StatusScreen::setStatusMessage(STR_PID_TIMEOUT); StatusScreen::setstatusmessagePGM(GET_TEXT(MSG_PID_TIMEOUT));
break; break;
case PID_DONE: case PID_DONE:
StatusScreen::setStatusMessage(STR_PID_AUTOTUNE_FINISHED); StatusScreen::setstatusmessagePGM(GET_TEXT(MSG_PID_AUTOTUNE_DONE));
break; break;
} }
GOTO_SCREEN(StatusScreen); GOTO_SCREEN(StatusScreen);

4
Marlin/src/lcd/extui/ui_api.cpp
View File

@ -330,8 +330,8 @@ namespace ExtUI {
// Delta limits XY based on the current offset from center // Delta limits XY based on the current offset from center
// This assumes the center is 0,0 // This assumes the center is 0,0
#if ENABLED(DELTA) #if ENABLED(DELTA)
if (axis != Z_AXIS) { if (axis != Z) {
max = SQRT(sq((float)(DELTA_PRINTABLE_RADIUS)) - sq(current_position[Y_AXIS - axis])); // (Y_AXIS - axis) == the other axis max = SQRT(sq(float(DELTA_PRINTABLE_RADIUS)) - sq(current_position[Y - axis])); // (Y - axis) == the other axis
min = -max; min = -max;
} }
#endif #endif

13
Marlin/src/lcd/extui_dgus_lcd.cpp
View File

@ -45,7 +45,7 @@ namespace ExtUI {
void onIdle() { ScreenHandler.loop(); } void onIdle() { ScreenHandler.loop(); }
void onPrinterKilled(PGM_P error, PGM_P component) { void onPrinterKilled(PGM_P const error, PGM_P const component) {
ScreenHandler.sendinfoscreen(GET_TEXT(MSG_HALTED), error, NUL_STR, GET_TEXT(MSG_PLEASE_RESET), true, true, true, true); ScreenHandler.sendinfoscreen(GET_TEXT(MSG_HALTED), error, NUL_STR, GET_TEXT(MSG_PLEASE_RESET), true, true, true, true);
ScreenHandler.GotoScreen(DGUSLCD_SCREEN_KILL); ScreenHandler.GotoScreen(DGUSLCD_SCREEN_KILL);
while (!ScreenHandler.loop()); // Wait while anything is left to be sent while (!ScreenHandler.loop()); // Wait while anything is left to be sent
@ -127,19 +127,18 @@ namespace ExtUI {
#if HAS_PID_HEATING #if HAS_PID_HEATING
void onPidTuning(const result_t rst) { void onPidTuning(const result_t rst) {
// Called for temperature PID tuning result // Called for temperature PID tuning result
SERIAL_ECHOLNPAIR("onPidTuning:",rst); switch (rst) {
switch(rst) {
case PID_BAD_EXTRUDER_NUM: case PID_BAD_EXTRUDER_NUM:
ScreenHandler.setstatusmessagePGM(PSTR(STR_PID_BAD_EXTRUDER_NUM)); ScreenHandler.setstatusmessagePGM(GET_TEXT(MSG_PID_BAD_EXTRUDER_NUM));
break; break;
case PID_TEMP_TOO_HIGH: case PID_TEMP_TOO_HIGH:
ScreenHandler.setstatusmessagePGM(PSTR(STR_PID_TEMP_TOO_HIGH)); ScreenHandler.setstatusmessagePGM(GET_TEXT(MSG_PID_TEMP_TOO_HIGH));
break; break;
case PID_TUNING_TIMEOUT: case PID_TUNING_TIMEOUT:
ScreenHandler.setstatusmessagePGM(PSTR(STR_PID_TIMEOUT)); ScreenHandler.setstatusmessagePGM(GET_TEXT(MSG_PID_TIMEOUT));
break; break;
case PID_DONE: case PID_DONE:
ScreenHandler.setstatusmessagePGM(PSTR(STR_PID_AUTOTUNE_FINISHED)); ScreenHandler.setstatusmessagePGM(GET_TEXT(MSG_PID_AUTOTUNE_DONE));
break; break;
} }
ScreenHandler.GotoScreen(DGUSLCD_SCREEN_MAIN); ScreenHandler.GotoScreen(DGUSLCD_SCREEN_MAIN);

48
Marlin/src/lcd/extui_malyan_lcd.cpp
View File

@ -97,6 +97,18 @@ void write_to_lcd(const char * const message) {
LCD_SERIAL.Print::write(encoded_message, message_length); LCD_SERIAL.Print::write(encoded_message, message_length);
} }
// {E:<msg>} is for error states.
void set_lcd_error_P(PGM_P const error, PGM_P const component=nullptr) {
write_to_lcd_P(PSTR("{E:"));
write_to_lcd_P(error);
if (component) {
write_to_lcd_P(PSTR(" "));
write_to_lcd_P(component);
}
write_to_lcd_P(PSTR("}"));
}
/** /**
* Process an LCD 'C' command. * Process an LCD 'C' command.
* These are currently all temperature commands * These are currently all temperature commands
@ -465,14 +477,32 @@ namespace ExtUI {
#endif #endif
} }
// {E:<msg>} is for error states. void onPrinterKilled(PGM_P const error, PGM_P const component) {
void onPrinterKilled(PGM_P error, PGM_P component) { set_lcd_error_P(error, component);
write_to_lcd_P(PSTR("{E:")); }
write_to_lcd_P(error);
write_to_lcd_P(PSTR(" ")); #if HAS_PID_HEATING
write_to_lcd_P(component);
write_to_lcd_P("}"); void onPidTuning(const result_t rst) {
// Called for temperature PID tuning result
//SERIAL_ECHOLNPAIR("OnPidTuning:", rst);
switch (rst) {
case PID_BAD_EXTRUDER_NUM:
set_lcd_error_P(GET_TEXT(MSG_PID_BAD_EXTRUDER_NUM));
break;
case PID_TEMP_TOO_HIGH:
set_lcd_error_P(GET_TEXT(MSG_PID_TEMP_TOO_HIGH));
break;
case PID_TUNING_TIMEOUT:
set_lcd_error_P(GET_TEXT(MSG_PID_TIMEOUT));
break;
case PID_DONE:
set_lcd_error_P(GET_TEXT(MSG_PID_AUTOTUNE_DONE));
break;
} }
}
#endif
void onPrintTimerStarted() { write_to_lcd_P(PSTR("{SYS:BUILD}")); } void onPrintTimerStarted() { write_to_lcd_P(PSTR("{SYS:BUILD}")); }
void onPrintTimerPaused() {} void onPrintTimerPaused() {}
@ -500,10 +530,6 @@ namespace ExtUI {
#if ENABLED(POWER_LOSS_RECOVERY) #if ENABLED(POWER_LOSS_RECOVERY)
void onPowerLossResume() {} void onPowerLossResume() {}
#endif #endif
#if HAS_PID_HEATING
void onPidTuning(const result_t rst) {}
#endif
} }
#endif // MALYAN_LCD #endif // MALYAN_LCD

4
Marlin/src/lcd/language/language_en.h
View File

@ -266,6 +266,10 @@ namespace Language_en {
PROGMEM Language_Str MSG_LCD_OFF = _UxGT("Off"); PROGMEM Language_Str MSG_LCD_OFF = _UxGT("Off");
PROGMEM Language_Str MSG_PID_AUTOTUNE = _UxGT("PID Autotune"); PROGMEM Language_Str MSG_PID_AUTOTUNE = _UxGT("PID Autotune");
PROGMEM Language_Str MSG_PID_AUTOTUNE_E = _UxGT("PID Autotune *"); PROGMEM Language_Str MSG_PID_AUTOTUNE_E = _UxGT("PID Autotune *");
PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE = _UxGT("PID tuning done");
PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM = _UxGT("Autotune failed. Bad extruder.");
PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH = _UxGT("Autotune failed. Temperature too high.");
PROGMEM Language_Str MSG_PID_TIMEOUT = _UxGT("Autotune failed! Timeout.");
PROGMEM Language_Str MSG_PID_P = _UxGT("PID-P"); PROGMEM Language_Str MSG_PID_P = _UxGT("PID-P");
PROGMEM Language_Str MSG_PID_P_E = _UxGT("PID-P *"); PROGMEM Language_Str MSG_PID_P_E = _UxGT("PID-P *");
PROGMEM Language_Str MSG_PID_I = _UxGT("PID-I"); PROGMEM Language_Str MSG_PID_I = _UxGT("PID-I");

2
Marlin/src/pins/pins.h
View File

@ -469,6 +469,8 @@
// //
// STM32 ARM Cortex-M0 // STM32 ARM Cortex-M0
// //
#elif MB(MALYAN_M200_V2)
#include "stm32f0/pins_MALYAN_M200_V2.h" // STM32F0 env:STM32F070RB_malyan
#elif MB(MALYAN_M300) #elif MB(MALYAN_M300)
#include "stm32f0/pins_MALYAN_M300.h" // STM32F070 env:malyan_M300 #include "stm32f0/pins_MALYAN_M300.h" // STM32F070 env:malyan_M300

31
Marlin/src/pins/stm32f0/pins_MALYAN_M200_V2.h
View File

@ -0,0 +1,31 @@
/**
* 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
#ifndef STM32F0xx
#error "Oops! Select an STM32F0 board in your IDE."
#endif
#define BOARD_INFO_NAME "Malyan M200 V2"
#include "../stm32f1/pins_MALYAN_M200.h"

4
Marlin/src/pins/stm32f1/pins_MALYAN_M200.h
View File

@ -29,7 +29,9 @@
#error "Oops! Select an STM32 board in your IDE." #error "Oops! Select an STM32 board in your IDE."
#endif #endif
#define BOARD_INFO_NAME "Malyan M200" #ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "Malyan M200"
#endif
// Assume Flash EEPROM // Assume Flash EEPROM
#if NO_EEPROM_SELECTED #if NO_EEPROM_SELECTED

1
buildroot/share/PlatformIO/boards/malyanM200.json
View File

@ -11,7 +11,6 @@
"ldscript": "jtagOffset.ld", "ldscript": "jtagOffset.ld",
"mcu": "stm32f103cb", "mcu": "stm32f103cb",
"variant": "malyanM200", "variant": "malyanM200",
"genericvariant" : "MALYAN_M200_V1",
"vec_tab_addr": "0x8002000" "vec_tab_addr": "0x8002000"
}, },
"debug": { "debug": {

2
buildroot/share/PlatformIO/boards/malyanM200v2.json
View File

@ -4,7 +4,7 @@
"extra_flags": "-DSTM32F070xB", "extra_flags": "-DSTM32F070xB",
"f_cpu": "48000000L", "f_cpu": "48000000L",
"mcu": "stm32f070rbt6", "mcu": "stm32f070rbt6",
"genericvariant" : "MALYAN_M200_V2", "variant": "MALYANM200_F070CB",
"vec_tab_addr": "0x8002000" "vec_tab_addr": "0x8002000"
}, },
"debug": { "debug": {

18
platformio.ini
View File

@ -605,10 +605,22 @@ lib_ignore = Adafruit NeoPixel, SPI
[env:STM32F103CB_malyan] [env:STM32F103CB_malyan]
platform = ststm32 platform = ststm32
board = malyanM200 board = malyanM200
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py -DMCU_STM32F103CB -D __STM32F1__=1 -std=c++1y -D MOTHERBOARD="BOARD_MALYAN_M200" -DSERIAL_USB -ffunction-sections -fdata-sections -Wl,--gc-sections build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py -DMCU_STM32F103CB -D __STM32F1__=1 -std=c++1y -DSERIAL_USB -ffunction-sections -fdata-sections -Wl,--gc-sections
-DDEBUG_LEVEL=0 -D__MARLIN_FIRMWARE__ -DDEBUG_LEVEL=0 -D__MARLIN_FIRMWARE__
src_filter = ${common.default_src_filter} +<src/HAL/STM32F1> src_filter = ${common.default_src_filter} +<src/HAL/STM32F1>
lib_ignore = Adafruit NeoPixel, LiquidCrystal, LiquidTWI2, TMCStepper, U8glib-HAL, SPI lib_ignore = LiquidCrystal, LiquidTWI2, Adafruit NeoPixel, TMCStepper, U8glib-HAL, SPI
#
# Malyan M200 v2 (STM32F070RB)
#
[env:STM32F070RB_malyan]
platform = ststm32
board = malyanM200v2
build_flags = -DSTM32F0xx -DUSBCON -DUSBD_VID=0x0483 '-DUSB_MANUFACTURER="Unknown"' '-DUSB_PRODUCT="ARMED_V1"' -DUSBD_USE_CDC -DHAL_PCD_MODULE_ENABLED
-O2 -ffreestanding -fsigned-char -fno-move-loop-invariants -fno-strict-aliasing -std=gnu11 -std=gnu++11
-IMarlin/src/HAL/STM32
src_filter = ${common.default_src_filter} +<src/HAL/STM32>
lib_ignore = LiquidCrystal, LiquidTWI2, Adafruit NeoPixel, TMCStepper, U8glib-HAL
# #
# Malyan M300 (STM32F070CB) # Malyan M300 (STM32F070CB)
@ -620,7 +632,7 @@ build_flags = ${common.build_flags}
-DUSBCON -DUSBD_VID=0x0483 "-DUSB_MANUFACTURER=\"Unknown\"" "-DUSB_PRODUCT=\"MALYAN_M300\"" -DUSBCON -DUSBD_VID=0x0483 "-DUSB_MANUFACTURER=\"Unknown\"" "-DUSB_PRODUCT=\"MALYAN_M300\""
-DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB -DHAL_UART_MODULE_ENABLED -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB -DHAL_UART_MODULE_ENABLED
src_filter = ${common.default_src_filter} +<src/HAL/STM32> src_filter = ${common.default_src_filter} +<src/HAL/STM32>
lib_ignore = U8glib, LiquidCrystal_I2C, LiquidCrystal, NewliquidCrystal, LiquidTWI2, Adafruit NeoPixel, TMCStepper, Servo(STM32F1), TMC26XStepper, U8glib-HAL lib_ignore = LiquidCrystal, LiquidTWI2, Adafruit NeoPixel, TMCStepper, U8glib-HAL
# #
# Chitu boards like Tronxy X5s (STM32F103ZET6) # Chitu boards like Tronxy X5s (STM32F103ZET6)

Write Preview
Loading…
Cancel
Save