bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🎨 Misc formatting

Browse Source
This commit is contained in:
Scott Lahteine
2021-11-17 13:01:44 -06:00
parent c5bd08755c
commit 2cc4a1b326
57 changed files with 62 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp
+4 -1
View File
@@ -208,8 +208,11 @@ uint8_t u8g_com_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_pt
} }
#endif #endif
#elif !ANY(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI, HAS_MARLINUI_HD44780) && HAS_MARLINUI_U8GLIB #elif NONE(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI, HAS_MARLINUI_HD44780) && HAS_MARLINUI_U8GLIB
#include <U8glib-HAL.h> #include <U8glib-HAL.h>
uint8_t u8g_com_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) {return 0;} uint8_t u8g_com_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) {return 0;}
#endif // HAS_MARLINUI_U8GLIB && !IS_U8GLIB_ST7920 #endif // HAS_MARLINUI_U8GLIB && !IS_U8GLIB_ST7920
#endif // __PLAT_NATIVE_SIM__ #endif // __PLAT_NATIVE_SIM__
Marlin/src/lcd/extui/mks_ui/draw_about.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_about(); void lv_draw_about();
Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_acceleration_settings(); void lv_draw_acceleration_settings();
Marlin/src/lcd/extui/mks_ui/draw_advance_settings.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_advance_settings(); void lv_draw_advance_settings();
Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_auto_level_offset_settings(); void lv_draw_auto_level_offset_settings();
Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_baby_stepping(); void lv_draw_baby_stepping();
Marlin/src/lcd/extui/mks_ui/draw_change_speed.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
#define MIN_EXT_SPEED_PERCENT 10 #define MIN_EXT_SPEED_PERCENT 10
Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.h
+2 -2
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_cloud_bind(); void lv_draw_cloud_bind();
@@ -33,5 +33,5 @@ void display_qrcode(uint8_t *qrcode_data);
void cloud_unbind(); void cloud_unbind();
#ifdef __cplusplus #ifdef __cplusplus
} /* C-declarations for C++ */ }
#endif #endif
Marlin/src/lcd/extui/mks_ui/draw_dialog.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
enum { enum {
Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_eeprom_settings(); void lv_draw_eeprom_settings();
Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_encoder_settings(); void lv_draw_encoder_settings();
Marlin/src/lcd/extui/mks_ui/draw_error_message.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
#ifndef PGM_P #ifndef PGM_P
Marlin/src/lcd/extui/mks_ui/draw_extrusion.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_extrusion(); void lv_draw_extrusion();
Marlin/src/lcd/extui/mks_ui/draw_fan.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_fan(); void lv_draw_fan();
Marlin/src/lcd/extui/mks_ui/draw_filament_change.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_filament_change(); void lv_draw_filament_change();
Marlin/src/lcd/extui/mks_ui/draw_filament_settings.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_filament_settings(); void lv_draw_filament_settings();
Marlin/src/lcd/extui/mks_ui/draw_gcode.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_gcode(bool clear = false); void lv_draw_gcode(bool clear = false);
Marlin/src/lcd/extui/mks_ui/draw_home.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_home(); void lv_draw_home();
Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_homing_sensitivity_settings(); void lv_draw_homing_sensitivity_settings();
Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_jerk_settings(); void lv_draw_jerk_settings();
Marlin/src/lcd/extui/mks_ui/draw_keyboard.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_keyboard(); void lv_draw_keyboard();
Marlin/src/lcd/extui/mks_ui/draw_language.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_language(); void lv_draw_language();
Marlin/src/lcd/extui/mks_ui/draw_level_settings.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_level_settings(); void lv_draw_level_settings();
Marlin/src/lcd/extui/mks_ui/draw_machine_para.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_machine_para(); void lv_draw_machine_para();
Marlin/src/lcd/extui/mks_ui/draw_machine_settings.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_machine_settings(); void lv_draw_machine_settings();
Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_manualLevel(); void lv_draw_manualLevel();
Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_max_feedrate_settings(); void lv_draw_max_feedrate_settings();
Marlin/src/lcd/extui/mks_ui/draw_media_select.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
extern void lv_draw_media_select(); extern void lv_draw_media_select();
Marlin/src/lcd/extui/mks_ui/draw_more.h
+2 -2
View File
@@ -22,12 +22,12 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_more(); void lv_draw_more();
void lv_clear_more(); void lv_clear_more();
#ifdef __cplusplus #ifdef __cplusplus
} /* C-declarations for C++ */ }
#endif #endif
Marlin/src/lcd/extui/mks_ui/draw_motor_settings.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_motor_settings(); void lv_draw_motor_settings();
Marlin/src/lcd/extui/mks_ui/draw_move_motor.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_move_motor(); void lv_draw_move_motor();
Marlin/src/lcd/extui/mks_ui/draw_number_key.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_number_key(); void lv_draw_number_key();
Marlin/src/lcd/extui/mks_ui/draw_operation.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_operation(); void lv_draw_operation();
Marlin/src/lcd/extui/mks_ui/draw_pause_message.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_pause_message(const PauseMessage msg); void lv_draw_pause_message(const PauseMessage msg);
Marlin/src/lcd/extui/mks_ui/draw_pause_position.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_pause_position(); void lv_draw_pause_position();
Marlin/src/lcd/extui/mks_ui/draw_preHeat.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_preHeat(); void lv_draw_preHeat();
Marlin/src/lcd/extui/mks_ui/draw_print_file.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
typedef struct { typedef struct {
Marlin/src/lcd/extui/mks_ui/draw_printing.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
enum { enum {
Marlin/src/lcd/extui/mks_ui/draw_ready_print.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_ready_print(); void lv_draw_ready_print();
Marlin/src/lcd/extui/mks_ui/draw_set.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_set(); void lv_draw_set();
Marlin/src/lcd/extui/mks_ui/draw_step_settings.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_step_settings(); void lv_draw_step_settings();
Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_tmc_current_settings(); void lv_draw_tmc_current_settings();
Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_tmc_step_mode_settings(); void lv_draw_tmc_step_mode_settings();
Marlin/src/lcd/extui/mks_ui/draw_tool.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_tool(); void lv_draw_tool();
Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_touch_calibration_screen(); void lv_draw_touch_calibration_screen();
Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_tramming_pos_settings(); void lv_draw_tramming_pos_settings();
Marlin/src/lcd/extui/mks_ui/draw_ui.h
+1 -1
View File
@@ -178,7 +178,7 @@
#endif // ifdef TFT35 #endif // ifdef TFT35
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
extern char public_buf_m[100]; extern char public_buf_m[100];
Marlin/src/lcd/extui/mks_ui/draw_wifi.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
Marlin/src/lcd/extui/mks_ui/draw_wifi_list.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
void lv_draw_wifi_list(); void lv_draw_wifi_list();
Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
#define WIFI_AP_TEXT "AP" #define WIFI_AP_TEXT "AP"
Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
Marlin/src/lcd/extui/mks_ui/irq_overrid.cpp
+1 -1
View File
@@ -39,7 +39,7 @@
#include "../../../inc/MarlinConfig.h" #include "../../../inc/MarlinConfig.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
#define WIFI_IO1_SET() WRITE(WIFI_IO1_PIN, HIGH); #define WIFI_IO1_SET() WRITE(WIFI_IO1_PIN, HIGH);
Marlin/src/lcd/extui/mks_ui/pic_manager.h
+1 -1
View File
@@ -131,7 +131,7 @@
#define OTHERS_COMMAND_ADDR_4 OTHERS_COMMAND_ADDR_3 + 100 #define OTHERS_COMMAND_ADDR_4 OTHERS_COMMAND_ADDR_3 + 100
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
union union32 { union union32 {
Marlin/src/lcd/extui/mks_ui/printer_operation.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
#define MIN_FILE_PRINTED 100 //5000 #define MIN_FILE_PRINTED 100 //5000
Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.h
+1 -1
View File
@@ -27,7 +27,7 @@
*/ */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
#include <lvgl.h> #include <lvgl.h>
Marlin/src/lcd/extui/mks_ui/wifi_module.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
#include "../../../inc/MarlinConfigPre.h" #include "../../../inc/MarlinConfigPre.h"
Marlin/src/lcd/extui/mks_ui/wifi_upload.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* C-declarations for C++ */ extern "C" {
#endif #endif
#define ESP_FIRMWARE_FILE "MksWifi.bin" #define ESP_FIRMWARE_FILE "MksWifi.bin"