CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove extraneous 'extern' hints (#21516)

Browse Source
This commit is contained in:
Scott Lahteine 2021-04-02 14:22:43 -05:00 committed by GitHub
parent 9d0b6c5730
commit c2b72c0e73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
61 changed files with 215 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/feature/fanmux.h
View File

@ -25,5 +25,5 @@
* feature/fanmux.h - Cooling Fan Multiplexer support functions
*/
extern void fanmux_switch(const uint8_t e);
extern void fanmux_init();
void fanmux_switch(const uint8_t e);
void fanmux_init();

4
Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h
View File

@ -117,7 +117,7 @@ extern DGUSDisplay dgusdisplay;
constexpr float cpow(const float x, const int y) { return y == 0 ? 1.0 : x * cpow(x, y - 1); }
/// Find the flash address of a DGUS_VP_Variable for the VP.
extern const DGUS_VP_Variable* DGUSLCD_FindVPVar(const uint16_t vp);
const DGUS_VP_Variable* DGUSLCD_FindVPVar(const uint16_t vp);
/// Helper to populate a DGUS_VP_Variable for a given VP. Return false if not found.
extern bool populate_VPVar(const uint16_t VP, DGUS_VP_Variable * const ramcopy);
bool populate_VPVar(const uint16_t VP, DGUS_VP_Variable * const ramcopy);

4
Marlin/src/lcd/extui/lib/mks_ui/draw_about.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_about();
extern void lv_clear_about();
void lv_draw_about();
void lv_clear_about();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_acceleration_settings.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_acceleration_settings();
extern void lv_clear_acceleration_settings();
void lv_draw_acceleration_settings();
void lv_clear_acceleration_settings();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_advance_settings.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_advance_settings();
extern void lv_clear_advance_settings();
void lv_draw_advance_settings();
void lv_clear_advance_settings();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_auto_level_offset_settings.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_auto_level_offset_settings();
extern void lv_clear_auto_level_offset_settings();
void lv_draw_auto_level_offset_settings();
void lv_clear_auto_level_offset_settings();
#ifdef __cplusplus
} /* C-declarations for C++ */

8
Marlin/src/lcd/extui/lib/mks_ui/draw_baby_stepping.h
View File

@ -25,10 +25,10 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_baby_stepping();
extern void lv_clear_baby_stepping();
extern void disp_baby_step_dist();
extern void disp_z_offset_value();
void lv_draw_baby_stepping();
void lv_clear_baby_stepping();
void disp_baby_step_dist();
void disp_z_offset_value();
#ifdef __cplusplus
} /* C-declarations for C++ */

10
Marlin/src/lcd/extui/lib/mks_ui/draw_change_speed.h
View File

@ -28,11 +28,11 @@
#define MIN_EXT_SPEED_PERCENT 10
#define MAX_EXT_SPEED_PERCENT 999
extern void lv_draw_change_speed();
extern void lv_clear_change_speed();
extern void disp_speed_step();
extern void disp_print_speed();
extern void disp_speed_type();
void lv_draw_change_speed();
void lv_clear_change_speed();
void disp_speed_step();
void disp_print_speed();
void disp_speed_type();
#ifdef __cplusplus
} /* C-declarations for C++ */

12
Marlin/src/lcd/extui/lib/mks_ui/draw_cloud_bind.h
View File

@ -25,12 +25,12 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_cloud_bind();
extern void lv_clear_cloud_bind();
extern void disp_bind_state();
extern void refresh_bind_ui();
extern void display_qrcode(uint8_t *qrcode_data);
extern void cloud_unbind();
void lv_draw_cloud_bind();
void lv_clear_cloud_bind();
void disp_bind_state();
void refresh_bind_ui();
void display_qrcode(uint8_t *qrcode_data);
void cloud_unbind();
#ifdef __cplusplus
} /* C-declarations for C++ */

10
Marlin/src/lcd/extui/lib/mks_ui/draw_dialog.h
View File

@ -74,11 +74,11 @@ enum {
DIALOG_TRANSFER_NO_DEVICE
};
extern void lv_draw_dialog(uint8_t type);
extern void lv_clear_dialog();
extern void filament_sprayer_temp();
extern void filament_dialog_handle();
extern void lv_filament_setbar();
void lv_draw_dialog(uint8_t type);
void lv_clear_dialog();
void filament_sprayer_temp();
void filament_dialog_handle();
void lv_filament_setbar();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_eeprom_settings.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_eeprom_settings();
extern void lv_clear_eeprom_settings();
void lv_draw_eeprom_settings();
void lv_clear_eeprom_settings();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_encoder_settings.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_encoder_settings();
extern void lv_clear_encoder_settings();
void lv_draw_encoder_settings();
void lv_clear_encoder_settings();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_error_message.h
View File

@ -29,8 +29,8 @@
#define PGM_P const char *
#endif
extern void lv_draw_error_message(PGM_P const msg);
extern void lv_clear_error_message();
void lv_draw_error_message(PGM_P const msg);
void lv_clear_error_message();
#ifdef __cplusplus
} /* C-declarations for C++ */

14
Marlin/src/lcd/extui/lib/mks_ui/draw_extrusion.h
View File

@ -25,13 +25,13 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_extrusion();
extern void lv_clear_extrusion();
extern void disp_ext_type();
extern void disp_ext_step();
extern void disp_ext_speed();
extern void disp_hotend_temp();
extern void disp_extru_amount();
void lv_draw_extrusion();
void lv_clear_extrusion();
void disp_ext_type();
void disp_ext_step();
void disp_ext_speed();
void disp_hotend_temp();
void disp_extru_amount();
#ifdef __cplusplus
} /* C-declarations for C++ */

6
Marlin/src/lcd/extui/lib/mks_ui/draw_fan.h
View File

@ -25,9 +25,9 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_fan();
extern void lv_clear_fan();
extern void disp_fan_value();
void lv_draw_fan();
void lv_clear_fan();
void disp_fan_value();
#ifdef __cplusplus
} /* C-declarations for C++ */

8
Marlin/src/lcd/extui/lib/mks_ui/draw_filament_change.h
View File

@ -25,10 +25,10 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_filament_change();
extern void lv_clear_filament_change();
extern void disp_filament_type();
extern void disp_filament_temp();
void lv_draw_filament_change();
void lv_clear_filament_change();
void disp_filament_type();
void disp_filament_temp();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_filament_settings.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_filament_settings();
extern void lv_clear_filament_settings();
void lv_draw_filament_settings();
void lv_clear_filament_settings();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_gcode.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_gcode(bool clear = false);
extern void lv_clear_gcode();
void lv_draw_gcode(bool clear = false);
void lv_clear_gcode();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_home.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_home();
extern void lv_clear_home();
void lv_draw_home();
void lv_clear_home();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_homing_sensitivity_settings.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_homing_sensitivity_settings();
extern void lv_clear_homing_sensitivity_settings();
void lv_draw_homing_sensitivity_settings();
void lv_clear_homing_sensitivity_settings();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_jerk_settings.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_jerk_settings();
extern void lv_clear_jerk_settings();
void lv_draw_jerk_settings();
void lv_clear_jerk_settings();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_keyboard.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_keyboard();
extern void lv_clear_keyboard();
void lv_draw_keyboard();
void lv_clear_keyboard();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_language.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_language();
extern void lv_clear_language();
void lv_draw_language();
void lv_clear_language();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_level_settings.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_level_settings();
extern void lv_clear_level_settings();
void lv_draw_level_settings();
void lv_clear_level_settings();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_machine_para.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_machine_para();
extern void lv_clear_machine_para();
void lv_draw_machine_para();
void lv_clear_machine_para();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_machine_settings.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_machine_settings();
extern void lv_clear_machine_settings();
void lv_draw_machine_settings();
void lv_clear_machine_settings();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_manuaLevel.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_manualLevel();
extern void lv_clear_manualLevel();
void lv_draw_manualLevel();
void lv_clear_manualLevel();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_max_feedrate_settings.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_max_feedrate_settings();
extern void lv_clear_max_feedrate_settings();
void lv_draw_max_feedrate_settings();
void lv_clear_max_feedrate_settings();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_more.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_more();
extern void lv_clear_more();
void lv_draw_more();
void lv_clear_more();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_motor_settings.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_motor_settings();
extern void lv_clear_motor_settings();
void lv_draw_motor_settings();
void lv_clear_motor_settings();
#ifdef __cplusplus
} /* C-declarations for C++ */

6
Marlin/src/lcd/extui/lib/mks_ui/draw_move_motor.h
View File

@ -25,9 +25,9 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_move_motor();
extern void lv_clear_move_motor();
extern void disp_move_dist();
void lv_draw_move_motor();
void lv_clear_move_motor();
void disp_move_dist();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_number_key.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_number_key();
extern void lv_clear_number_key();
void lv_draw_number_key();
void lv_clear_number_key();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_operation.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_operation();
extern void lv_clear_operation();
void lv_draw_operation();
void lv_clear_operation();
#ifdef __cplusplus
} /* C-declarations for C++ */

2
Marlin/src/lcd/extui/lib/mks_ui/draw_pause_message.h
View File

@ -25,7 +25,7 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_pause_message(const PauseMessage msg);
void lv_draw_pause_message(const PauseMessage msg);
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_pause_position.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_pause_position();
extern void lv_clear_pause_position();
void lv_draw_pause_position();
void lv_clear_pause_position();
#ifdef __cplusplus
} /* C-declarations for C++ */

10
Marlin/src/lcd/extui/lib/mks_ui/draw_preHeat.h
View File

@ -25,11 +25,11 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_preHeat();
extern void lv_clear_preHeat();
extern void disp_temp_type();
extern void disp_step_heat();
extern void disp_desire_temp();
void lv_draw_preHeat();
void lv_clear_preHeat();
void disp_temp_type();
void disp_step_heat();
void disp_desire_temp();
#ifdef __cplusplus
} /* C-declarations for C++ */

18
Marlin/src/lcd/extui/lib/mks_ui/draw_print_file.h
View File

@ -49,15 +49,15 @@ typedef struct {
} LIST_FILE;
extern LIST_FILE list_file;
extern void disp_gcode_icon(uint8_t file_num);
extern void lv_draw_print_file();
extern uint32_t lv_open_gcode_file(char *path);
extern void lv_gcode_file_read(uint8_t *data_buf);
extern void lv_close_gcode_file();
extern void cutFileName(char *path, int len, int bytePerLine, char *outStr);
extern int ascii2dec_test(char *ascii);
extern void lv_clear_print_file();
extern void lv_gcode_file_seek(uint32_t pos);
void disp_gcode_icon(uint8_t file_num);
void lv_draw_print_file();
uint32_t lv_open_gcode_file(char *path);
void lv_gcode_file_read(uint8_t *data_buf);
void lv_close_gcode_file();
void cutFileName(char *path, int len, int bytePerLine, char *outStr);
int ascii2dec_test(char *ascii);
void lv_clear_print_file();
void lv_gcode_file_seek(uint32_t pos);
#ifdef __cplusplus
} /* C-declarations for C++ */

22
Marlin/src/lcd/extui/lib/mks_ui/draw_printing.h
View File

@ -36,17 +36,17 @@ enum {
STOP
};
extern void lv_draw_printing();
extern void lv_clear_printing();
extern void disp_ext_temp();
extern void disp_bed_temp();
extern void disp_fan_speed();
extern void disp_print_time();
extern void disp_fan_Zpos();
extern void reset_print_time();
extern void start_print_time();
extern void stop_print_time();
extern void setProBarRate();
void lv_draw_printing();
void lv_clear_printing();
void disp_ext_temp();
void disp_bed_temp();
void disp_fan_speed();
void disp_print_time();
void disp_fan_Zpos();
void reset_print_time();
void start_print_time();
void stop_print_time();
void setProBarRate();
#ifdef __cplusplus
} /* C-declarations for C++ */

16
Marlin/src/lcd/extui/lib/mks_ui/draw_ready_print.h
View File

@ -25,14 +25,14 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_ready_print();
extern void mks_disp_test();
extern void disp_Limit_ok();
extern void disp_Limit_error();
extern void disp_det_error();
extern void disp_det_ok();
extern void lv_clear_ready_print();
extern void lv_temp_refr();
void lv_draw_ready_print();
void mks_disp_test();
void disp_Limit_ok();
void disp_Limit_error();
void disp_det_error();
void disp_det_ok();
void lv_clear_ready_print();
void lv_temp_refr();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_set.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_set();
extern void lv_clear_set();
void lv_draw_set();
void lv_clear_set();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_step_settings.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_step_settings();
extern void lv_clear_step_settings();
void lv_draw_step_settings();
void lv_clear_step_settings();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_current_settings.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_tmc_current_settings();
extern void lv_clear_tmc_current_settings();
void lv_draw_tmc_current_settings();
void lv_clear_tmc_current_settings();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_step_mode_settings.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_tmc_step_mode_settings();
extern void lv_clear_tmc_step_mode_settings();
void lv_draw_tmc_step_mode_settings();
void lv_clear_tmc_step_mode_settings();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_tool.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_tool();
extern void lv_clear_tool();
void lv_draw_tool();
void lv_clear_tool();
#ifdef __cplusplus
} /* C-declarations for C++ */

6
Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.h
View File

@ -25,9 +25,9 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_touch_calibration_screen();
extern void lv_clear_touch_calibration_screen();
extern void lv_update_touch_calibration_screen();
void lv_draw_touch_calibration_screen();
void lv_clear_touch_calibration_screen();
void lv_update_touch_calibration_screen();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_tramming_pos_settings.h
View File

@ -25,8 +25,8 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_tramming_pos_settings();
extern void lv_clear_tramming_pos_settings();
void lv_draw_tramming_pos_settings();
void lv_clear_tramming_pos_settings();
#ifdef __cplusplus
} /* C-declarations for C++ */

2
Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp
View File

@ -72,7 +72,7 @@ extern bool once_flag;
extern uint8_t sel_id;
extern lv_group_t *g;
extern void LCD_IO_WriteData(uint16_t RegValue);
void LCD_IO_WriteData(uint16_t RegValue);
static const char custom_gcode_command[][100] = {
"G29N\nM500",

36
Marlin/src/lcd/extui/lib/mks_ui/draw_ui.h
View File

@ -442,28 +442,28 @@ extern lv_style_t style_btn_rel;
extern lv_point_t line_points[4][2];
extern void gCfgItems_init();
extern void ui_cfg_init();
extern void tft_style_init();
void gCfgItems_init();
void ui_cfg_init();
void tft_style_init();
extern char *creat_title_text();
extern void preview_gcode_prehandle(char *path);
extern void update_spi_flash();
extern void update_gcode_command(int addr,uint8_t *s);
extern void get_gcode_command(int addr,uint8_t *d);
extern void lv_serial_capt_hook(void *, uint8_t);
extern void lv_eom_hook(void *);
void preview_gcode_prehandle(char *path);
void update_spi_flash();
void update_gcode_command(int addr,uint8_t *s);
void get_gcode_command(int addr,uint8_t *d);
void lv_serial_capt_hook(void *, uint8_t);
void lv_eom_hook(void *);
#if HAS_GCODE_PREVIEW
extern void disp_pre_gcode(int xpos_pixel, int ypos_pixel);
void disp_pre_gcode(int xpos_pixel, int ypos_pixel);
#endif
extern void GUI_RefreshPage();
extern void clear_cur_ui();
extern void draw_return_ui();
extern void sd_detection();
extern void gCfg_to_spiFlah();
extern void print_time_count();
void GUI_RefreshPage();
void clear_cur_ui();
void draw_return_ui();
void sd_detection();
void gCfg_to_spiFlah();
void print_time_count();
extern void LV_TASK_HANDLER();
extern void lv_ex_line(lv_obj_t *line, lv_point_t *points);
void LV_TASK_HANDLER();
void lv_ex_line(lv_obj_t *line, lv_point_t *points);
#ifdef __cplusplus
} /* C-declarations for C++ */

6
Marlin/src/lcd/extui/lib/mks_ui/draw_wifi.h
View File

@ -26,9 +26,9 @@
#endif
extern void lv_draw_wifi();
extern void lv_clear_wifi();
extern void disp_wifi_state();
void lv_draw_wifi();
void lv_clear_wifi();
void disp_wifi_state();
#ifdef __cplusplus
} /* C-declarations for C++ */

10
Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_list.h
View File

@ -25,11 +25,11 @@
extern "C" { /* C-declarations for C++ */
#endif
extern void lv_draw_wifi_list();
extern void lv_clear_wifi_list();
extern void disp_wifi_list();
extern void cutWifiName(char *name, int len,char *outStr);
extern void wifi_scan_handle();
void lv_draw_wifi_list();
void lv_clear_wifi_list();
void disp_wifi_list();
void cutWifiName(char *name, int len,char *outStr);
void wifi_scan_handle();
#define NUMBER_OF_PAGE 5

4
Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_settings.h
View File

@ -28,8 +28,8 @@
#define WIFI_AP_TEXT "AP"
#define WIFI_STA_TEXT "STA"
extern void lv_draw_wifi_settings();
extern void lv_clear_wifi_settings();
void lv_draw_wifi_settings();
void lv_clear_wifi_settings();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_tips.h
View File

@ -26,8 +26,8 @@
#endif
extern void lv_draw_wifi_tips();
extern void lv_clear_wifi_tips();
void lv_draw_wifi_tips();
void lv_clear_wifi_tips();
typedef enum {
TIPS_TYPE_JOINING,

16
Marlin/src/lcd/extui/lib/mks_ui/pic_manager.h
View File

@ -154,14 +154,14 @@ typedef struct pic_msg PIC_MSG;
#define PIC_SIZE_xM 6
#define FONT_SIZE_xM 2
extern void Pic_Read(uint8_t *Pname, uint8_t *P_Rbuff);
extern void Pic_Logo_Read(uint8_t *LogoName,uint8_t *Logo_Rbuff,uint32_t LogoReadsize);
extern void lv_pic_test(uint8_t *P_Rbuff, uint32_t addr, uint32_t size);
extern uint32_t lv_get_pic_addr(uint8_t *Pname);
extern void get_spi_flash_data(const char *rec_buf, int offset, int size);
extern void spi_flash_read_test();
extern void default_view_Read(uint8_t *default_view_Rbuff, uint32_t default_view_Readsize);
extern void flash_view_Read(uint8_t *flash_view_Rbuff, uint32_t flash_view_Readsize);
void Pic_Read(uint8_t *Pname, uint8_t *P_Rbuff);
void Pic_Logo_Read(uint8_t *LogoName,uint8_t *Logo_Rbuff,uint32_t LogoReadsize);
void lv_pic_test(uint8_t *P_Rbuff, uint32_t addr, uint32_t size);
uint32_t lv_get_pic_addr(uint8_t *Pname);
void get_spi_flash_data(const char *rec_buf, int offset, int size);
void spi_flash_read_test();
void default_view_Read(uint8_t *default_view_Rbuff, uint32_t default_view_Readsize);
void flash_view_Read(uint8_t *flash_view_Rbuff, uint32_t flash_view_Readsize);
#ifdef __cplusplus
} /* C-declarations for C++ */

6
Marlin/src/lcd/extui/lib/mks_ui/printer_operation.h
View File

@ -27,9 +27,9 @@
#define MIN_FILE_PRINTED 100 //5000
extern void printer_state_polling();
extern void filament_pin_setup();
extern void filament_check();
void printer_state_polling();
void filament_pin_setup();
void filament_check();
#ifdef __cplusplus
} /* C-declarations for C++ */

8
Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.cpp
View File

@ -64,13 +64,13 @@ XPT2046 touch;
#endif
#if HAS_SPI_FLASH_FONT
extern void init_gb2312_font();
void init_gb2312_font();
#endif
static lv_disp_buf_t disp_buf;
lv_group_t* g;
#if ENABLED(SDSUPPORT)
extern void UpdateAssets();
void UpdateAssets();
#endif
uint16_t DeviceCode = 0x9488;
extern uint8_t sel_id;
@ -190,9 +190,7 @@ void tft_lvgl_init() {
#endif
tft_style_init();
filament_pin_setup();
lv_encoder_pin_init();
TERN_(MKS_WIFI_MODULE, mks_wifi_firmware_update());
@ -211,7 +209,7 @@ void tft_lvgl_init() {
strncpy(public_buf_m, recovery.info.sd_filename, sizeof(public_buf_m));
card.printLongPath(public_buf_m);
strncpy(list_file.long_name[sel_id], card.longFilename, sizeof(list_file.long_name[sel_id]));
strncpy(list_file.long_name[sel_id], card.longFilename, sizeof(list_file.long_name[0]));
lv_draw_printing();
}
#endif

44
Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.h
View File

@ -37,32 +37,32 @@
extern uint8_t bmp_public_buf[14 * 1024];
extern uint8_t public_buf[513];
extern void tft_lvgl_init();
extern void my_disp_flush(lv_disp_drv_t * disp, const lv_area_t * area, lv_color_t * color_p);
extern bool my_touchpad_read(lv_indev_drv_t * indev_driver, lv_indev_data_t * data);
extern bool my_mousewheel_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data);
void tft_lvgl_init();
void my_disp_flush(lv_disp_drv_t * disp, const lv_area_t * area, lv_color_t * color_p);
bool my_touchpad_read(lv_indev_drv_t * indev_driver, lv_indev_data_t * data);
bool my_mousewheel_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data);
extern void LCD_Clear(uint16_t Color);
extern void tft_set_point(uint16_t x, uint16_t y, uint16_t point);
extern void LCD_setWindowArea(uint16_t StartX, uint16_t StartY, uint16_t width, uint16_t heigh);
extern void LCD_WriteRAM_Prepare();
extern void lcd_draw_logo();
extern void lv_encoder_pin_init();
extern void lv_update_encoder();
void LCD_Clear(uint16_t Color);
void tft_set_point(uint16_t x, uint16_t y, uint16_t point);
void LCD_setWindowArea(uint16_t StartX, uint16_t StartY, uint16_t width, uint16_t heigh);
void LCD_WriteRAM_Prepare();
void lcd_draw_logo();
void lv_encoder_pin_init();
void lv_update_encoder();
extern lv_fs_res_t spi_flash_open_cb (lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode);
extern lv_fs_res_t spi_flash_close_cb (lv_fs_drv_t * drv, void * file_p);
extern lv_fs_res_t spi_flash_read_cb (lv_fs_drv_t * drv, void * file_p, void * buf, uint32_t btr, uint32_t * br);
extern lv_fs_res_t spi_flash_seek_cb(lv_fs_drv_t * drv, void * file_p, uint32_t pos);
extern lv_fs_res_t spi_flash_tell_cb(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p);
lv_fs_res_t spi_flash_open_cb(lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode);
lv_fs_res_t spi_flash_close_cb(lv_fs_drv_t * drv, void * file_p);
lv_fs_res_t spi_flash_read_cb(lv_fs_drv_t * drv, void * file_p, void * buf, uint32_t btr, uint32_t * br);
lv_fs_res_t spi_flash_seek_cb(lv_fs_drv_t * drv, void * file_p, uint32_t pos);
lv_fs_res_t spi_flash_tell_cb(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p);
extern lv_fs_res_t sd_open_cb (lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode);
extern lv_fs_res_t sd_close_cb (lv_fs_drv_t * drv, void * file_p);
extern lv_fs_res_t sd_read_cb (lv_fs_drv_t * drv, void * file_p, void * buf, uint32_t btr, uint32_t * br);
extern lv_fs_res_t sd_seek_cb(lv_fs_drv_t * drv, void * file_p, uint32_t pos);
extern lv_fs_res_t sd_tell_cb(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p);
lv_fs_res_t sd_open_cb(lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode);
lv_fs_res_t sd_close_cb(lv_fs_drv_t * drv, void * file_p);
lv_fs_res_t sd_read_cb(lv_fs_drv_t * drv, void * file_p, void * buf, uint32_t btr, uint32_t * br);
lv_fs_res_t sd_seek_cb(lv_fs_drv_t * drv, void * file_p, uint32_t pos);
lv_fs_res_t sd_tell_cb(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p);
extern void lv_fill_rect(lv_coord_t x1, lv_coord_t y1, lv_coord_t x2, lv_coord_t y2, lv_color_t bk_color);
void lv_fill_rect(lv_coord_t x1, lv_coord_t y1, lv_coord_t x2, lv_coord_t y2, lv_color_t bk_color);
#ifdef __cplusplus
} /* C-declarations for C++ */

2
Marlin/src/lcd/extui/lib/mks_ui/tft_multi_language.h
View File

@ -29,7 +29,7 @@
#include "tft_Language_sp.h"
#include "tft_Language_it.h"
extern void disp_language_init();
void disp_language_init();
#define LANG_SIMPLE_CHINESE 1
#define LANG_COMPLEX_CHINESE 2

10
Marlin/src/lcd/extui/lib/mks_ui/wifi_module.h
View File

@ -181,16 +181,16 @@ extern WIFI_GCODE_BUFFER espGcodeFifo;
extern uint32_t getWifiTick();
extern uint32_t getWifiTickDiff(int32_t lastTick, int32_t curTick);
extern void mks_esp_wifi_init();
void mks_esp_wifi_init();
extern int cfg_cloud_flag;
extern int send_to_wifi(uint8_t *buf, int len);
extern void wifi_looping();
void wifi_looping();
extern int raw_send_to_wifi(uint8_t *buf, int len);
extern int package_to_wifi(WIFI_RET_TYPE type, uint8_t *buf, int len);
extern void get_wifi_list_command_send();
extern void get_wifi_commands();
void get_wifi_list_command_send();
void get_wifi_commands();
extern int readWifiBuf(int8_t *buf, int32_t len);
extern void mks_wifi_firmware_update();
void mks_wifi_firmware_update();
#ifdef __cplusplus
} /* C-declarations for C++ */

4
Marlin/src/lcd/extui/lib/mks_ui/wifi_upload.cpp
View File

@ -39,9 +39,9 @@ extern SZ_USART_FIFO WifiRxFifo;
extern int readUsartFifo(SZ_USART_FIFO *fifo, int8_t *buf, int32_t len);
extern int writeUsartFifo(SZ_USART_FIFO * fifo, int8_t * buf, int32_t len);
extern void esp_port_begin(uint8_t interrupt);
void esp_port_begin(uint8_t interrupt);
extern int usartFifoAvailable(SZ_USART_FIFO *fifo);
extern void wifi_delay(int n);
void wifi_delay(int n);
#define ARRAY_SIZE(a) sizeof(a) / sizeof((a)[0])

2
Marlin/src/module/servo.h
View File

@ -112,4 +112,4 @@
#define MOVE_SERVO(I, P) servo[I].move(P)
extern HAL_SERVO_LIB servo[NUM_SERVOS];
extern void servo_init();
void servo_init();

2
Marlin/src/module/tool_change.h
View File

@ -42,7 +42,7 @@
extern toolchange_settings_t toolchange_settings;
#if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
extern void tool_change_prime();
void tool_change_prime();
#endif
#if ENABLED(TOOLCHANGE_FS_PRIME_FIRST_USED)