Add support for settings update through config file, switch unified & classic menu through config file & other minor changes #526

guruathwal · 2020-04-03T21:17:12Z

Add support for updating settings through a config file without the need to recompile firmware.
Add config update progress screen on boot to show unrecognized keywords and values.
Config keywords settings are almost similar to G-codes.
Almost all of the settings in Configuration.h can be changed with the config.ini file.
Move LCD colors to a separate file.
Move Numpad to a separate file.
Increase firmware version to 26.1
Changeable long text strings are save to SPI flash.
long text strings like custom G-codes and print G-codes are loaded from SPI flash only when needed.
Add the Unified Menu / Classic Menu option to config.ini. now both menu flavors can be switched without flashing firmware.
Fix menu title not displaying correctly in a List menu after a reminder message is cleared.
Add option to change Status Screen XYZ display background color, list view border & button color.
Fix show EMERGENCY_PARSER warning only on first boot.

(Needs updating icons & Reset settings after firmware update )

Acenotass · 2020-04-05T03:34:32Z

My screen is TFT35 v 1.2
"Rotate_ui 1" is not working correctly
Custom G-Code Commands do not support UTF encoding, if you set the parameters in Russian, it hangs during firmware
For example:
custom_label_4:Сохранённая сетка стола
custom_gcode_4:M420 s1\n

guruathwal · 2020-04-05T06:49:11Z

@Acenotass
Thanks for testing. I fixed the rotation bug.
In your example, the name length is more than 20 characters. Even then also I tried to update with it. the TFT skipped that gcode and showed an error that it was not updated. No hangs noticed. however, it will pause for a few seconds when an error is displayed on the screen to allow the user to read it.

Acenotass · 2020-04-05T06:55:15Z

custom_label_1:Отключить двигатели
custom_gcode_1:M84\n
custom_label_2:Активировать SD карту
custom_gcode_2:M21\n
custom_label_3:Деактивировать SD карту
custom_gcode_3:M22\n
custom_label_4:Сохранённая сетка стола
custom_gcode_4:M420 s1\n
custom_label_5:Сохранить EEPROM
custom_gcode_5:M500\n
custom_label_6:Восстановить EEPROM
custom_gcode_6:M501\n
custom_label_7:EEPROM по умолчанию
custom_gcode_7:M502\n

with these values my firmware update freezes

If you can’t use the UTF encoding in config.ini, then at least you need to be able to use the values from the firmware from Configuration.h

guruathwal · 2020-04-05T07:48:01Z

@Acenotass I tried those also.
it just ignored them due to long lengths and the text displayed correctly in error.
Still no hangs. here is the video gif:

Acenotass · 2020-04-05T07:49:47Z

Sorry it turns out I have config.ini saved in ANSI encoding

Acenotass · 2020-04-05T07:51:09Z

So what about UTF encoding support in the config.ini file?

guruathwal · 2020-04-05T10:52:54Z

@Acenotass the config.ini is in UTF encoding. may be your editor is changing the encoding while saving the changes.

Acenotass · 2020-04-05T11:53:33Z

There was a problem with displaying all the digits in all fields.

guruathwal · 2020-04-05T12:10:35Z

Just checked .. I can confirm that... adding fix...

GregSKR · 2020-04-05T19:17:05Z

A bit confused with this option:

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

On the TFT screen, option is "Hide terminal ACK".
When setting terminal_ack to 0 in config.ini, meaning not showing ACK, "Hide ACK" is disabled in the firmware...
Shouldn't this option be "Hide Temprature ACK in Gcode Terminal"?

guruathwal · 2020-04-06T04:41:41Z

@GregSKR why are you geting confused the meaning is in the sentence.

thisiskeithb · 2020-04-06T15:33:03Z

Sorry it turns out I have config.ini saved in ANSI encoding

@Acenotass (and anyone else) I'd recommend installing the EditorConfig plugin. This will keep code tidy and ensure proper file encoding. ~~I'll put in a PR shortly to add *.ini files to the UTF-8 encoding section~~: Done.

thisiskeithb · 2020-04-06T16:16:22Z

.editorconfig

@@ -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


Maybe end_of_line should be removed completely (or at least until native is supported) since it's not universal across macOS/Linux/Windows.

I agree with you

@Acenotass (and anyone else) I'd recommend installing the EditorConfig plugin. This will keep code tidy and ensure proper file encoding. ~~I'll put in a PR shortly to add *.ini files to the UTF-8 encoding section~~: Done.

@thisiskeithb It keeps adding a new line to the code if you are typing at the end of the file and stop for 2 seconds. I think this is due to insert_final_newline = true. So I set those settings in VSCodium's default settings.

Odd. Which OS are you using? I don’t have that issue on macOS or Windows.

bigtreetech · 2020-04-07T01:24:16Z

Hello, thank you very much for your work! This PR will not be merged in a short time, because there are too many changes in it.
My main work in the near future is to fix some bugs and test them. I plan to release a new release version this week, and this PR will be merged after release version.
Thank you again!

Acenotass · 2020-04-07T06:29:25Z

To create beautiful themes for the TFT screen, standard color sets are not enough. I propose to make it possible to select any color in config.ini.
As a basis, you can take color coding in HTML.
https://en.wikipedia.org/wiki/Web_colors

guruathwal · 2020-04-07T06:43:51Z

Hello, thank you very much for your work! This PR will not be merged in a short time, because there are too many changes in it.
My main work in the near future is to fix some bugs and test them. I plan to release a new release version this week, and this PR will be merged after release version.
Thank you again!

@bigtreetech
Looking forward to it 👍

Acenotass · 2020-04-08T07:25:03Z

What kind of color coding is in the Colors.h file. I can’t match the icon color with the background color #define BLUE 0x021F.
Is my request for execution planned?
#526 (comment)

guruathwal · 2020-04-08T07:36:19Z

@Acenotass yes I will add it. It takes time.
The colors are RGB565. The lcd uses RGB565 (aka 65k colors) . Those html colors are ~~16bit~~ 24bit colors.. They cannot be matched accurately.

Acenotass · 2020-04-08T07:49:53Z

@guruathwal thank you very much!

GregSKR · 2020-04-09T10:41:15Z

@guruathwal Thanks a lot for your work for the community, I'm using your fork for flashing my TFT35, it's awesome!

Sorry to bother you again about 'terminal_ack'...
I see you made some changes to the config.ini, thanks for that, but the confusion was not in the meaning of the sentence, but in the effect of the value.
As a picture is better than words, let me show you what I meant:

So, if I want to HIDE ack, looks like I have to set the value of terminal_ack to 1 (and not 0!) to activate the hiding option?...
Sorry if I'm wrong, just want to clarify this parameter for future users of the config file,
but shounldn't the options be [Show: 0, Hide: 1]?

Acenotass · 2020-04-09T11:10:50Z

@GregSKR @guruathwal IMHO, in order not to get confused in the logic of variables, the best thing is to use Boolean values True and False

thisiskeithb · 2020-04-09T11:35:44Z

I think dropping “Hide” from the menu label would help clear up confusion. 0 should be an off/disabled state.

Or what about renaming the label to “Temperature ACK”?

Acenotass · 2020-04-09T11:56:57Z

The logic is simple, True is always 1, and the inverse logic is Hide. It follows that it makes sense to use Boolean values. Hide = True = 1

Acenotass · 2020-04-11T04:16:21Z

@guruathwal I noticed an bug in displaying files when printing through the motherboard. If the files in list mode is disabled, then the files are still displayed in list mode.

guruathwal · 2020-04-11T05:01:19Z

@guruathwal I noticed an bug in displaying files when printing through the motherboard. If the files in list mode is disabled, then the files are still displayed in list mode.

@Acenotass It is not a bug. It is deliberate because the preview images cannot be loaded from motherboard SD card. So there is no point in showing icons for files in motherboard SD card.

Acenotass · 2020-04-11T05:05:20Z

@guruathwal I see... BTW, how to form a preview image I did not understand. Nowhere is this written clearly.

guruathwal · 2020-04-11T05:13:05Z

@Acenotass this might help you: https://github.com/bigtreetech/BiQU_Tool

Acenotass · 2020-04-11T05:15:34Z

@guruathwal
I tried to create pictures with this application, but I didn’t see anything. The application is very raw, the problem with switching languages.

guruathwal · 2020-04-28T06:00:38Z

@GregSKR thanks for notifying

ssombra · 2020-04-30T18:46:31Z

I am interested in updating through a config file, how does it work? any guide?

Acenotass · 2020-05-01T08:45:40Z

@guruathwal
In the latest commit version, the fan is incorrectly regulated, maximum 7%

guruathwal · 2020-05-01T09:23:33Z

@Acenotass resetting the settings or reloading the config file should rectify it.

roberttco · 2020-05-02T02:00:33Z

@Acenotass - what are you asking for with the colors ? Since the colors are in RGB565 color space you could use an online tool. There are several. I use http://www.rinkydinkelectronics.com/calc_rgb565.php

Acenotass · 2020-05-02T10:04:59Z

@roberttco the problem is not with color conversion, but with the impossibility of choosing it, there is no way to choose any color.

roberttco · 2020-05-02T16:01:24Z

Ahhh I see. That makes Morse sense to me now. Thanks.

…nges - 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.

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

…nges - 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.

Improve Cancel Gcode setting Users can now enable/disable Cancel Gcode through the Feature menu. Disabled by default.

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

extesy · 2020-05-06T18:47:11Z

@bigtreetech When do you plan to merge this?

…nified & classic menu through config file & other minor changes (bigtreetech#526)" This reverts commit 522911e.

GregSKR · 2020-05-12T18:48:48Z

Just for the beauty of the code: 😉

in Settings.c, the 3 following parameters are duplicated (lines 42-44 and 57-59):

infoSettings.send_start_gcode     = 0;
infoSettings.send_end_gcode       = 0;
infoSettings.send_cancel_gcode    = 1;

and really not important 😄 in FeatureSettings.c lines 401-402 and 410-411:
Is it nicer to place the 'break' before or after the curly bracket?

guruathwal · 2020-05-13T04:29:45Z

@GregSKR done #663, and the break inside or outside of the curly brackets depends on how lazy the programmer is feeling is at the time of typing it. 😂

… classic menu through config file & other minor changes (bigtreetech#526) - 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. - Move NumPad to seperate file & fix colors in in numpad

guruathwal changed the title ~~Add support for settings update through config file & other minor changes~~ Add support for settings update through config file, switch unified & classic menu through config file & other minor changes Apr 4, 2020

thisiskeithb mentioned this pull request Apr 6, 2020

Ensure INI files are saved with UTF-8 encoding #539

Merged

thisiskeithb reviewed Apr 6, 2020

View reviewed changes

guruathwal force-pushed the master branch 2 times, most recently from c91799c to a0d8cf5 Compare April 28, 2020 14:42

guruathwal and others added 12 commits May 6, 2020 16:24

remove outdated settings

6a1aeb5

remove outdated settings

2f5f659

Improve Cancel Gcode setting (bigtreetech#575)

23ab790

Improve Cancel Gcode setting Users can now enable/disable Cancel Gcode through the Feature menu. Disabled by default.

Update language_ru.h

e48eea5

update Settings PARA_SIGN

c40afb3

Update language_ru.h

58764a8

Update language_ru.h

5e16f39

guruathwal force-pushed the master branch from da51008 to 5e16f39 Compare May 6, 2020 11:14

Update config.c

0045b0a

bigtreetech merged commit 522911e into bigtreetech:master May 8, 2020

Msq001 mentioned this pull request Jun 4, 2020

improve the config color option, set hex color value(RGB888 format) directly #755

Merged

Add support for settings update through config file, switch unified & classic menu through config file & other minor changes #526

Add support for settings update through config file, switch unified & classic menu through config file & other minor changes #526

Conversation

guruathwal commented Apr 3, 2020 • edited Loading

Acenotass commented Apr 5, 2020 • edited Loading

guruathwal commented Apr 5, 2020

Acenotass commented Apr 5, 2020

guruathwal commented Apr 5, 2020

Acenotass commented Apr 5, 2020

Acenotass commented Apr 5, 2020

guruathwal commented Apr 5, 2020 • edited Loading

Acenotass commented Apr 5, 2020

guruathwal commented Apr 5, 2020

GregSKR commented Apr 5, 2020

guruathwal commented Apr 6, 2020

thisiskeithb commented Apr 6, 2020 • edited Loading

thisiskeithb Apr 6, 2020

Choose a reason for hiding this comment

guruathwal Apr 6, 2020

Choose a reason for hiding this comment

guruathwal Apr 6, 2020

Choose a reason for hiding this comment

thisiskeithb Apr 6, 2020

Choose a reason for hiding this comment

guruathwal Apr 7, 2020

Choose a reason for hiding this comment

bigtreetech commented Apr 7, 2020

Acenotass commented Apr 7, 2020

guruathwal commented Apr 7, 2020

Acenotass commented Apr 8, 2020

guruathwal commented Apr 8, 2020 • edited Loading

Acenotass commented Apr 8, 2020

GregSKR commented Apr 9, 2020 • edited Loading

Acenotass commented Apr 9, 2020

thisiskeithb commented Apr 9, 2020

Acenotass commented Apr 9, 2020

Acenotass commented Apr 11, 2020 • edited Loading

guruathwal commented Apr 11, 2020

Acenotass commented Apr 11, 2020

guruathwal commented Apr 11, 2020

Acenotass commented Apr 11, 2020

guruathwal commented Apr 28, 2020

ssombra commented Apr 30, 2020

Acenotass commented May 1, 2020

guruathwal commented May 1, 2020

roberttco commented May 2, 2020 • edited Loading

Acenotass commented May 2, 2020

roberttco commented May 2, 2020

extesy commented May 6, 2020

GregSKR commented May 12, 2020

guruathwal commented May 13, 2020

guruathwal commented Apr 3, 2020 •

edited

Loading

Acenotass commented Apr 5, 2020 •

edited

Loading

guruathwal commented Apr 5, 2020 •

edited

Loading

thisiskeithb commented Apr 6, 2020 •

edited

Loading

guruathwal commented Apr 8, 2020 •

edited

Loading

GregSKR commented Apr 9, 2020 •

edited

Loading

Acenotass commented Apr 11, 2020 •

edited

Loading

roberttco commented May 2, 2020 •

edited

Loading