Skip to content

Commit

Permalink
Add 100MM movement also 100MM and 200MM extrusion. (bigtreetech#879)
Browse files Browse the repository at this point in the history
  • Loading branch information
NicoletoAerials authored Aug 1, 2020
1 parent 67fa42e commit e9ec127
Show file tree
Hide file tree
Showing 40 changed files with 57 additions and 12 deletions.
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.
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.
2 changes: 2 additions & 0 deletions TFT/src/User/API/Language/Language.inc
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ X_WORD (01_MM)
X_WORD (1_MM)
X_WORD (5_MM)
X_WORD (10_MM)
X_WORD (100_MM)
X_WORD (200_MM)
X_WORD (1_PERCENT)
X_WORD (5_PERCENT)
X_WORD (10_PERCENT)
Expand Down
2 changes: 2 additions & 0 deletions TFT/src/User/API/Language/language_am.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
#define AM_1_MM "1mm"
#define AM_5_MM "5mm"
#define AM_10_MM "10mm"
#define AM_100_MM "100mm"
#define AM_200_MM "200mm"
#define AM_1_PERCENT "1%"
#define AM_5_PERCENT "5%"
#define AM_10_PERCENT "10%"
Expand Down
2 changes: 2 additions & 0 deletions TFT/src/User/API/Language/language_cn.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
#define CN_1_MM "1mm"
#define CN_5_MM "5mm"
#define CN_10_MM "10mm"
#define CN_100_MM "100mm"
#define CN_200_MM "200mm"
#define CN_1_PERCENT "1%"
#define CN_5_PERCENT "5%"
#define CN_10_PERCENT "10%"
Expand Down
2 changes: 2 additions & 0 deletions TFT/src/User/API/Language/language_cz.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
#define CZ_1_MM "1mm"
#define CZ_5_MM "5mm"
#define CZ_10_MM "10mm"
#define CZ_100_MM "100mm"
#define CZ_200_MM "200mm"
#define CZ_1_PERCENT "1%"
#define CZ_5_PERCENT "5%"
#define CZ_10_PERCENT "10%"
Expand Down
2 changes: 2 additions & 0 deletions TFT/src/User/API/Language/language_de.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
#define DE_1_MM "1mm"
#define DE_5_MM "5mm"
#define DE_10_MM "10mm"
#define DE_100_MM "100mm"
#define DE_200_MM "200mm"
#define DE_1_PERCENT "1%"
#define DE_5_PERCENT "5%"
#define DE_10_PERCENT "10%"
Expand Down
2 changes: 2 additions & 0 deletions TFT/src/User/API/Language/language_du.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
#define DU_1_MM "1mm"
#define DU_5_MM "5mm"
#define DU_10_MM "10mm"
#define DU_100_MM "100mm"
#define DU_200_MM "200mm"
#define DU_1_PERCENT "1%"
#define DU_5_PERCENT "5%"
#define DU_10_PERCENT "10%"
Expand Down
2 changes: 2 additions & 0 deletions TFT/src/User/API/Language/language_en.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
#define EN_1_MM "1mm"
#define EN_5_MM "5mm"
#define EN_10_MM "10mm"
#define EN_100_MM "100mm"
#define EN_200_MM "200mm"
#define EN_1_PERCENT "1%"
#define EN_5_PERCENT "5%"
#define EN_10_PERCENT "10%"
Expand Down
2 changes: 2 additions & 0 deletions TFT/src/User/API/Language/language_es.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
#define ES_1_MM "1mm"
#define ES_5_MM "5mm"
#define ES_10_MM "10mm"
#define ES_100_MM "100mm"
#define ES_200_MM "200mm"
#define ES_1_PERCENT "1%"
#define ES_5_PERCENT "5%"
#define ES_10_PERCENT "10%"
Expand Down
2 changes: 2 additions & 0 deletions TFT/src/User/API/Language/language_fr.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
#define FR_1_MM "1mm"
#define FR_5_MM "5mm"
#define FR_10_MM "10mm"
#define FR_100_MM "100mm"
#define FR_200_MM "200mm"
#define FR_1_PERCENT "1%"
#define FR_5_PERCENT "5%"
#define FR_10_PERCENT "10%"
Expand Down
2 changes: 2 additions & 0 deletions TFT/src/User/API/Language/language_gr.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
#define GR_1_MM "1χιλ"
#define GR_5_MM "5χιλ"
#define GR_10_MM "10χιλ"
#define GR_100_MM "100χιλ"
#define GR_200_MM "200χιλ"
#define GR_1_PERCENT "1%"
#define GR_5_PERCENT "5%"
#define GR_10_PERCENT "10%"
Expand Down
2 changes: 2 additions & 0 deletions TFT/src/User/API/Language/language_hu.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
#define HU_1_MM "1mm"
#define HU_5_MM "5mm"
#define HU_10_MM "10mm"
#define HU_100_MM "100mm"
#define HU_200_MM "200mm"
#define HU_1_PERCENT "1%"
#define HU_5_PERCENT "5%"
#define HU_10_PERCENT "10%"
Expand Down
2 changes: 2 additions & 0 deletions TFT/src/User/API/Language/language_it.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
#define IT_1_MM "1mm"
#define IT_5_MM "5mm"
#define IT_10_MM "10mm"
#define IT_100_MM "100mm"
#define IT_200_MM "200mm"
#define IT_1_PERCENT "1%"
#define IT_5_PERCENT "5%"
#define IT_10_PERCENT "10%"
Expand Down
2 changes: 2 additions & 0 deletions TFT/src/User/API/Language/language_jp.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
#define JP_1_MM "1mm"
#define JP_5_MM "5mm"
#define JP_10_MM "10mm"
#define JP_100_MM "100mm"
#define JP_200_MM "200mm"
#define JP_1_PERCENT "1%"
#define JP_5_PERCENT "5%"
#define JP_10_PERCENT "10%"
Expand Down
2 changes: 2 additions & 0 deletions TFT/src/User/API/Language/language_pl.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
#define PL_1_MM "1mm"
#define PL_5_MM "5mm"
#define PL_10_MM "10mm"
#define PL_100_MM "100mm"
#define PL_200_MM "200mm"
#define PL_1_PERCENT "1%"
#define PL_5_PERCENT "5%"
#define PL_10_PERCENT "10%"
Expand Down
2 changes: 2 additions & 0 deletions TFT/src/User/API/Language/language_pt.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
#define PT_1_MM "1mm"
#define PT_5_MM "5mm"
#define PT_10_MM "10mm"
#define PT_100_MM "100mm"
#define PT_200_MM "200mm"
#define PT_1_PERCENT "1%"
#define PT_5_PERCENT "5%"
#define PT_10_PERCENT "10%"
Expand Down
2 changes: 2 additions & 0 deletions TFT/src/User/API/Language/language_ru.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
#define RU_1_MM "1мм"
#define RU_5_MM "5мм"
#define RU_10_MM "10мм"
#define RU_100_MM "100mm"
#define RU_200_MM "200mm"
#define RU_1_PERCENT "1%"
#define RU_5_PERCENT "5%"
#define RU_10_PERCENT "10%"
Expand Down
2 changes: 2 additions & 0 deletions TFT/src/User/API/Language/language_sk.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
#define SK_1_MM "1mm"
#define SK_5_MM "5mm"
#define SK_10_MM "10mm"
#define SK_100_MM "100mm"
#define SK_200_MM "200mm"
#define SK_1_PERCENT "1%"
#define SK_5_PERCENT "5%"
#define SK_10_PERCENT "10%"
Expand Down
2 changes: 2 additions & 0 deletions TFT/src/User/API/Language/language_sl.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
#define SL_1_MM "1mm"
#define SL_5_MM "5mm"
#define SL_10_MM "10mm"
#define SL_100_MM "100mm"
#define SL_200_MM "200mm"
#define SL_1_PERCENT "1%"
#define SL_5_PERCENT "5%"
#define SL_10_PERCENT "10%"
Expand Down
2 changes: 2 additions & 0 deletions TFT/src/User/API/Language/language_tr.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
#define TR_1_MM "1mm"
#define TR_5_MM "5mm"
#define TR_10_MM "10mm"
#define TR_100_MM "100mm"
#define TR_200_MM "200mm"
#define TR_1_PERCENT "1%"
#define TR_5_PERCENT "5%"
#define TR_10_PERCENT "10%"
Expand Down
3 changes: 3 additions & 0 deletions TFT/src/User/API/icon_list.inc
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ X_ICON (Z_INC)
X_ICON (01_MM)
X_ICON (1_MM)
X_ICON (10_MM)
X_ICON (100_MM)
X_ICON (X_DEC)
X_ICON (Y_DEC)
X_ICON (Z_DEC)
Expand All @@ -52,6 +53,8 @@ X_ICON (FAST_SPEED)
X_ICON (E_1_MM)
X_ICON (E_5_MM)
X_ICON (E_10_MM)
X_ICON (E_100_MM)
X_ICON (E_200_MM)
X_ICON (E_1_PERCENT)
X_ICON (E_5_PERCENT)
X_ICON (E_10_PERCENT)
Expand Down
6 changes: 4 additions & 2 deletions TFT/src/User/Menu/Extrude.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,18 @@ const ITEM itemSpeed[ITEM_SPEED_NUM] = {

static u8 item_speed_i = 1;

#define ITEM_LEN_NUM 3
#define ITEM_LEN_NUM 5

const ITEM itemLen[ITEM_LEN_NUM] = {
// icon label
{ICON_E_1_MM, LABEL_1_MM},
{ICON_E_5_MM, LABEL_5_MM},
{ICON_E_10_MM, LABEL_10_MM},
{ICON_E_100_MM, LABEL_100_MM},
{ICON_E_200_MM, LABEL_200_MM},
};

const u8 item_len[ITEM_LEN_NUM] = {1, 5, 10};
const u8 item_len[ITEM_LEN_NUM] = {1, 5, 10, 100, 200};
static u8 item_len_i = 1;

static float extrudeCoordinate = 0.0f;
Expand Down
22 changes: 12 additions & 10 deletions TFT/src/User/Menu/Move.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

//const GUI_RECT RecXYZ = {START_X + 1*ICON_WIDTH, STATUS_GANTRY_YOFFSET,
// 4*ICON_WIDTH+3*SPACE_X+START_X,ICON_START_Y-STATUS_GANTRY_YOFFSET};
#define X_MOVE_GCODE "G1 X%.1f\n"
#define Y_MOVE_GCODE "G1 Y%.1f\n"
#define Z_MOVE_GCODE "G1 Z%.1f\n"
#define X_MOVE_GCODE "G1 X%.2f\n"
#define Y_MOVE_GCODE "G1 Y%.2f\n"
#define Z_MOVE_GCODE "G1 Z%.2f\n"


//1 title, ITEM_PER_PAGE item
Expand All @@ -19,7 +19,7 @@ LABEL_MOVE,
{ICON_Z_DEC, LABEL_Z_DEC},
{ICON_Y_INC, LABEL_Y_INC},
{ICON_Z_INC, LABEL_Z_INC},
{ICON_1_MM, LABEL_1_MM},
{ICON_01_MM, LABEL_01_MM},
{ICON_X_DEC, LABEL_X_DEC},
{ICON_Y_DEC, LABEL_Y_DEC},
{ICON_X_INC, LABEL_X_INC},
Expand All @@ -28,7 +28,7 @@ LABEL_MOVE,
{ICON_X_INC, LABEL_X_INC},
{ICON_Y_INC, LABEL_Y_INC},
{ICON_Z_INC, LABEL_Z_INC},
{ICON_1_MM, LABEL_1_MM},
{ICON_01_MM, LABEL_01_MM},
{ICON_X_DEC, LABEL_X_DEC},
{ICON_Y_DEC, LABEL_Y_DEC},
{ICON_Z_DEC, LABEL_Z_DEC},
Expand All @@ -39,15 +39,17 @@ LABEL_MOVE,

//const uint32_t item_move_speed[] = {DEFAULT_SPEED_MOVE, SPEED_MOVE_SLOW, SPEED_MOVE_FAST};

#define ITEM_MOVE_LEN_NUM 3
#define ITEM_MOVE_LEN_NUM 5
const ITEM itemMoveLen[ITEM_MOVE_LEN_NUM] = {
// icon label
{ICON_001_MM, LABEL_001_MM},
{ICON_01_MM, LABEL_01_MM},
{ICON_1_MM, LABEL_1_MM},
{ICON_10_MM, LABEL_10_MM},
{ICON_100_MM, LABEL_100_MM},
};

const float item_move_len[ITEM_MOVE_LEN_NUM] = {0.1f, 1, 10};
const float item_move_len[ITEM_MOVE_LEN_NUM] = {0.01f, 0.1f, 1, 10, 100};
static u8 item_move_len_i = 1;

static u32 nextTime = 0;
Expand Down Expand Up @@ -188,15 +190,15 @@ void drawXYZ(void){
char tempstr[100];
//GUI_SetColor(GANTRYLBL_BKCOLOR);
//GUI_FillPrect(&RecXYZ);
my_sprintf(tempstr, "X:%.1f ", getAxisLocation(0));
my_sprintf(tempstr, "X:%.2f ", getAxisLocation(0));
if (nowAxis == X_AXIS) GUI_SetColor(INFOBOX_ICON_COLOR);
GUI_DispString(START_X+1*SPACE_X+1*ICON_WIDTH,(ICON_START_Y-BYTE_HEIGHT)/2,(u8 *)tempstr);
GUI_SetColor(infoSettings.font_color);
my_sprintf(tempstr, "Y:%.1f ", getAxisLocation(1));
my_sprintf(tempstr, "Y:%.2f ", getAxisLocation(1));
if (nowAxis == Y_AXIS) GUI_SetColor(INFOBOX_ICON_COLOR);
GUI_DispString(START_X+2*SPACE_X+2*ICON_WIDTH,(ICON_START_Y-BYTE_HEIGHT)/2,(u8 *)tempstr);
GUI_SetColor(infoSettings.font_color);
my_sprintf(tempstr, "Z:%.1f ", getAxisLocation(2));
my_sprintf(tempstr, "Z:%.2f ", getAxisLocation(2));
if (nowAxis == Z_AXIS) GUI_SetColor(INFOBOX_ICON_COLOR);
GUI_DispString(START_X+3*SPACE_X+3*ICON_WIDTH,(ICON_START_Y-BYTE_HEIGHT)/2,(u8 *)tempstr);

Expand Down

0 comments on commit e9ec127

Please sign in to comment.