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

Fix, consolidate PSTR aliases (#20812)

Browse Source 
Co-authored-by: Jason Smith <jason.inet@gmail.com>
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
Rockman18
2021-01-19 23:26:25 +01:00
committed by GitHub
parent fda9fb563b
commit d0f953218f
18 changed files with 202 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -257,7 +257,7 @@ void lv_draw_dialog(uint8_t type) {
lv_label_set_text(labelOk, print_file_dialog_menu.confirm);
}
}
else if (DIALOG_IS(TYPE_UPDATE_ESP_FIRMARE)) {
else if (DIALOG_IS(TYPE_UPDATE_ESP_FIRMWARE)) {
// nothing to do
}
#endif
@ -426,7 +426,7 @@ void lv_draw_dialog(uint8_t type) {
lv_obj_align(labelDialog, nullptr, LV_ALIGN_CENTER, 0, -20);
}
}
else if (DIALOG_IS(TYPE_UPDATE_ESP_FIRMARE)) {
else if (DIALOG_IS(TYPE_UPDATE_ESP_FIRMWARE)) {
lv_label_set_text(labelDialog, DIALOG_UPDATE_WIFI_FIRMWARE_EN);
lv_obj_align(labelDialog, NULL, LV_ALIGN_CENTER, 0, -20);
}

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

@ -77,7 +77,7 @@
#include "draw_keyboard.h"
#include "draw_encoder_settings.h"
#include "../../inc/MarlinConfigPre.h"
#include "../../../../inc/MarlinConfigPre.h"
#if ENABLED(MKS_WIFI_MODULE)
#include "wifiSerial.h"

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

@ -1663,7 +1663,7 @@ void mks_esp_wifi_init() {
clear_cur_ui();
draw_dialog(DIALOG_TYPE_UPDATE_ESP_FIRMARE);
draw_dialog(DIALOG_TYPE_UPDATE_ESP_FIRMWARE);
if (wifi_upload(1) >= 0) {
f_unlink("1:/MKS_WIFI_CUR");
@ -1717,7 +1717,7 @@ void mks_wifi_firmware_update() {
clear_cur_ui();
lv_draw_dialog(DIALOG_TYPE_UPDATE_ESP_FIRMARE);
lv_draw_dialog(DIALOG_TYPE_UPDATE_ESP_FIRMWARE);
lv_task_handler();
watchdog_refresh();

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

@ -152,7 +152,7 @@ uint32_t getData(unsigned byteCnt, const uint8_t *buf, int ofst) {
uint32_t val = 0;
if (buf && byteCnt) {
unsigned int shiftCnt = 0;
NOMORE(byteCnt, 4);
NOMORE(byteCnt, 4U);
do {
val |= (uint32_t)buf[ofst++] << shiftCnt;
shiftCnt += 8;
@ -164,7 +164,7 @@ uint32_t getData(unsigned byteCnt, const uint8_t *buf, int ofst) {
// Put 1-4 bytes of a value in little-endian order into a buffer beginning at a specified offset.
void putData(uint32_t val, unsigned byteCnt, uint8_t *buf, int ofst) {
if (buf && byteCnt) {
NOMORE(byteCnt, 4);
NOMORE(byteCnt, 4U);
do {
buf[ofst++] = (uint8_t)(val & 0xFF);
val >>= 8;