Skip to content

Commit

Permalink
parent e05045a
Browse files Browse the repository at this point in the history
author guruathwal <gurmeet.athwal@gmail.com> 1585947271 +0530
committer guruathwal <gurmeet.athwal@gmail.com> 1588082816 +0530

parent e05045a
author guruathwal <gurmeet.athwal@gmail.com> 1585947271 +0530
committer guruathwal <gurmeet.athwal@gmail.com> 1588081780 +0530

parent e05045a
author guruathwal <gurmeet.athwal@gmail.com> 1585947271 +0530
committer guruathwal <gurmeet.athwal@gmail.com> 1588081144 +0530

Add support for settings update through config file & other minor changes

- Add support for updating settings through a config file without need to recompile firmware.
- Move lcd colors to selerate file.
- Increase firmware version to 25.4
- changeable long text strings are save to spi flash.
- long text like custom gcodes and print gcodes are loaded from
 spi flash only when needed.

Update leveling.c

Update Settings.c

Add dynamic/custom text support to list view custom values & bump software version to 25.4

- Add dynamic/custom text support to list view custom values
- Bump software version to 25.4

update precompiled binaries

Update readme & add configuration instructions

add config instruction images

Update config_instructions.md

Update config_instructions.md

Update config_instructions.md

fix color index in config.ini

Update .editorconfig

update default config files

fix issues in config parsing limits & list mode colors not changing

Move NumPad to seperate file & fix colors in in numpad

update default config files

fix option index numbers in configuration.h and match option indexes in config.ini

Add Unified menu & classic menu to Config file.

Update precompiled binaries and add readme.md to firmware directories.

Update README.md

Update README.md

Update README.md

Fix rotate ui bug in if rotation changed through config file

add check to count unicode character instead of bytes & add settings array size check on compile

update config files

Update config.c

update binaries

update wrong icon in word_unicode.fon for TFT24 & TFT28

fix parameter values not displaying

fix wrong count of gcodes when gcode name or gcode is not parsed

fix backgroud loop in Main menu in Unified Menu and cleanup

fix backgroud loop in Main menu in Unified Menu and cleanup follow up

Fix Menu Title not displaying correctly in a List menu after a reminder message is cleared

Fix knob led color options index start from 0

remove redefine of STARTUP_KNOB_LED_COLOR already defined in SanityCheck.h

Add option to change status screen XYZ background, list view border & button color & minor cleanup

- Add option to change Status screen XYZ display background color, list view border & button color.
- Remove confustion in show ack setting in config.ini
- fix typos in config.ini

fix colors display in list view and status screen & colors match names

Fix color display in list view and status screen
match colors with names
fix remider color changing with volume reminder color due to duplicate keywords

Fix sanitycheck.h, add leveling edge distance to Configuration.h, fix reminders color display

Fix: show emergency parser pop up warning on on first boot

Fix build error

Fix  ST7920 colors not changing

Fix build error due to change in defined names.

The curious case of ACK

- rename gcode menu to 'Terminal'
- change ACK label text

Update parseACK.c

fix bad paste

fix wrong tool number while printing

Update leveling.c

Update Settings.c

add config instruction images

Update config_instructions.md

Update config_instructions.md

fix color index in config.ini

Update .editorconfig

update default config files

Move NumPad to seperate file & fix colors in in numpad

update default config files

fix option index numbers in configuration.h and match option indexes in config.ini

Add Unified menu & classic menu to Config file.

Update precompiled binaries and add readme.md to firmware directories.

update config files

Update config.c

update binaries

update wrong icon in word_unicode.fon for TFT24 & TFT28

fix parameter values not displaying

fix wrong count of gcodes when gcode name or gcode is not parsed

fix backgroud loop in Main menu in Unified Menu and cleanup

fix backgroud loop in Main menu in Unified Menu and cleanup follow up

Fix Menu Title not displaying correctly in a List menu after a reminder message is cleared

remove redefine of STARTUP_KNOB_LED_COLOR already defined in SanityCheck.h

Add option to change status screen XYZ background, list view border & button color & minor cleanup

- Add option to change Status screen XYZ display background color, list view border & button color.
- Remove confustion in show ack setting in config.ini
- fix typos in config.ini

Fix: show emergency parser pop up warning on on first boot

Fix build error

Fix  ST7920 colors not changing

Fix build error due to change in defined names.

The curious case of ACK

- rename gcode menu to 'Terminal'
- change ACK label text

update show ack check

Update parseACK.c

fix bad paste

fix wrong tool number while printing

minor bugfix

Update Printing.c
  • Loading branch information
guruathwal committed Apr 28, 2020
1 parent 8aa2368 commit a0d8cf5
Show file tree
Hide file tree
Showing 90 changed files with 1,022 additions and 741 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ charset = utf-8
[{*.c,*.cpp,*.h,Makefile}]
trim_trailing_whitespace = true
insert_final_newline = true
end_of_line = lf
end_of_line = crlf
indent_style = space
indent_size = 2

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
### From version 26.1 the firmware for classic Menu and Unified Menu is merged.

**Now Classic Menu or Unified Menu can be enabled using the config.ini file without the need to update the firmware**
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,10 +1,23 @@
#### Default Config file for BigTreeTech TFT Controllers
#
# BIGTREE_TFT35_V1_1 / BIGTREE_TFT35_V1_2 / BIGTREE_TFT35_V2_0
# BIGTREE_TFT35_V3_0 / BIGTREE_TFT35_E3_V3_0 / BIGTREE_TFT28_V1_0
# BIGTREE_TFT28_V3_0 / BIGTREE_TFT24_V1_1 / MKS_32_V1_4
#
# Firmware Source: https://github.com/bigtreetech/BIGTREETECH-TouchScreenFirmware
#
#--------------------------------------------------------------------
# General Settings
#--------------------------------------------------------------------

#### UNIFIED MENU / CLASSIC MENU
# Select a UI Menu flavour
# Options: [Unified Menu: 1, Classic Menu: 0]
unified_menu:1

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

#### Default Touch Mode Language
# Select the language to display on the LCD while in Touch Mode.
Expand All @@ -15,29 +28,47 @@ 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: 13, DARKGREEN: 14, GRAY: 15, DARKGRAY: 16 ]
# ORANGE: 8, PURPLE: 9, LIME: 10, BROWN: 11, DARKBLUE: 12, DARKGREEN: 13, GRAY: 14, DARKGRAY: 15 ]

# Title background color
title_back_color:1

#Background color
background_color:0
background_color:1

#Font foreground color
font_color:0

#Reminder font color, such as: "No print attached", "Busy processing", etc.
reminder_color:5

#Volume reminder font color, such as: "Card inserted", "Card removed"
volume_reminder_color:5
#Volume status/reminder font color, such as: "Card inserted", "Card removed"
volume_status_color:5

#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

#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

#### Show Temprature ACK in Gcode Terminal
# Options: [enable: 1, disable: 0]
#### Show or hide Temperature ACK in Gcode Terminal
# Options: [Show: 1, Hide: 0]
terminal_ack:0

#### invert X axis button function in Move menu to match move buttons to actual axis
Expand Down Expand Up @@ -66,7 +97,7 @@ default_mode: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: 13, DARKGREEN: 14, GRAY: 15, DARKGRAY: 16 ]
# ORANGE: 8, PURPLE: 9, LIME: 10, BROWN: 11, DARKBLUE: 12, DARKGREEN: 13, GRAY: 14, DARKGRAY: 15 ]
marlin_bg_color:1
marlin_fn_color:8

Expand Down Expand Up @@ -98,11 +129,11 @@ ext_count:1
# Options: [1 to 6]
fan_count:1

#### Bed / Extruder Maximum Tempratures
#### 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

#### Cold Extrusion Minimum Temprature
#### Cold Extrusion Minimum Temperature
min_temp:180

#### Fan Maximum PWM speed (0 to 255)
Expand All @@ -127,7 +158,7 @@ move_speed: S1000 N3000 F5000
ext_speed: S60 N600 F1200

####Auto Save Load Leveling Data
# The TFT will auto detect if Auto Bed Level is available.
# 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]
Expand Down Expand Up @@ -171,8 +202,9 @@ level_z_pos:0.2
level_z_raise:10
level_feedrate: X6000 Y6000 Z6000

#### Preheat Temprature
#### Preheat Temperature
# Maximum Filament name length 7 characters
# If default names are changed, make sure to change Icons to match the names
#format [T<hotend temp> B<bed temp>]
preheat_name1:PLA
preheat_temp1:T200 B60
Expand All @@ -195,8 +227,8 @@ ps_on:0
# Options:[HIGH: 1, LOW: 0]
ps_on_active_high:1

#### Maximum hotend temperature of automatic shut down after printing (only if auto power is enabled)
# wait for the hotend temperature to be lower than this value, then turn off the power automatically
#### 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 Down Expand Up @@ -236,25 +268,25 @@ btt_mini_ups:0


#--------------------------------------------------------------------
# Other device specific settings
# Other device-specific settings
#--------------------------------------------------------------------

#### Buzzer / sound
# Options: [enable: 1, disable: 0]
buzzer:1

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

#### Default LCD Brightness levels (only for TFT35v3.0 & TFT28v3.0)
# Options: [(low) 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 (full)]
# 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(in sec) (only for TFT35v3.0 & TFT28v3.0)
# Options: [off: 0, 5sec: 1, 10sec: 2, 30sec: 3, 60sec: 4,120sec: 5, 300sec: 6]
lcd_idle_delay:3
####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]
lcd_idle_delay:4


#--------------------------------------------------------------------
Expand All @@ -269,7 +301,7 @@ lcd_idle_delay:3

# if the values are left blank then default name and G-code will be used

# Options: [Label maximum length: 20 characters, G-code Maximum length 70 characters]
# Options: [Label maximum length: 24 characters, G-code Maximum length 70 characters]

custom_label_1:Disable steppers
custom_gcode_1:M84\n
Expand All @@ -278,13 +310,13 @@ custom_gcode_2:G28\nG29\nG0\n
custom_label_3:Release sd card
custom_gcode_3:M22\n
custom_label_4:restore leveling
custom_gcode_4:M420 s1\n
custom_gcode_4:M420 S1\n
custom_label_5:Save to EEPROM
custom_gcode_5:M500\n
custom_label_6:restore from EEPROM
custom_gcode_6:M501\n
#custom_label_7:EEPROM defaults
#custom_gcode_7:M502\n
custom_label_7:EEPROM defaults
custom_gcode_7:M502\n
#custom_label_8:custom8
#custom_gcode_8:M105\n
#custom_label_9:custom9
Expand Down Expand Up @@ -325,4 +357,3 @@ end_gcode:G90\nG1 E-4\nG92 E0\nM18\n
#### Cancel G-code - run this G-code after canceling print
# maximum length 50 characters
cancel_gcode:G28 XY R10\n

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 3 additions & 0 deletions Copy to SD Card root directory to update/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
### From version 26.1 the firmware for Classic Menu and Unified Menu is merged.

**Now Classic Menu or Unified menu can be enabled using the config.ini file without the need to update the firmware**
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit a0d8cf5

Please sign in to comment.