mirror of
https://github.com/makerbase-mks/MKS-TFT35-Firmware.git
synced 2026-02-19 17:51:29 +01:00
fixes for gcc
This commit is contained in:
Victor Mateus Oliveira
@@ -1,12 +1,17 @@
|
||||
#ifndef _TYPE_DEFINE_H_
|
||||
#define _TYPE_DEFINE_H_
|
||||
|
||||
#if __GNUC__
|
||||
#include <stdint.h>
|
||||
#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
|
||||
|
||||
@@ -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רҵ<EFBFBD><EFBFBD>̳, ѧϰ<D1A7><CFB0><EFBFBD><EFBFBD>UCGUI
|
||||
*
|
||||
* ucgui@163.com 2005.07.31
|
||||
* 作者: ucgui
|
||||
* <EFBFBD><EFBFBD><EFBFBD><EFBFBD>: ucgui
|
||||
*********************************************************************************************************
|
||||
*/
|
||||
//字体:Terminal 15号粗体
|
||||
/*0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ板绑备标厂出打底调动定度法繁返复关恢回挤加简减进冷料目喷却热日少设体头退未温文言移印于语预在增整正增整正置中准零上下一页风扇开速少单双普通三角洲默认最新暂停止床操作变确常快出时间件系统触屏校正主板本地盘总量载入选择机型连接闭高慢无请点击心点完成全半闭检查取消找不到卡插重试线网络密码端口更多状态已归换自第二四五平断续电+-_>''!~:;\/%., ?*/
|
||||
//<EFBFBD><EFBFBD><EFBFBD><EFBFBD>:Terminal 15<EFBFBD>Ŵ<EFBFBD><EFBFBD><EFBFBD>
|
||||
/*0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<EFBFBD><EFBFBD>곧<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȷ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ػֻؼ<EFBFBD><EFBFBD>Ӽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ŀ<EFBFBD><EFBFBD>ȴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͷ<EFBFBD><EFBFBD>δ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ԥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һҳ<EFBFBD><EFBFBD><EFBFBD>ȿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ٵ<EFBFBD>˫<EFBFBD><EFBFBD>ͨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֹͣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȷ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD><EFBFBD>ϵͳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>У<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>屾<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӱո<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȫ<EFBFBD><EFBFBD>ռ<EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD><EFBFBD>Ҳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˿ڸ<EFBFBD><EFBFBD><EFBFBD>״̬<EFBFBD>ѹ黻<EFBFBD>Եڶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>+-_>''!~:;\/%., ?*/
|
||||
#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
|
||||
|
||||
@@ -21,10 +21,10 @@ typedef struct
|
||||
|
||||
volatile int32_t background_color; //背景颜色
|
||||
volatile int32_t title_color; //标题颜色
|
||||
volatile int32_t state_background_color; //鐘舵€佹樉绀鸿儗鏅<EFBFBD><EFBFBD>鑹?
|
||||
volatile int32_t state_text_color; //鐘舵€佹樉绀烘枃瀛楅<EFBFBD>鑹查<EFBFBD>鑹?
|
||||
volatile int32_t filename_color; //鏂囦欢鍚嶆枃瀛楅<EFBFBD>鑹?
|
||||
volatile int32_t filename_background_color; //鏂囦欢鍚嶈儗鏅<EFBFBD><EFBFBD>鑹?
|
||||
volatile int32_t state_background_color; //状态显示背景颜<EFBFBD>?
|
||||
volatile int32_t state_text_color; //状态显示文字颜色颜<EFBFBD>?
|
||||
volatile int32_t filename_color; //文件名文字颜<EFBFBD>?
|
||||
volatile int32_t filename_background_color; //文件名背景颜<EFBFBD>?
|
||||
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<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͷ<EFBFBD>¶<EFBFBD>
|
||||
volatile float curBedTemp; //<EFBFBD>ȴ<EFBFBD><EFBFBD>¶<EFBFBD>
|
||||
volatile float desireSprayerTemp[2];// 2<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͷĿ<EFBFBD><EFBFBD><EFBFBD>¶<EFBFBD>
|
||||
volatile float desireBedTemp;// <EFBFBD>ȴ<EFBFBD>Ŀ<EFBFBD><EFBFBD><EFBFBD>¶<EFBFBD>
|
||||
volatile float desireSprayerTempBak_1[2];
|
||||
|
||||
volatile float preheat_desireSprayerTemp[2];// 2个喷头目标温度
|
||||
volatile float preheat_desireBedTemp;// 热床目标温度
|
||||
volatile float preheat_desireSprayerTemp[2];// 2<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͷĿ<EFBFBD><EFBFBD><EFBFBD>¶<EFBFBD>
|
||||
volatile float preheat_desireBedTemp;// <EFBFBD>ȴ<EFBFBD>Ŀ<EFBFBD><EFBFBD><EFBFBD>¶<EFBFBD>
|
||||
|
||||
|
||||
volatile int8_t curSprayerChoose; //当前选择的喷头
|
||||
volatile int8_t curSprayerChoose; //<EFBFBD><EFBFBD>ǰѡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͷ
|
||||
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; //<EFBFBD><EFBFBD>ͷ1<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͷ2<EFBFBD><EFBFBD><EFBFBD>ȴ<EFBFBD>
|
||||
volatile int8_t stepHeat; //?<EFBFBD>訨<EFBFBD><EFBFBD>2???
|
||||
volatile int8_t fanOnoff; //<EFBFBD><EFBFBD><EFBFBD>ȿ<EFBFBD><EFBFBD><EFBFBD>
|
||||
volatile uint8_t fanSpeed; //<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ٶ<EFBFBD>
|
||||
volatile int8_t sprayerNum; // <EFBFBD><EFBFBD>ͷ<EFBFBD><EFBFBD>
|
||||
volatile int8_t machineType; //<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
volatile uint16_t printSpeed; //<EFBFBD><EFBFBD>ӡ<EFBFBD>ٶ<EFBFBD>
|
||||
volatile uint16_t printExtSpeed0; //<EFBFBD><EFBFBD>ӡ<EFBFBD>ڼ伷<EFBFBD><EFBFBD><EFBFBD>ٶ<EFBFBD>
|
||||
volatile uint16_t printExtSpeed1; //<EFBFBD><EFBFBD>ӡ<EFBFBD>ڼ伷<EFBFBD><EFBFBD><EFBFBD>ٶ<EFBFBD>
|
||||
volatile uint8_t stepPrintSpeed; //<EFBFBD><EFBFBD>ӡ<EFBFBD>ٶȵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
volatile int8_t extruStep; //?<EFBFBD><EFBFBD>3??<EFBFBD><EFBFBD>?<3F><>
|
||||
volatile int8_t extruSpeed; //<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ٶ<EFBFBD>
|
||||
volatile int16_t moveSpeed; //<EFBFBD>ƶ<EFBFBD><EFBFBD>ٶ<EFBFBD>
|
||||
volatile float move_dist; //<EFBFBD>ƶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
volatile int8_t language; //<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
volatile int8_t baud; //<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
|
||||
volatile int8_t fileSysType; //文件系统类型
|
||||
volatile uint8_t touch_adj_flag; //触摸屏校正标志位
|
||||
volatile int8_t fileSysType; //<EFBFBD>ļ<EFBFBD>ϵͳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
volatile uint8_t touch_adj_flag; //<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>У<EFBFBD><EFBFBD><EFBFBD><EFBFBD>־λ
|
||||
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;//<EFBFBD>ⲿ<EFBFBD>ֿ⡣
|
||||
|
||||
volatile uint8_t print_finish_close_machine_flg;
|
||||
|
||||
//volatile uint32_t filamentchange_speed;//换料速度
|
||||
//volatile uint8_t filamentchange_step;//换料步进
|
||||
//volatile uint32_t filamentchange_speed;//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ٶ<EFBFBD>
|
||||
//volatile uint8_t filamentchange_step;//<EFBFBD><EFBFBD><EFBFBD>ϲ<EFBFBD><EFBFBD><EFBFBD>
|
||||
//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;//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ٶ<EFBFBD>
|
||||
volatile uint16_t filament_load_length;//<EFBFBD><EFBFBD><EFBFBD>ϲ<EFBFBD><EFBFBD><EFBFBD>
|
||||
//uint16_t filament_load_limit_temper;//<EFBFBD><EFBFBD><EFBFBD>ϵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¶<EFBFBD>ֵ
|
||||
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;//<EFBFBD><EFBFBD>ƽģʽ0:<3A>ֶ<EFBFBD><D6B6><EFBFBD>ƽ<EFBFBD><C6BD>1:<3A>Զ<EFBFBD><D4B6><EFBFBD>ƽ
|
||||
volatile uint8_t leveling_point_number;//<EFBFBD>ֶ<EFBFBD><EFBFBD><EFBFBD>ƽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(<28><><EFBFBD><EFBFBD>3/4/5<><35><EFBFBD><EFBFBD>ֵ)
|
||||
|
||||
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;//<EFBFBD>ϵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƽ<EFBFBD><EFBFBD>־<EFBFBD><EFBFBD>1:<3A>˿<EFBFBD>Ĭ<EFBFBD><C4AC>Ϊ<EFBFBD>ߵ<EFBFBD>ƽ<EFBFBD><C6BD>0:<3A>˿<EFBFBD>Ĭ<EFBFBD><C4AC>Ϊ<EFBFBD>͵<EFBFBD>ƽ
|
||||
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;//Ԥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ٶ<EFBFBD>
|
||||
//volatile uint8_t wifi_mode_sel;//wifiģʽѡ<EFBFBD><EFBFBD>
|
||||
volatile uint8_t custom_bed_flag;//<EFBFBD>ȴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
volatile uint8_t firmware_type;//<EFBFBD><EFBFBD><EFBFBD><EFBFBD>̼<EFBFBD><EFBFBD><EFBFBD><EFBFBD>͡<EFBFBD>1:marlin;2:repetier;3:smoothie
|
||||
volatile uint16_t preheat_max_desireSprayerTemp;//<EFBFBD><EFBFBD>ͷ<EFBFBD><EFBFBD><EFBFBD>Ŀ<EFBFBD><EFBFBD><EFBFBD>¶<EFBFBD>
|
||||
volatile uint16_t preheat_max_desireBedTemp;//<EFBFBD>ȴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ŀ<EFBFBD><EFBFBD><EFBFBD>¶<EFBFBD>
|
||||
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<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֵ
|
||||
volatile unsigned char move_z_coordinate[20];
|
||||
|
||||
volatile uint8_t insert_det_module;// 1:接入220det模块，其他值:接PWC关机模块。PWC可以替代220det模块。
|
||||
volatile uint8_t insert_det_module;// 1:<EFBFBD><EFBFBD><EFBFBD><EFBFBD>220detģ<EFBFBD>飬<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֵ:<3A><>PWC<57>ػ<EFBFBD>ģ<EFBFBD>顣PWC<57><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>220detģ<EFBFBD>顣
|
||||
|
||||
volatile uint8_t filament_det1_level_flg;// 断料检测1；1:高电平触发，0低电平触发。
|
||||
volatile uint8_t filament_det2_level_flg;// 断料检测2；1:高电平触发，0低电平触发
|
||||
volatile uint8_t filament_det1_level_flg;// <EFBFBD><EFBFBD><EFBFBD>ϼ<EFBFBD><EFBFBD>1<EFBFBD><EFBFBD>1:<3A>ߵ<EFBFBD>ƽ<EFBFBD><C6BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD>͵<EFBFBD>ƽ<EFBFBD><C6BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
volatile uint8_t filament_det2_level_flg;// <EFBFBD><EFBFBD><EFBFBD>ϼ<EFBFBD><EFBFBD>2<EFBFBD><EFBFBD>1:<3A>ߵ<EFBFBD>ƽ<EFBFBD><C6BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD>͵<EFBFBD>ƽ<EFBFBD><C6BD><EFBFBD><EFBFBD>
|
||||
volatile uint8_t multiple_language;
|
||||
volatile uint8_t overturn_180; //屏幕翻转180°
|
||||
volatile uint8_t overturn_180; //<EFBFBD><EFBFBD>Ļ<EFBFBD><EFBFBD>ת180<EFBFBD><EFBFBD>
|
||||
volatile uint8_t user_rotation;
|
||||
volatile char wifi_ap[32]; //wifi网络名称字符串
|
||||
volatile char wifi_key[64]; //wifi密码字符串
|
||||
volatile char wifi_ap[32]; //wifi<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD>
|
||||
volatile char wifi_key[64]; //wifi<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD>
|
||||
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]; //<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӵ<EFBFBD>ַ
|
||||
volatile int cloud_port; //<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӷ˿<EFBFBD>
|
||||
|
||||
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;//<EFBFBD><EFBFBD>ť<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƫ<EFBFBD>Ƶױ<EFBFBD>λ<EFBFBD><EFBFBD>
|
||||
|
||||
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<EFBFBD>Ƿ<EFBFBD><EFBFBD>У<EFBFBD><EFBFBD><EFBFBD>־λ
|
||||
volatile uint8_t display_error; //<EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD><EFBFBD>־λ
|
||||
volatile uint8_t restart_data_init; //resend 5<EFBFBD>κ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>³<EFBFBD>ʼ<EFBFBD><EFBFBD>SD<EFBFBD><EFBFBD><EFBFBD><EFBFBD>־λ
|
||||
volatile uint8_t has_flash_pre_view;//<EFBFBD><EFBFBD>ͼƬԤ<EFBFBD><EFBFBD>
|
||||
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á?è?±à3ìí¨1y￡??aê?ARDUINOμ?°?±?o?
|
||||
#define ARDUINO 101//?a<EFBFBD><EFBFBD>?<3F><>?<3F><><EFBFBD><EFBFBD>3<EFBFBD><33><EFBFBD><EFBFBD><EFBFBD><EFBFBD>1y<31><79>??a<EFBFBD><EFBFBD>?ARDUINO<EFBFBD><EFBFBD>?<3F><>?<3F><>?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 <EFBFBD><EFBFBD><EFBFBD>ݳ<EFBFBD><EFBFBD><EFBFBD>
|
||||
|
||||
#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 // <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־(uint8_t) | <EFBFBD><EFBFBD>ͷѡ<EFBFBD><EFBFBD>(<28><>4λ) <20><><EFBFBD>ȿ<EFBFBD><C8BF><EFBFBD>״̬(<28><><EFBFBD><EFBFBD>λ)|<7C><><EFBFBD><EFBFBD>8λ| <20>ȴ<EFBFBD><C8B4>¶<EFBFBD>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的方式，
|
||||
//重新定义了断电数据的存储位置
|
||||
//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>дe2prom<EFBFBD>ķ<EFBFBD>ʽ<EFBFBD><EFBFBD>
|
||||
//<EFBFBD><EFBFBD><EFBFBD>¶<EFBFBD><EFBFBD><EFBFBD><EFBFBD>˶ϵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݵĴ洢λ<EFBFBD><EFBFBD>
|
||||
#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 // <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־(uint8_t) | <EFBFBD><EFBFBD>ͷѡ<EFBFBD><EFBFBD>(<28><>4λ) <20><><EFBFBD>ȿ<EFBFBD><C8BF><EFBFBD>״̬(<28><><EFBFBD><EFBFBD>λ)|<7C><><EFBFBD><EFBFBD>8λ| <20>ȴ<EFBFBD><C8B4>¶<EFBFBD>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
|
||||
|
||||
Reference in New Issue
Block a user