Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add detection of Mainboard firmware type( Marlin or Smoothieware), auto-detect LONG_FILENAME_HOST_SUPPORT, on-boardSD and serial_always_on option in config file & other bugfixes #663

Merged
merged 37 commits into from
May 23, 2020
Merged
Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
41cd973
Add detection of Mainboard firmware type
guruathwal May 8, 2020
b032c71
fix minor bugs
guruathwal May 9, 2020
794ee98
Update config.c
guruathwal May 9, 2020
28fab2c
Fix LCD brightness value display in listview
guruathwal May 10, 2020
3ac8b10
Update FeatureSettings.c
guruathwal May 10, 2020
7786f50
prevent settings from resetting after config update
guruathwal May 10, 2020
27c0b7f
add option in config file to force sdcard in non marlin firmware
guruathwal May 10, 2020
de81a40
Add serial always on in config file & add missing hotend_count in con…
guruathwal May 10, 2020
78a80a0
Add serial always on in config file & add missing hotend_count in con…
guruathwal May 12, 2020
68b0401
Merge branch 'Mainstream' of https://github.com/guruathwal/BIGTREETEC…
guruathwal May 12, 2020
b6b08a7
Update parseACK.c
guruathwal May 12, 2020
6545c25
Update parseACK.c
guruathwal May 12, 2020
e050d73
Fix Fan max speed setting and Preheat temperature update through conf…
guruathwal May 12, 2020
4c85091
fix machine parameters not saving
guruathwal May 12, 2020
c8df879
remove duplicate entries
guruathwal May 13, 2020
cdfb7f5
Fix tool count and fan count
guruathwal May 15, 2020
bbf62af
completely remove EMERGENCY_PARSER & misc fixes
guruathwal May 17, 2020
a4b5f7e
Add auto-detect Long file name support
guruathwal May 17, 2020
7d2af1d
fix typo
guruathwal May 18, 2020
6a11c21
cleanup
guruathwal May 19, 2020
440bfd8
update config.ini
guruathwal May 19, 2020
04ed502
Name & formatting fixes
guruathwal May 19, 2020
f314428
Fix whitespaces
guruathwal May 19, 2020
798b25b
allow negative values in machine size
guruathwal May 20, 2020
af8e255
update config.ini
guruathwal May 20, 2020
14916fa
Update config.h
guruathwal May 20, 2020
25f64c8
improve print codes
guruathwal May 20, 2020
804ecf8
force parse config at the end of config.ini
guruathwal May 20, 2020
ea2959a
Update config.c
guruathwal May 20, 2020
f113c96
fix line ending
guruathwal May 20, 2020
8396ef7
Update config.c
guruathwal May 20, 2020
33fce40
fFix pause resume g-code
guruathwal May 21, 2020
4c662a4
fix printf fomattings
guruathwal May 22, 2020
46969db
Merge branch 'master' into Mainstream
bigtreetech May 23, 2020
eabfe8b
Update Configuration.h
bigtreetech May 23, 2020
842103f
Update Configuration.h
bigtreetech May 23, 2020
5fc1568
Update Configuration.h
bigtreetech May 23, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,16 @@
# BIGTREE_TFT28_V3_0 / BIGTREE_TFT24_V1_1 / MKS_32_V1_4
#
# Firmware Source: https://github.com/bigtreetech/BIGTREETECH-TouchScreenFirmware
#


#--------------------------------------------------------------------
# Supported Marlin Firmware Version
#--------------------------------------------------------------------
# Minimum Marlin Firmware Version: Bugfix-2.0.x
# Distribution date: 2020-05-12
# Source: https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x


#--------------------------------------------------------------------
# General Settings
#--------------------------------------------------------------------
Expand All @@ -16,19 +25,19 @@
unified_menu:1

#### Baudrate
# Options: [0: 2400, 1: 9600, 2: 19200, 3: 38400, 4: 57600, 5: 115200, 6: 250000, 7: 500000,8: 1000000 ]
# Options: [2400: 0, 9600: 1, 19200: 2, 38400: 3, 57600: 4, 115200: 5, 250000: 6, 500000: 7, 1000000: 8]
baudrate:5

#### Default Touch Mode Language
# Select the language to display on the LCD while in Touch Mode.
# Options: [0: ENGLISH, 1: CHINESE, 2: RUSSIAN, 3: JAPANESE, 4: ARMENIAN,
# 5: GERMAN, 6: CZECH, 7: SPAIN, 8: FRENCH, 9: PORTUGUESE,
# 10: ITALIAN,11: POLISH, 12: SLOVAK, 13: DUTCH, 14: HUNGARY]
# Options: [ENGLISH: 0, CHINESE: 1, RUSSIAN: 2, JAPANESE: 3, ARMENIAN: 4, GERMAN: 5,
# CZECH: 6, SPAIN: 7, FRENCH: 8, PORTUGUESE: 9, ITALIAN: 10, POLISH: 11,
# SLOVAK: 12, DUTCH: 13, HUNGARIAN: 14]
language:0

#### Default Touch Mode Color Options
# Options: [ WHITE: 0, BLACK: 1, RED: 2, GREEN: 3, BLUE: 4, CYAN: 5, MAGENTA: 6, YELLOW: 7,
# ORANGE: 8, PURPLE: 9, LIME: 10, BROWN: 11, DARKBLUE: 12, DARKGREEN: 13, GRAY: 14, DARKGRAY: 15 ]
# Options: [ WHITE: 0, BLACK: 1, RED: 2, GREEN: 3, BLUE: 4, CYAN: 5, MAGENTA: 6, YELLOW: 7,
# ORANGE: 8, PURPLE: 9, LIME: 10, BROWN: 11, DARKBLUE: 12, DARKGREEN: 13, GRAY: 14, DARKGRAY: 15]

# Title background color
title_back_color:1
Expand All @@ -54,15 +63,6 @@ list_border_color:15
#List View button background color
list_button_bg_color:15

#Backgroud color for X Y Z position display in Status Screen.
status_xyz_bg_color:15

#List View Border Color
list_border_color:15

#List View button background color
list_button_bg_color:15

#### Rotate UI 180 degrees
# Options: [enable: 1, disable: 0]
rotate_ui:0
Expand All @@ -74,7 +74,7 @@ terminal_ack:0
#### invert X axis button function in Move menu to match move buttons to actual axis
# Options: [enable: 1, disable: 0]
# Invert Axis format [ X<option> Y<option> Z<option> E<option>]
invert_axis: X0 Y0 Z0
invert_axis:X0 Y0 Z0

#### Persistent temperature info
# show persistent temperature info on all menu screens
Expand All @@ -95,18 +95,24 @@ files_list_mode:1
# Options: [0:Touch Mode, 1: Marlin Mode]
default_mode:0

#### Keep Serial Always ON
# Keep UART (Serial communication) alive in Marlin Mode
# Allow seamless OctoPrint UART connection to the TFT's UART/serial expansion port no matter which mode the TFT is in.
# Options: [0: Disabled, 1: Enabled]
serial_always_on:0

#### Default Marlin Mode Background & Font Color Options
# Options: [ WHITE: 0, BLACK: 1, RED: 2, GREEN: 3, BLUE: 4, CYAN: 5, MAGENTA: 6, YELLOW: 7,
# ORANGE: 8, PURPLE: 9, LIME: 10, BROWN: 11, DARKBLUE: 12, DARKGREEN: 13, GRAY: 14, DARKGRAY: 15 ]
# Options: [ WHITE: 0, BLACK: 1, RED: 2, GREEN: 3, BLUE: 4, CYAN: 5, MAGENTA: 6, YELLOW: 7,
# ORANGE: 8, PURPLE: 9, LIME: 10, BROWN: 11, DARKBLUE: 12, DARKGREEN: 13, GRAY: 14, DARKGRAY: 15]
marlin_bg_color:1
marlin_fn_color:8

#### Marlin Mode show title
# Options:[1:enable, 0: disable]
# Options: [enable: 1, disable: 0]
marlin_show_title:1

# Run Marlin Mode in Fullscreen
# Options:[1:enable, 0: disable] [Disabled. RECOMMENDED FOR TFT24]
# Options: [enable: 1, disable: 0] [Disabled. RECOMMENDED FOR TFT24]
marlin_fullscreen:0

#### Text displayed at the top of the TFT in Marlin Mode.
Expand All @@ -119,7 +125,7 @@ marlin_title:LCD12864 Simulator

#### Hotend Count
# Options: [1 to 6]
ext_count:1
hotend_count:1

#### Extruder Count
# Options: [1 to 6]
Expand All @@ -131,42 +137,45 @@ fan_count:1

#### Bed / Extruder Maximum Temperatures
# format [max_temp: BED:<max temp> T0:<max temp> T1:<max temp> T2:<max temp> T3:<max temp> T4:<max temp> T5:<max temp>]
max_temp: BED:150 T0:275 T1:275 T2:275 T3:275 T4:275 T5:275
max_temp:BED:150 T0:275 T1:275 T2:275 T3:275 T4:275 T5:275

#### Cold Extrusion Minimum Temperature
min_temp:180

#### Fan Maximum PWM speed (0 to 255)
fan_max:255
# format [fan_max: F0:<max temp> F1:<max temp> F2:<max temp> F3:<max temp> F4:<max temp> F5:<max temp>]
fan_max:F0:255 F1:255 F2:255 F3:255 F4:255 F5:255

#### Machine Size / Build Area (mm)
# Options: [X Axis: X, Y Axis: Y, Z Axis: Z]
# minimum possible value: 0, maximum possible value: 2000
# minimum possible value: -2000, maximum possible value: 2000
# minimum size limit format [size_min: X<minimum distance> Y<minimum distance> Z<minimum distance>]
# maximum size limit format [size_max: X<maximum distance> Y<maximum distance> Z<maximum distance>]
size_min: X0 Y0 Z0
size_max: X235 Y235 Z250
size_min:X0 Y0 Z0
size_max:X235 Y235 Z250

#### default Move Speeds (mm/min)
# Options: [Slow: S, Normal: N, Fast: F]
# format [move_speed: S<feedrate mm/min> N<feedrate mm/min> F<feedrate mm/min>]
move_speed: S1000 N3000 F5000
move_speed:S1000 N3000 F5000

#### default Extruder Speeds (mm/min)
# Options: [Slow: S, Normal: N, Fast: F]
# format [ext_speed: S<feedrate mm/min> N<feedrate mm/min> F<feedrate mm/min>]
ext_speed: S60 N600 F1200
ext_speed:S60 N600 F1200

####Auto Save Load Leveling Data
#### Auto Save Load Leveling Data
# The TFT will auto-detect if Auto Bed Level is available.
# Enable this will send "M500" after "G29" to store leveling value
# and send "M420 S1" to enable leveling state after startup
# Options:[1:enable, 0: disable]
# Options: [enable: 1, disable: 0]
auto_load_leveling:1

#### Onboard / Printer SD Card Support (enable if the printer has an Onboard SDcard
#Options: [enable: 1, disable: 0]
onboard_sd_support:1
#### Onboard / Printer SD Card Support
# On Marlin Firmware, The TFT will auto detect Onboard SD Card
# Auto-detect is not available for other firmwares like Smoothieware
#Options: [enable: 1, disable: 0, auto-detect: 2]
onboard_sd_support:2

#### M27 / Printing status refresh time (this will be used if SD_AUTOREPORT is not detected by the TFT)
M27_refresh_time:3
Expand All @@ -175,6 +184,12 @@ M27_refresh_time:3
# Options: [enable: 1, disable: 0]
M27_always_active:1

#### Long File Names Support
# On Marlin Firmware, The TFT will autodetect Long File Name supported
# Auto-detect is not available for other firmwares like Smoothieware
#Options: [enable: 1, disable: 0, auto-detect: 2]
long_filename_support:2

#### Show Fan Speed as Percentage
# Options: [enable: 1, disable: 0]
fan_speed_percent:1
Expand All @@ -186,21 +201,21 @@ fan_speed_percent:1
# Pause XY position format [pause_pos: X<position in mm> Y<position in mm>]
# Pause Z raise format [pause_z_raise: Z<distance in mm>]
# Pause feed Rate # format [ X<feedrate mm/min> Y<feedrate mm/min> Z<feedrate mm/min> E<feedrate mm/min>]
pause_retract: R15 P16
pause_retract:R15 P16
pause_pos:X10 Y10
pause_z_raise:20
pause_feedrate: X6000 Y6000 Z6000 E600
pause_feedrate:X6000 Y6000 Z6000 E600

### Manual Level Points Edge distance (mm)
# distance in mm, Feedrates in mm/min
# Leveling Edge distance format [pause_pos: X<distance in mm> Y<distance in mm>]
# Leveling Edge distance format [level_edge_distance: <distance from edge in mm>]
# Leveling Z Position format [level_z_pos: Z<position in mm>]
# Leveling Z raise format [level_z_raise: Z<distance in mm>]
# Leveling feed Rate format [ X<feedrate mm/min> Y<feedrate mm/min> Z<feedrate mm/min>]
level_edge_distance: X20 Y20
level_edge_distance:20
level_z_pos:0.2
level_z_raise:10
level_feedrate: X6000 Y6000 Z6000
level_feedrate:X6000 Y6000 Z6000

#### Preheat Temperature
# Maximum Filament name length 7 characters
Expand All @@ -224,10 +239,10 @@ preheat_temp3:T230 B90
ps_on:0

#### Power Supply Active HIGH Settings
# Options:[HIGH: 1, LOW: 0]
# Options: [HIGH: 1, LOW: 0]
ps_on_active_high:1

#### Maximum hot-end temperature of automatic shut down after printing (only if auto power is enabled)
#### Maximum hot-end temperature of automatic shut down after printing (only if auto power is enabled)
# wait for the hot-end temperature to be lower than this value, then turn off the power automatically
auto_shutdown_temp:50

Expand All @@ -236,7 +251,7 @@ auto_shutdown_temp:50
#--------------------------------------------------------------------

#### Default FIlament Sensor
# Options:[NONE: 0, Normal: 1, SMART: 2]
# Options: [NONE: 0, Normal: 1, SMART: 2]
fil_runout:0

#### Filament runout inverting - invert the logic of the sensor.
Expand Down Expand Up @@ -276,16 +291,16 @@ btt_mini_ups:0
buzzer:1

#### Knob Led Color (only for TFT35 E3.0)
#Options: [ 0: LED_OFF, 1: LED_WHITE, 2: LED_RED, 3: LED_ORANGE, 4: LED_YELLOW, 5: LED_GREEN, 6: LED_BLUE, 7: LED_INDIGO, 8: LED_VIOLET]
#Options: [LED_OFF: 0, LED_WHITE: 1, LED_RED: 2, LED_ORANGE: 3, LED_YELLOW: 4, LED_GREEN: 5, LED_BLUE: 6, LED_INDIGO: 7, LED_VIOLET: 8]
knob_led_color:0

#### Default LCD Brightness levels (only for TFT35v3.0 & TFT28v3.0)
# Options: [(low) 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 (full)]
lcd_brightness:10
lcd_idle_brightness:5

####Default LCD idle time (only for TFT35v3.0 & TFT28v3.0)
# Options [0: Off, 1: 5Sec, 2: 10Sec , 3: 30sec, 4: 1min, 5: 2min, 6: 5min, 7: 10min]
#### Default LCD idle time (only for TFT35v3.0 & TFT28v3.0)
# Options [Off: 0, 5Sec: 1, 10Sec: 2, 30sec: 3, 1min: 4, 2min: 5, 5min: 6, 10min: 7]
lcd_idle_delay:4


Expand Down Expand Up @@ -346,6 +361,10 @@ start_gcode_enabled:0
# Options: [enable: 1, disable: 0]
end_gcode_enabled:0

#### Default Cancel Gcode Status
# Options: [enable: 1, disable: 0]
cancel_gcode_enabled:0

#### Start G-code - run this G-code before starting print
# maximum length 50 characters
start_gcode:G28 XY R20\n
Expand Down
Loading