From b270d9e131dfe934555ff7cf7f7332e94ece17c2 Mon Sep 17 00:00:00 2001 From: Victor Mateus Oliveira Date: Mon, 22 Feb 2021 00:50:07 -0300 Subject: [PATCH] fixes for gcc --- Inc/type_define.h | 7 ++- User/others/fontLib.h | 25 ++++---- User/others/mks_cfg.h | 130 +++++++++++++++++++++--------------------- 3 files changed, 86 insertions(+), 76 deletions(-) diff --git a/Inc/type_define.h b/Inc/type_define.h index a49fb53..043e596 100644 --- a/Inc/type_define.h +++ b/Inc/type_define.h @@ -1,12 +1,17 @@ #ifndef _TYPE_DEFINE_H_ #define _TYPE_DEFINE_H_ +#if __GNUC__ + #include +#endif + typedef unsigned int speed_t; typedef unsigned long ticks_t; typedef unsigned long millis_t; typedef int flag8_t; +#ifndef __GNUC__ typedef unsigned char uint8_t; typedef unsigned short uint16_t; typedef unsigned int uint32_t; @@ -14,6 +19,6 @@ typedef unsigned int uint32_t; typedef signed char int8_t; typedef signed short int16_t; typedef signed int int32_t; - +#endif #endif diff --git a/User/others/fontLib.h b/User/others/fontLib.h index 68fc4a2..fa3b42a 100644 --- a/User/others/fontLib.h +++ b/User/others/fontLib.h @@ -1,26 +1,31 @@ -/* SimSun_27.c - SimSun_27 font for UCGUI font driver */ +/* SimSun_27.c - SimSun_27 font for UCGUI font driver */ /******************************************************************************************************** * UCGUI * http://www.ucgui.com * -* (c) Copyright 2005-2006, UCGUIרҵ̳, ѧϰUCGUI +* (c) Copyright 2005-2006, UCGUIרҵ��̳, ѧϰ����UCGUI * * ucgui@163.com 2005.07.31 -* : ucgui +* ����: ucgui ********************************************************************************************************* */ -//:Terminal 15Ŵ -/*0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ󱸱곧׵ȷػֻؼӼĿȴͷδӡԤ׼һҳȿٵ˫ͨĬֹͣȷʱϵͳУ屾ѡӱոĵȫռȡҲ˿ڸ״̬ѹ黻Եڶƽ+-_>''!~:;\/%., ?*/ +//����:Terminal 15�Ŵ��� +/*0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ��󱸱곧����׵������ȷ��������ػֻؼ��Ӽ��������Ŀ��ȴ����������ͷ��δ��������ӡ����Ԥ������������������׼������һҳ���ȿ����ٵ�˫��ͨ������Ĭ��������ֹͣ��������ȷ�����ʱ���ϵͳ����У�����屾������������ѡ��������ӱո����������ĵ����ȫ��ռ��ȡ���Ҳ���������������������˿ڸ���״̬�ѹ黻�Եڶ�����ƽ������+-_>''!~:;\/%., ?*/ #ifndef _FONT_LIB_H_ #define _FONT_LIB_H_ -#include "gui.h" -#ifndef GUI_FLASH - #define GUI_FLASH -#endif +#include "GUI.h" +#ifndef GUI_FLASH + #define GUI_FLASH +#endif +#if defined(__cplusplus) +extern "C" { /* Make sure we have C-declarations in C++ programs */ +#endif extern GUI_FLASH const GUI_FONT GUI_FontHZ_fontHz14; extern GUI_FLASH const GUI_FONT GUI_FontHZ_fontHz16; extern GUI_FLASH const GUI_FONT GUI_FontHZ_fontHz18; - +#if defined(__cplusplus) +} +#endif #endif diff --git a/User/others/mks_cfg.h b/User/others/mks_cfg.h index 0bb5da1..89d8716 100644 --- a/User/others/mks_cfg.h +++ b/User/others/mks_cfg.h @@ -21,10 +21,10 @@ typedef struct volatile int32_t background_color; //背景颜色 volatile int32_t title_color; //标题颜色 - volatile int32_t state_background_color; //状态显示背景颜? - volatile int32_t state_text_color; //状态显示文字颜色颜? - volatile int32_t filename_color; //文件名文字颜? - volatile int32_t filename_background_color; //文件名背景颜? + volatile int32_t state_background_color; //状态显示背景颜�? + volatile int32_t state_text_color; //状态显示文字颜色颜�? + volatile int32_t filename_color; //文件名文字颜�? + volatile int32_t filename_background_color; //文件名背景颜�? volatile int32_t printingstate_word_background_color; volatile int32_t printingstate_word_color; volatile int32_t btn_color; @@ -47,37 +47,37 @@ typedef struct volatile int32_t printfile_textcolor; volatile int8_t custom_pic_flag; volatile float curPos[3]; - volatile float curSprayerTemp[2]; // 2ͷ¶ - volatile float curBedTemp; //ȴ¶ - volatile float desireSprayerTemp[2];// 2ͷĿ¶ - volatile float desireBedTemp;// ȴĿ¶ + volatile float curSprayerTemp[2]; // 2����ͷ�¶� + volatile float curBedTemp; //�ȴ��¶� + volatile float desireSprayerTemp[2];// 2����ͷĿ���¶� + volatile float desireBedTemp;// �ȴ�Ŀ���¶� volatile float desireSprayerTempBak_1[2]; - volatile float preheat_desireSprayerTemp[2];// 2ͷĿ¶ - volatile float preheat_desireBedTemp;// ȴĿ¶ + volatile float preheat_desireSprayerTemp[2];// 2����ͷĿ���¶� + volatile float preheat_desireBedTemp;// �ȴ�Ŀ���¶� - volatile int8_t curSprayerChoose; //ǰѡͷ + volatile int8_t curSprayerChoose; //��ǰѡ�����ͷ volatile int8_t curSprayerChoose_bak; - volatile int8_t curTempType; //ͷ1ͷ2ȴ - volatile int8_t stepHeat; //?訨2??? - volatile int8_t fanOnoff; //ȿ - volatile uint8_t fanSpeed; //ٶ - volatile int8_t sprayerNum; // ͷ - volatile int8_t machineType; // - volatile uint16_t printSpeed; //ӡٶ - volatile uint16_t printExtSpeed0; //ӡڼ伷ٶ - volatile uint16_t printExtSpeed1; //ӡڼ伷ٶ - volatile uint8_t stepPrintSpeed; //ӡٶȵ - volatile int8_t extruStep; //?3??? - volatile int8_t extruSpeed; //ٶ - volatile int16_t moveSpeed; //ƶٶ - volatile float move_dist; //ƶ - volatile int8_t language; // - volatile int8_t baud; // + volatile int8_t curTempType; //��ͷ1����ͷ2���ȴ� + volatile int8_t stepHeat; //?�訨��2??? + volatile int8_t fanOnoff; //���ȿ��� + volatile uint8_t fanSpeed; //�����ٶ� + volatile int8_t sprayerNum; // ��ͷ�� + volatile int8_t machineType; //���� + volatile uint16_t printSpeed; //��ӡ�ٶ� + volatile uint16_t printExtSpeed0; //��ӡ�ڼ伷���ٶ� + volatile uint16_t printExtSpeed1; //��ӡ�ڼ伷���ٶ� + volatile uint8_t stepPrintSpeed; //��ӡ�ٶȵ������� + volatile int8_t extruStep; //?��3??��?�� + volatile int8_t extruSpeed; //�����ٶ� + volatile int16_t moveSpeed; //�ƶ��ٶ� + volatile float move_dist; //�ƶ����� + volatile int8_t language; //���� + volatile int8_t baud; //������ - volatile int8_t fileSysType; //ļϵͳ - volatile uint8_t touch_adj_flag; //У־λ + volatile int8_t fileSysType; //�ļ�ϵͳ���� + volatile uint8_t touch_adj_flag; //������У����־λ volatile int32_t touch_adj_xMin; volatile int32_t touch_adj_xMax; volatile int32_t touch_adj_yMin; @@ -96,27 +96,27 @@ typedef struct volatile uint8_t func_btn2_display_flag; volatile uint8_t func_btn3_display_flag; - volatile uint8_t extern_chinese_flg;//ⲿֿ⡣ + volatile uint8_t extern_chinese_flg;//�ⲿ�ֿ⡣ volatile uint8_t print_finish_close_machine_flg; - //volatile uint32_t filamentchange_speed;//ٶ - //volatile uint8_t filamentchange_step;//ϲ + //volatile uint32_t filamentchange_speed;//�����ٶ� + //volatile uint8_t filamentchange_step;//���ϲ��� //volatile uint32_t filament_limit_temper; volatile uint8_t morefunc_cnt; - volatile uint16_t filament_load_speed;//ٶ - volatile uint16_t filament_load_length;//ϲ - //uint16_t filament_load_limit_temper;//ϵ¶ֵ + volatile uint16_t filament_load_speed;//�����ٶ� + volatile uint16_t filament_load_length;//���ϲ��� + //uint16_t filament_load_limit_temper;//���ϵ�����¶�ֵ volatile uint16_t filament_loading_time; volatile uint16_t filament_unload_speed; volatile uint16_t filament_unload_length; volatile uint16_t filament_limit_temper; volatile uint16_t filament_unloading_time; - volatile uint8_t leveling_mode;//ƽģʽ0:ֶƽ1:Զƽ - volatile uint8_t leveling_point_number;//ֶƽ(3/4/5ֵ) + volatile uint8_t leveling_mode;//��ƽģʽ0:�ֶ���ƽ��1:�Զ���ƽ + volatile uint8_t leveling_point_number;//�ֶ���ƽ����������(����3/4/5����ֵ) volatile int32_t leveling_point1_x; volatile int32_t leveling_point1_y; @@ -140,20 +140,20 @@ typedef struct volatile int16_t leveling_z_high; /******************************************add***************/ volatile uint8_t rePrintFlag; - volatile uint8_t pwrdn_mtrdn_level_flg;//ϵ߼ƽ־1:˿ĬΪߵƽ0:˿ĬΪ͵ƽ + volatile uint8_t pwrdn_mtrdn_level_flg;//�ϵ�����߼���ƽ��־��1:�˿�Ĭ��Ϊ�ߵ�ƽ��0:�˿�Ĭ��Ϊ�͵�ƽ volatile int16_t Pause_ZADD; volatile int16_t Pause_XPOS; volatile int16_t Pause_YPOS; - volatile uint8_t pre_fanSpeed;//Ԥٶ - //volatile uint8_t wifi_mode_sel;//wifiģʽѡ - volatile uint8_t custom_bed_flag;//ȴ - volatile uint8_t firmware_type;//̼͡1:marlin;2:repetier;3:smoothie - volatile uint16_t preheat_max_desireSprayerTemp;//ͷĿ¶ - volatile uint16_t preheat_max_desireBedTemp;//ȴĿ¶ + volatile uint8_t pre_fanSpeed;//Ԥ�����ٶ� + //volatile uint8_t wifi_mode_sel;//wifiģʽѡ�� + volatile uint8_t custom_bed_flag;//�ȴ����� + volatile uint8_t firmware_type;//����̼����͡�1:marlin;2:repetier;3:smoothie + volatile uint16_t preheat_max_desireSprayerTemp;//��ͷ���Ŀ���¶� + volatile uint16_t preheat_max_desireBedTemp;//�ȴ����Ŀ���¶� volatile float curSprayerTempBak[2]; volatile float desireSprayerTempBak[2]; volatile float curBedTempBak; - volatile volatile float desireBedTempBak; + volatile float desireBedTempBak; volatile uint8_t pwd_reprint_flg; volatile float breakpoint_z_error; @@ -167,24 +167,24 @@ typedef struct volatile unsigned char sd_saving; volatile uint8_t getzpos_flg; volatile uint8_t getzpos_enable; - volatile float zpos;//zֵ + volatile float zpos;//z������ֵ volatile unsigned char move_z_coordinate[20]; - volatile uint8_t insert_det_module;// 1:220detģ飬ֵ:PWCػģ顣PWC220detģ顣 + volatile uint8_t insert_det_module;// 1:����220detģ�飬����ֵ:��PWC�ػ�ģ�顣PWC�������220detģ�顣 - volatile uint8_t filament_det1_level_flg;// ϼ11:ߵƽ0͵ƽ - volatile uint8_t filament_det2_level_flg;// ϼ21:ߵƽ0͵ƽ + volatile uint8_t filament_det1_level_flg;// ���ϼ��1��1:�ߵ�ƽ������0�͵�ƽ������ + volatile uint8_t filament_det2_level_flg;// ���ϼ��2��1:�ߵ�ƽ������0�͵�ƽ���� volatile uint8_t multiple_language; - volatile uint8_t overturn_180; //Ļת180 + volatile uint8_t overturn_180; //��Ļ��ת180�� volatile uint8_t user_rotation; - volatile char wifi_ap[32]; //wifiַ - volatile char wifi_key[64]; //wifiַ + volatile char wifi_ap[32]; //wifi���������ַ��� + volatile char wifi_key[64]; //wifi�����ַ��� volatile uint8_t wifi_mode_sel; uint8_t wifi_type; // HLK: 0x01 , ESP: 0X02 volatile char cloud_enable; - volatile char cloud_hostUrl[96]; //ӵַ - volatile int cloud_port; //Ӷ˿ + volatile char cloud_hostUrl[96]; //�����ӵ�ַ + volatile int cloud_port; //�����Ӷ˿� volatile float Zoffset; volatile float stepZoffset; @@ -193,12 +193,12 @@ typedef struct volatile uint8_t display_style; volatile uint8_t mask_PB0_PB1_Function; - volatile uint8_t btn_text_offset;//ťƫƵױλ + volatile uint8_t btn_text_offset;//��ť����ƫ�Ƶױ�λ�� - volatile uint8_t add_checkSum; //M110ǷУ־λ - volatile uint8_t display_error; //ʾϢ־λ - volatile uint8_t restart_data_init; //resend 5κ³ʼSD־λ - volatile uint8_t has_flash_pre_view;//ͼƬԤ + volatile uint8_t add_checkSum; //M110�Ƿ��У���־λ + volatile uint8_t display_error; //��ʾ������Ϣ��־λ + volatile uint8_t restart_data_init; //resend 5�κ����³�ʼ��SD����־λ + volatile uint8_t has_flash_pre_view;//��ͼƬԤ�� volatile uint8_t baby_step_display_flg; volatile uint8_t calibrate_disp_flag; volatile uint8_t wifi_scan; @@ -627,7 +627,7 @@ void recover_cfg_inf_tft(); #define SPEAKER PAout(2) #define RESET_1963 PDout(6) #define PULLUP(IO,v) //{pinMode(IO, (v!=LOW ? INPUT_PULLUP : INPUT)); } -#define ARDUINO 101//?a??31y??a?ARDUINO???o? +#define ARDUINO 101//?a��?��?����3������1y��??a��?ARDUINO��?��?��?o? // HC-chen 2017.7.26 #if 0 @@ -720,13 +720,13 @@ void bakup_file_path(uint8_t *path, uint32_t len); #define PUTDOWN_TIME 50 //#define OFFSETLENGTH 0x100000 //1M -#define OFFSETLENGTH 0x19000 //100K ݳ +#define OFFSETLENGTH 0x19000 //100K ���ݳ��� #define COORDINATELENGTH 20 #if 0 #define EEPROM_HIGH_ADDR 256 -#define BAK_REPRINT_INFO EEPROM_HIGH_ADDR - 4 // ־(uint8_t) | ͷѡ(4λ) ȿ״̬(λ)|8λ| ȴ¶8λ +#define BAK_REPRINT_INFO EEPROM_HIGH_ADDR - 4 // �����־(uint8_t) | ��ͷѡ��(��4λ) ���ȿ���״̬(����λ)|����8λ| �ȴ��¶�8λ #define BAK_REPRINT_OFFSET BAK_REPRINT_INFO - 4 // offset(uint32_t) #define BAK_REPRINT_HTEMP BAK_REPRINT_OFFSET - 4 // T0Temp(uint16_t) | T1Temp(uint16_t) #define BAK_REPRINT_FAN BAK_REPRINT_HTEMP - 4 // BedTemp(uint8_t) | fanOnoff(uint8_t) |fanSpeed(uint8_t)| null(uint8_t) @@ -737,13 +737,13 @@ void bakup_file_path(uint8_t *path, uint32_t len); #define BAK_REPRINT_S BAK_REPRINT_Z - 4 //null(uint24_t) | saveFlag(uint8_t) #endif #endif -//дe2promķʽ -//¶˶ϵݵĴ洢λ +//��������дe2prom�ķ�ʽ�� +//���¶����˶ϵ����ݵĴ洢λ�� #define EEPROM_HIGH_ADDR 256 #define BAK_REPRINT_TIME EEPROM_HIGH_ADDR - 4 //hours(int16_t) | minutes(int8_t) ; #define BAK_REPRINT_HTEMP BAK_REPRINT_TIME - 4 // T0Temp(uint16_t) | T1Temp(uint16_t) #define BAK_REPRINT_OFFSET BAK_REPRINT_HTEMP - 4 // offset(uint32_t) -#define BAK_REPRINT_INFO BAK_REPRINT_OFFSET - 4 // ־(uint8_t) | ͷѡ(4λ) ȿ״̬(λ)|8λ| ȴ¶8λ +#define BAK_REPRINT_INFO BAK_REPRINT_OFFSET - 4 // �����־(uint8_t) | ��ͷѡ��(��4λ) ���ȿ���״̬(����λ)|����8λ| �ȴ��¶�8λ #define BAK_REPRINT_X BAK_REPRINT_INFO - 4 // X position #define BAK_REPRINT_Y BAK_REPRINT_X - 4 //Y position #define BAK_REPRINT_Z BAK_REPRINT_Y - 4 //Z position