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

New LED Color menu + some code optimization #1853

Merged
merged 12 commits into from
Apr 22, 2021
Binary file modified Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1.27.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/BIGTREE_TFT28_V3.0.27.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.27.bin
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/BIGTREE_TFT43_V3.0.27.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/BIGTREE_TFT50_V3.0.27.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/BIGTREE_TFT70_V3.0.27.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/BIQU_TFT28_V1.0.27.bin
Binary file not shown.
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/BIQU_TFT35_V1.0.27.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/BIQU_TFT35_V1.1.27.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/BIQU_TFT35_V1.2.27.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/MKS_TFT28_V3.0.27.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/MKS_TFT28_V4.0.27.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/MKS_TFT32_V1.3.27.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/MKS_TFT32_V1.4.27.bin
Binary file not shown.
12 changes: 6 additions & 6 deletions Copy to SD Card root directory to update/config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ mesh_min_color:7
## Color used by the Mesh Editor menu for drawing the mesh with the maximum value in the grid
mesh_max_color:2

#### Terminal text Color Scheme
#### Terminal Text Color Scheme
# Select as color scheme for displaying text in Teminal menu.
# Options: [Material Dark: 0, Material Light: 1, High Contrast: 2]
# Material Dark: Dark background with light font color and orange command font color.
Expand All @@ -135,7 +135,7 @@ terminal_color_scheme:0
# Options: [enable: 1, disable: 0]
rotate_ui:0

#### Temperature ACK in Terminal
#### Temperature ACK In Terminal
# Show or hide temperature ACK in Terminal menu.
# Options: [show: 1, hide: 0]
terminal_ack:0
Expand Down Expand Up @@ -301,21 +301,21 @@ fan_max:F0:255 F1:255 F2:255 F3:255 F4:255 F5:255 CtL:255 CtI:255
size_min:X0 Y0 Z0
size_max:X235 Y235 Z250

#### Default X & Y Move Speeds/feedrates
#### Default X & Y Move Speeds/Feedrates
# Move speeds used in move menu to move X and Y axes.
# Format: [move_speed: S<feedrate> N<feedrate> F<feedrate>]
# Unit: [feedrate in mm/min]
# Value range: [min: 10, max: 12000]
xy_speed:S1000 N3000 F5000

#### Default Z Speeds/feedrates
#### Default Z Speeds/Feedrates
# Move speeds used in move menu to move Z axis.
# Format: [move_speed: S<feedrate> N<feedrate> F<feedrate>]
# Unit: [feedrate in mm/min]
# Value range: [min: 10, max: 12000]
z_speed:S500 N1000 F2000

#### Default Extruder Speeds/feedrates
#### Default Extruder Speeds/Feedrates
# Speed settings used to extrude/retract.
# Format: [ext_speed: S<feedrate> N<feedrate> F<feedrate>]
# Unit: [feedrate in mm/min]
Expand Down Expand Up @@ -588,7 +588,7 @@ knob_led_color:0
# Options: [true: 1, false: 0]
knob_led_idle:1

#### Knob LED pixels (only for TFT43 V3.0, TFT50 V3.0 & TFT70 V3.0)
#### Knob LED Pixels (only for TFT43 V3.0, TFT50 V3.0 & TFT70 V3.0)
# Set the number of LEDs in the strip connected the "Neopixel" port of TFT.
# It shares the same signal line as "knob_led". 0 means the default number in TFT hardware,
# Greater than 0 means the number of LEDs in the strip.
Expand Down
12 changes: 6 additions & 6 deletions Copy to SD Card root directory to update/config_rrf.ini
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ mesh_min_color:7
## Color used by the Mesh Editor menu for drawing the mesh with the maximum value in the grid
mesh_max_color:2

#### Terminal text Color Scheme
#### Terminal Text Color Scheme
# Select as color scheme for displaying text in Teminal menu.
# Options: [Material Dark: 0, Material Light: 1, High Contrast: 2]
# Material Dark: Dark background with light font color and orange command font color.
Expand All @@ -135,7 +135,7 @@ terminal_color_scheme:0
# Options: [enable: 1, disable: 0]
rotate_ui:0

#### Temperature ACK in Terminal
#### Temperature ACK In Terminal
# Show or hide temperature ACK in Terminal menu.
# Options: [show: 1, hide: 0]
terminal_ack:0
Expand Down Expand Up @@ -301,21 +301,21 @@ fan_max:F0:255 F1:255 F2:255 F3:255 F4:255 F5:255 CtL:255 CtI:255
size_min:X0 Y0 Z0
size_max:X235 Y235 Z250

#### Default X & Y Move Speeds/feedrates
#### Default X & Y Move Speeds/Feedrates
# Move speeds used in move menu to move X and Y axes.
# Format: [move_speed: S<feedrate> N<feedrate> F<feedrate>]
# Unit: [feedrate in mm/min]
# Value range: [min: 10, max: 12000]
xy_speed:S1000 N3000 F5000

#### Default Z Speeds/feedrates
#### Default Z Speeds/Feedrates
# Move speeds used in move menu to move Z axis.
# Format: [move_speed: S<feedrate> N<feedrate> F<feedrate>]
# Unit: [feedrate in mm/min]
# Value range: [min: 10, max: 12000]
z_speed:S500 N1000 F2000

#### Default Extruder Speeds/feedrates
#### Default Extruder Speeds/Feedrates
# Speed settings used to extrude/retract.
# Format: [ext_speed: S<feedrate> N<feedrate> F<feedrate>]
# Unit: [feedrate in mm/min]
Expand Down Expand Up @@ -588,7 +588,7 @@ knob_led_color:0
# Options: [true: 1, false: 0]
knob_led_idle:1

#### Knob LED pixels (only for TFT43 V3.0, TFT50 V3.0 & TFT70 V3.0)
#### Knob LED Pixels (only for TFT43 V3.0, TFT50 V3.0 & TFT70 V3.0)
# Set the number of LEDs in the strip connected the "Neopixel" port of TFT.
# It shares the same signal line as "knob_led". 0 means the default number in TFT hardware,
# Greater than 0 means the number of LEDs in the strip.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "ledcolor.h"
#include "LCD_LEDColor.h"
#include "GPIO_Init.h"
#include "includes.h"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _LEDCOLOR_H_
#define _LEDCOLOR_H_
#ifndef _LCD_LED_COLOR_H_
#define _LCD_LED_COLOR_H_

#ifdef __cplusplus
extern "C" {
Expand Down
47 changes: 47 additions & 0 deletions TFT/src/User/API/UI/Numpad.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,51 @@
#include "Numpad.h"
#include "list_item.h"

#define SKEYHEIGHT (LCD_HEIGHT-ICON_START_Y)/4
#define SKEYWIDTH LCD_WIDTH/4

#define KEY_NUM 16
#define FLOAT_BUFLONG 9
#define INT_BUFLONG 6

typedef enum
{
SKEY_0 = 0,
SKEY_1,
SKEY_2,
SKEY_3,
SKEY_4,
SKEY_5,
SKEY_6,
SKEY_7,
SKEY_8,
SKEY_9,
SKEY_10,
SKEY_11,
SKEY_IDLE = IDLE_TOUCH,
}SKEY_VALUES;

typedef enum
{
NUM_KEY_1 = 0,
NUM_KEY_2,
NUM_KEY_3,
NUM_KEY_OK,
NUM_KEY_4,
NUM_KEY_5,
NUM_KEY_6,
NUM_KEY_DEL,
NUM_KEY_7,
NUM_KEY_8,
NUM_KEY_9,
NUM_KEY_EXIT,
NUM_KEY_DEC,
NUM_KEY_0,
NUM_KEY_MINUS,
NUM_KEY_RESET,

NUM_KEY_IDLE = IDLE_TOUCH,
}NUM_KEY_VALUES;

const GUI_RECT rect_of_numkey[KEY_NUM]={
{0*SKEYWIDTH, ICON_START_Y+0*SKEYHEIGHT, 1*SKEYWIDTH, ICON_START_Y+1*SKEYHEIGHT},//1
Expand Down
48 changes: 0 additions & 48 deletions TFT/src/User/API/UI/Numpad.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,54 +6,6 @@ extern "C" {
#endif

#include "includes.h"
#include "list_item.h"

#define SKEYHEIGHT (LCD_HEIGHT-ICON_START_Y)/4
#define SKEYWIDTH LCD_WIDTH/4

#define KEY_NUM 16
#define FLOAT_BUFLONG 9
#define INT_BUFLONG 6

typedef enum
{
SKEY_0 = 0,
SKEY_1,
SKEY_2,
SKEY_3,
SKEY_4,
SKEY_5,
SKEY_6,
SKEY_7,
SKEY_8,
SKEY_9,
SKEY_10,
SKEY_11,
SKEY_IDLE = IDLE_TOUCH,
}SKEY_VALUES;

typedef enum
{
NUM_KEY_1 = 0,
NUM_KEY_2,
NUM_KEY_3,
NUM_KEY_OK,
NUM_KEY_4,
NUM_KEY_5,
NUM_KEY_6,
NUM_KEY_DEL,
NUM_KEY_7,
NUM_KEY_8,
NUM_KEY_9,
NUM_KEY_EXIT,
NUM_KEY_DEC,
NUM_KEY_0,
NUM_KEY_MINUS,
NUM_KEY_RESET,

NUM_KEY_IDLE = IDLE_TOUCH,
}NUM_KEY_VALUES;


double numPadFloat(u8* title, double old_val, double reset_val, bool negative);

Expand Down
10 changes: 5 additions & 5 deletions TFT/src/User/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -428,19 +428,19 @@
#define SHOW_FAN_PERCENTAGE true // To enabled: true | To disabled: false (Default: true)

/**
* Mesh Editor Keyboard on left side
* By default the Mesh Editor Keyboard is drawn on right side of the screen.
* Enable MESH_LEFT_KEYBOARD to draw the mesh editor keyboard on left side of the screen.
* Keyboard on left side (Mesh Editor, RGB Settings Custom)
* By default the keyboard is drawn on right side of the screen.
* Enable KEYBOARD_ON_LEFT to draw the keyboard on left side of the screen.
*/
//#define MESH_LEFT_KEYBOARD
//#define KEYBOARD_ON_LEFT

//
// Terminal Keyboard / Numpad settings
//

// Terminal Keyboard / Numpad theme
// Uncomment to enable Material theme for keyboard and Numpad
#define KEYBOARD_MATERIAL_THEME // Default: disabled
#define KEYBOARD_MATERIAL_THEME // Default: disabled

/**
* Color scheme for the Terminal Keyboard / Numpad
Expand Down
Loading