2020-06-16 02:05:33 +00:00
|
|
|
/**
|
|
|
|
* Marlin 3D Printer Firmware
|
|
|
|
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
|
|
|
*
|
|
|
|
* Based on Sprinter and grbl.
|
|
|
|
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
|
|
|
|
*
|
|
|
|
* This program is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2020-07-23 03:20:14 +00:00
|
|
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
2020-06-16 02:05:33 +00:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
#include "../../../../inc/MarlinConfigPre.h"
|
|
|
|
|
2020-07-25 05:52:07 +00:00
|
|
|
#if HAS_TFT_LVGL_UI
|
2020-06-16 02:05:33 +00:00
|
|
|
|
|
|
|
#include "string.h"
|
|
|
|
#include "pic_manager.h"
|
|
|
|
#include "draw_ready_print.h"
|
|
|
|
#include "mks_hardware_test.h"
|
|
|
|
|
2020-08-04 09:50:05 +00:00
|
|
|
#include "SPIFlashStorage.h"
|
2020-08-09 00:24:31 +00:00
|
|
|
#include "../../../../libs/W25Qxx.h"
|
2020-08-04 09:50:05 +00:00
|
|
|
|
|
|
|
#include "../../../../sd/cardreader.h"
|
2020-08-09 00:24:31 +00:00
|
|
|
#include "../../../../MarlinCore.h"
|
2020-08-04 09:50:05 +00:00
|
|
|
|
2020-06-16 02:05:33 +00:00
|
|
|
extern uint16_t DeviceCode;
|
|
|
|
extern unsigned char bmp_public_buf[17 * 1024];
|
|
|
|
|
|
|
|
#if ENABLED(SDSUPPORT)
|
|
|
|
extern char *createFilename(char * const buffer, const dir_t &p);
|
|
|
|
#endif
|
|
|
|
|
2020-07-25 05:52:07 +00:00
|
|
|
static char assets[][LONG_FILENAME_LENGTH] = {
|
2020-07-01 06:30:24 +00:00
|
|
|
//homing screen
|
|
|
|
"bmp_Zero.bin",
|
|
|
|
"bmp_zeroX.bin",
|
|
|
|
"bmp_zeroY.bin",
|
|
|
|
"bmp_zeroZ.bin",
|
|
|
|
"bmp_manual_off.bin",
|
|
|
|
|
|
|
|
//tool screen
|
|
|
|
"bmp_PreHeat.bin",
|
|
|
|
"bmp_Extruct.bin",
|
|
|
|
"bmp_Mov.bin",
|
|
|
|
// "bmp_Zero.bin",
|
|
|
|
"bmp_Leveling.bin",
|
|
|
|
|
|
|
|
//fan screen
|
|
|
|
"bmp_Add.bin",
|
|
|
|
"bmp_Dec.bin",
|
|
|
|
"bmp_Speed255.bin",
|
|
|
|
"bmp_Speed127.bin",
|
|
|
|
"bmp_Speed0.bin",
|
|
|
|
|
|
|
|
//preheat screen
|
|
|
|
// "bmp_Add.bin",
|
|
|
|
// "bmp_Dec.bin",
|
|
|
|
"bmp_Speed0.bin",
|
|
|
|
// "bmp_Extru2.bin",
|
|
|
|
// "bmp_Extru1.bin",
|
|
|
|
"bmp_Bed.bin",
|
|
|
|
"bmp_Step1_degree.bin",
|
|
|
|
"bmp_Step5_degree.bin",
|
|
|
|
"bmp_Step10_degree.bin",
|
|
|
|
|
|
|
|
//extrusion screen
|
|
|
|
"bmp_In.bin",
|
|
|
|
"bmp_Out.bin",
|
|
|
|
"bmp_Extru1.bin",
|
|
|
|
#if EXTRUDERS > 1
|
|
|
|
"bmp_Extru2.bin",
|
|
|
|
#endif
|
|
|
|
"bmp_Speed_high.bin",
|
|
|
|
"bmp_Speed_slow.bin",
|
|
|
|
"bmp_Speed_normal.bin",
|
|
|
|
"bmp_Step1_mm.bin",
|
|
|
|
"bmp_Step5_mm.bin",
|
|
|
|
"bmp_Step10_mm.bin",
|
|
|
|
|
|
|
|
//select file screen
|
|
|
|
"bmp_pageUp.bin",
|
|
|
|
"bmp_pageDown.bin",
|
2020-07-25 05:52:07 +00:00
|
|
|
"bmp_Back.bin", //TODO: why two back buttons? Why not just one? (return / back)
|
2020-07-01 06:30:24 +00:00
|
|
|
"bmp_Dir.bin",
|
|
|
|
"bmp_File.bin",
|
|
|
|
|
|
|
|
//move motor screen
|
|
|
|
//TODO: 6 equal icons, just in diffenct rotation... it may be optimized too
|
|
|
|
"bmp_xAdd.bin",
|
|
|
|
"bmp_xDec.bin",
|
|
|
|
"bmp_yAdd.bin",
|
|
|
|
"bmp_yDec.bin",
|
|
|
|
"bmp_zAdd.bin",
|
|
|
|
"bmp_zDec.bin",
|
|
|
|
"bmp_Step_move0_1.bin",
|
|
|
|
"bmp_Step_move1.bin",
|
|
|
|
"bmp_Step_move10.bin",
|
|
|
|
|
|
|
|
//operation screen
|
|
|
|
"bmp_auto_off.bin",
|
|
|
|
"bmp_Speed.bin",
|
|
|
|
//"bmp_Mamual.bin", //TODO: didn't find it.. changed to bmp_manual_off.bin
|
|
|
|
"bmp_Fan.bin",
|
|
|
|
//"bmp_PreHeat.bin",
|
|
|
|
//"bmp_Extruct.bin",
|
|
|
|
// "bmp_Mov.bin",
|
|
|
|
|
|
|
|
//change speed screen
|
|
|
|
"bmp_Step1_percent.bin",
|
|
|
|
"bmp_Step5_percent.bin",
|
|
|
|
"bmp_Step10_percent.bin",
|
|
|
|
"bmp_extruct_sel.bin",
|
|
|
|
"bmp_mov_changespeed.bin",
|
|
|
|
// "bmp_extrude_opr.bin", equal to "bmp_Extruct.bin"
|
|
|
|
"bmp_mov_sel.bin",
|
|
|
|
|
|
|
|
//printing screen
|
|
|
|
"bmp_Pause.bin",
|
|
|
|
"bmp_Resume.bin",
|
|
|
|
"bmp_Stop.bin",
|
|
|
|
"bmp_Ext1_state.bin",
|
|
|
|
#if EXTRUDERS > 1
|
|
|
|
"bmp_Ext2_state.bin",
|
|
|
|
#endif
|
|
|
|
"bmp_Bed_state.bin",
|
|
|
|
"bmp_Fan_state.bin",
|
|
|
|
"bmp_Time_state.bin",
|
|
|
|
"bmp_Zpos_state.bin",
|
|
|
|
"bmp_Operate.bin",
|
|
|
|
|
|
|
|
//manual leval screen (only if disabled auto level)
|
|
|
|
#if DISABLED(AUTO_BED_LEVELING_BILINEAR)
|
|
|
|
"bmp_Leveling1.bin",
|
|
|
|
"bmp_Leveling2.bin",
|
|
|
|
"bmp_Leveling3.bin",
|
|
|
|
"bmp_Leveling4.bin",
|
|
|
|
"bmp_Leveling5.bin",
|
|
|
|
#endif
|
|
|
|
|
|
|
|
//lang select screen
|
|
|
|
#if HAS_LANG_SELECT_SCREEN
|
|
|
|
"bmp_Language.bin",
|
|
|
|
"bmp_simplified_cn.bin",
|
|
|
|
"bmp_simplified_cn_sel.bin",
|
|
|
|
"bmp_traditional_cn.bin",
|
|
|
|
"bmp_traditional_cn_sel.bin",
|
|
|
|
"bmp_English.bin",
|
|
|
|
"bmp_English_sel.bin",
|
|
|
|
"bmp_Russian.bin",
|
|
|
|
"bmp_Russian_sel.bin",
|
|
|
|
"bmp_Spanish.bin",
|
|
|
|
"bmp_Spanish_sel.bin",
|
|
|
|
"bmp_French.bin",
|
|
|
|
"bmp_French_sel.bin",
|
|
|
|
"bmp_Italy.bin",
|
|
|
|
"bmp_Italy_sel.bin",
|
2020-07-25 05:52:07 +00:00
|
|
|
#endif // HAS_LANG_SELECT_SCREEN
|
2020-07-01 06:30:24 +00:00
|
|
|
|
2020-07-25 05:52:07 +00:00
|
|
|
// gcode preview
|
2020-07-01 06:30:24 +00:00
|
|
|
#if HAS_GCODE_DEFAULT_VIEW_IN_FLASH
|
|
|
|
"bmp_preview.bin",
|
|
|
|
#endif
|
|
|
|
|
2020-07-25 05:52:07 +00:00
|
|
|
#if HAS_LOGO_IN_FLASH
|
|
|
|
"bmp_logo.bin",
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// settings screen
|
2020-07-01 06:30:24 +00:00
|
|
|
"bmp_About.bin",
|
|
|
|
//"bmp_Language.bin",
|
|
|
|
//"bmp_Fan.bin",
|
|
|
|
//"bmp_manual_off.bin",
|
|
|
|
|
|
|
|
//start screen
|
|
|
|
"bmp_printing.bin",
|
|
|
|
"bmp_Set.bin",
|
|
|
|
"bmp_Tool.bin",
|
|
|
|
|
2020-07-25 05:52:07 +00:00
|
|
|
#if ENABLED(HAS_STEALTHCHOP)
|
|
|
|
//"bmp_back70x40.bin",
|
|
|
|
"bmp_disable.bin",
|
|
|
|
"bmp_enable.bin",
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// settings screen
|
|
|
|
"bmp_eeprom_settings.bin",
|
|
|
|
"bmp_machine_para.bin",
|
|
|
|
"bmp_function1.bin",
|
|
|
|
|
|
|
|
// base icons
|
|
|
|
"bmp_arrow.bin",
|
|
|
|
"bmp_back70x40.bin",
|
|
|
|
"bmp_value_blank.bin",
|
2020-07-01 06:30:24 +00:00
|
|
|
"bmp_Return.bin"
|
|
|
|
};
|
|
|
|
|
|
|
|
#if HAS_SPI_FLASH_FONT
|
2020-08-04 09:50:05 +00:00
|
|
|
static char fonts[][LONG_FILENAME_LENGTH] = { "FontUNIGBK.bin" };
|
2020-07-01 06:30:24 +00:00
|
|
|
#endif
|
2020-06-16 02:05:33 +00:00
|
|
|
|
2020-08-04 09:50:05 +00:00
|
|
|
static uint8_t currentFlashPage = 0;
|
|
|
|
|
2020-06-16 02:05:33 +00:00
|
|
|
uint32_t lv_get_pic_addr(uint8_t *Pname) {
|
|
|
|
uint8_t Pic_cnt;
|
|
|
|
uint8_t i, j;
|
|
|
|
PIC_MSG PIC;
|
|
|
|
uint32_t tmp_cnt = 0;
|
|
|
|
uint32_t addr = 0;
|
|
|
|
|
2020-08-04 09:50:05 +00:00
|
|
|
currentFlashPage = 0;
|
|
|
|
|
2020-07-01 06:30:24 +00:00
|
|
|
#if ENABLED(MARLIN_DEV_MODE)
|
|
|
|
SERIAL_ECHOLNPAIR("Getting picture SPI Flash Address: ", (const char*)Pname);
|
|
|
|
#endif
|
|
|
|
|
2020-06-16 02:05:33 +00:00
|
|
|
W25QXX.init(SPI_QUARTER_SPEED);
|
|
|
|
|
|
|
|
W25QXX.SPI_FLASH_BufferRead(&Pic_cnt, PIC_COUNTER_ADDR, 1);
|
2020-07-01 06:30:24 +00:00
|
|
|
if (Pic_cnt == 0xFF) Pic_cnt = 0;
|
2020-06-16 02:05:33 +00:00
|
|
|
for (i = 0; i < Pic_cnt; i++) {
|
|
|
|
j = 0;
|
2020-07-01 06:30:24 +00:00
|
|
|
do {
|
2020-06-16 02:05:33 +00:00
|
|
|
W25QXX.SPI_FLASH_BufferRead(&PIC.name[j], PIC_NAME_ADDR + tmp_cnt, 1);
|
|
|
|
tmp_cnt++;
|
2020-07-01 06:30:24 +00:00
|
|
|
} while (PIC.name[j++] != '\0');
|
2020-06-16 02:05:33 +00:00
|
|
|
|
2020-07-01 06:30:24 +00:00
|
|
|
if ((strcasecmp((char*)Pname, (char*)PIC.name)) == 0) {
|
2020-06-16 02:05:33 +00:00
|
|
|
if ((DeviceCode == 0x9488) || (DeviceCode == 0x5761))
|
|
|
|
addr = PIC_DATA_ADDR_TFT35 + i * PER_PIC_MAX_SPACE_TFT35;
|
|
|
|
else
|
|
|
|
addr = PIC_DATA_ADDR_TFT32 + i * PER_PIC_MAX_SPACE_TFT32;
|
2020-07-25 05:52:07 +00:00
|
|
|
return addr;
|
2020-06-16 02:05:33 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return addr;
|
|
|
|
}
|
|
|
|
|
2020-07-25 05:52:07 +00:00
|
|
|
const char *assetsPath = "assets";
|
|
|
|
const char *bakPath = "_assets";
|
2020-06-16 02:05:33 +00:00
|
|
|
|
|
|
|
void spiFlashErase_PIC() {
|
2020-07-01 06:30:24 +00:00
|
|
|
volatile uint32_t pic_sectorcnt = 0;
|
2020-07-26 04:08:30 +00:00
|
|
|
W25QXX.init(SPI_QUARTER_SPEED);
|
2020-07-25 05:52:07 +00:00
|
|
|
for (pic_sectorcnt = 0; pic_sectorcnt < PIC_SIZE_xM * 1024 / 64; pic_sectorcnt++)
|
2020-07-01 06:30:24 +00:00
|
|
|
W25QXX.SPI_FLASH_BlockErase(PICINFOADDR + pic_sectorcnt * 64 * 1024);
|
2020-06-16 02:05:33 +00:00
|
|
|
}
|
|
|
|
|
2020-07-01 06:30:24 +00:00
|
|
|
#if HAS_SPI_FLASH_FONT
|
|
|
|
void spiFlashErase_FONT() {
|
|
|
|
volatile uint32_t Font_sectorcnt = 0;
|
2020-07-26 04:08:30 +00:00
|
|
|
W25QXX.init(SPI_QUARTER_SPEED);
|
|
|
|
for (Font_sectorcnt = 0; Font_sectorcnt < 32-1; Font_sectorcnt++)
|
2020-07-01 06:30:24 +00:00
|
|
|
W25QXX.SPI_FLASH_BlockErase(FONTINFOADDR + Font_sectorcnt * 64 * 1024);
|
2020-06-16 02:05:33 +00:00
|
|
|
}
|
2020-07-01 06:30:24 +00:00
|
|
|
#endif
|
2020-06-16 02:05:33 +00:00
|
|
|
|
|
|
|
uint32_t LogoWrite_Addroffset = 0;
|
|
|
|
|
|
|
|
uint8_t Pic_Logo_Write(uint8_t *LogoName, uint8_t *Logo_Wbuff, uint32_t LogoWriteSize) {
|
|
|
|
if (LogoWriteSize <= 0) return 0;
|
|
|
|
|
|
|
|
W25QXX.SPI_FLASH_BufferWrite(Logo_Wbuff, PIC_LOGO_ADDR + LogoWrite_Addroffset, LogoWriteSize);
|
|
|
|
|
2020-07-01 06:30:24 +00:00
|
|
|
for (uint32_t i = 0; i < LogoWriteSize; i++) {
|
|
|
|
uint8_t temp1;
|
2020-06-16 02:05:33 +00:00
|
|
|
W25QXX.SPI_FLASH_BufferRead(&temp1, PIC_LOGO_ADDR + LogoWrite_Addroffset + i, 1);
|
|
|
|
if (*(Logo_Wbuff + i) != temp1) return 0;
|
|
|
|
}
|
|
|
|
LogoWrite_Addroffset += LogoWriteSize;
|
2020-07-01 06:30:24 +00:00
|
|
|
const uint32_t logo_maxsize = DeviceCode == 0x9488 || DeviceCode == 0x5761 ? LOGO_MAX_SIZE_TFT35 : LOGO_MAX_SIZE_TFT32;
|
|
|
|
if (LogoWrite_Addroffset >= logo_maxsize) LogoWrite_Addroffset = 0;
|
2020-06-16 02:05:33 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint32_t TitleLogoWrite_Addroffset = 0;
|
|
|
|
uint8_t Pic_TitleLogo_Write(uint8_t *TitleLogoName, uint8_t *TitleLogo_Wbuff, uint32_t TitleLogoWriteSize) {
|
|
|
|
if (TitleLogoWriteSize <= 0)
|
|
|
|
return 0;
|
|
|
|
if ((DeviceCode == 0x9488) || (DeviceCode == 0x5761))
|
|
|
|
W25QXX.SPI_FLASH_BufferWrite(TitleLogo_Wbuff, PIC_ICON_LOGO_ADDR_TFT35 + TitleLogoWrite_Addroffset, TitleLogoWriteSize);
|
|
|
|
else
|
|
|
|
W25QXX.SPI_FLASH_BufferWrite(TitleLogo_Wbuff, PIC_ICON_LOGO_ADDR_TFT32 + TitleLogoWrite_Addroffset, TitleLogoWriteSize);
|
|
|
|
TitleLogoWrite_Addroffset += TitleLogoWriteSize;
|
|
|
|
if (TitleLogoWrite_Addroffset >= TITLELOGO_MAX_SIZE)
|
|
|
|
TitleLogoWrite_Addroffset = 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint32_t default_view_addroffset_r = 0;
|
|
|
|
void default_view_Write(uint8_t *default_view__Rbuff, uint32_t default_view_Writesize) {
|
|
|
|
W25QXX.SPI_FLASH_BufferWrite(default_view__Rbuff, DEFAULT_VIEW_ADDR_TFT35 + default_view_addroffset_r, default_view_Writesize);
|
|
|
|
default_view_addroffset_r += default_view_Writesize;
|
|
|
|
if (default_view_addroffset_r >= DEFAULT_VIEW_MAX_SIZE)
|
|
|
|
default_view_addroffset_r = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
|
|
|
|
uint8_t pic_counter = 0;
|
|
|
|
uint32_t Pic_SaveAddr;
|
|
|
|
uint32_t Pic_SizeSaveAddr;
|
|
|
|
uint32_t Pic_NameSaveAddr;
|
|
|
|
uint8_t Pname_temp;
|
|
|
|
uint32_t i, j;
|
|
|
|
uint32_t name_len = 0;
|
|
|
|
uint32_t SaveName_len = 0;
|
|
|
|
union union32 size_tmp;
|
|
|
|
|
|
|
|
W25QXX.SPI_FLASH_BufferRead(&pic_counter, PIC_COUNTER_ADDR, 1);
|
|
|
|
|
|
|
|
if (pic_counter == 0xFF)
|
|
|
|
pic_counter = 0;
|
|
|
|
|
|
|
|
if ((DeviceCode == 0x9488) || (DeviceCode == 0x5761))
|
|
|
|
Pic_SaveAddr = PIC_DATA_ADDR_TFT35 + pic_counter * PER_PIC_MAX_SPACE_TFT35;
|
|
|
|
else
|
|
|
|
Pic_SaveAddr = PIC_DATA_ADDR_TFT32 + pic_counter * PER_PIC_MAX_SPACE_TFT32;
|
|
|
|
|
|
|
|
for (j = 0; j < pic_counter; j++) {
|
|
|
|
do {
|
|
|
|
W25QXX.SPI_FLASH_BufferRead(&Pname_temp, PIC_NAME_ADDR + SaveName_len, 1);
|
|
|
|
SaveName_len++;
|
|
|
|
} while (Pname_temp != '\0');
|
|
|
|
}
|
|
|
|
i = 0;
|
|
|
|
while ((*(P_name + i) != '\0')) {
|
|
|
|
i++;
|
|
|
|
name_len++;
|
|
|
|
}
|
|
|
|
|
|
|
|
Pic_NameSaveAddr = PIC_NAME_ADDR + SaveName_len;
|
|
|
|
W25QXX.SPI_FLASH_BufferWrite(P_name, Pic_NameSaveAddr, name_len + 1);
|
|
|
|
Pic_SizeSaveAddr = PIC_SIZE_ADDR + 4 * pic_counter;
|
|
|
|
size_tmp.dwords = P_size;
|
|
|
|
W25QXX.SPI_FLASH_BufferWrite(size_tmp.bytes, Pic_SizeSaveAddr, 4);
|
|
|
|
|
|
|
|
pic_counter++;
|
|
|
|
W25QXX.SPI_FLASH_SectorErase(PIC_COUNTER_ADDR);
|
|
|
|
W25QXX.SPI_FLASH_BufferWrite(&pic_counter, PIC_COUNTER_ADDR, 1);
|
|
|
|
|
|
|
|
return Pic_SaveAddr;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint8_t public_buf[512];
|
|
|
|
|
2020-07-01 06:30:24 +00:00
|
|
|
#if ENABLED(SDSUPPORT)
|
2020-06-16 02:05:33 +00:00
|
|
|
|
2020-07-01 06:30:24 +00:00
|
|
|
static void dosName2LongName(const char dosName[11], char* longName) {
|
|
|
|
uint8_t j = 0;
|
|
|
|
LOOP_L_N(i, 11) {
|
|
|
|
if (i == 8) longName[j++] = '.';
|
|
|
|
if (dosName[i] == '\0' || dosName[i] == ' ') continue;
|
|
|
|
longName[j++] = dosName[i];
|
|
|
|
}
|
|
|
|
longName[j] = '\0';
|
|
|
|
}
|
|
|
|
|
2020-07-25 05:52:07 +00:00
|
|
|
static int8_t arrayFindStr(const char arr[][LONG_FILENAME_LENGTH], uint8_t arraySize, const char* str) {
|
|
|
|
for (uint8_t a = 0; a < arraySize; a++) {
|
|
|
|
if (strcasecmp(arr[a], str) == 0)
|
|
|
|
return a;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2020-08-04 09:50:05 +00:00
|
|
|
#if ENABLED(MARLIN_DEV_MODE)
|
|
|
|
static uint32_t totalSizes = 0, totalCompressed = 0;
|
|
|
|
#endif
|
|
|
|
|
2020-07-25 05:52:07 +00:00
|
|
|
#define ASSET_TYPE_ICON 0
|
|
|
|
#define ASSET_TYPE_LOGO 1
|
|
|
|
#define ASSET_TYPE_TITLE_LOGO 2
|
|
|
|
#define ASSET_TYPE_G_PREVIEW 3
|
|
|
|
#define ASSET_TYPE_FONT 4
|
|
|
|
static void loadAsset(SdFile &dir, dir_t& entry, const char *fn, int8_t assetType) {
|
|
|
|
SdFile file;
|
|
|
|
char dosFilename[FILENAME_LENGTH];
|
|
|
|
createFilename(dosFilename, entry);
|
|
|
|
if (!file.open(&dir, dosFilename, O_READ)) {
|
|
|
|
#if ENABLED(MARLIN_DEV_MODE)
|
|
|
|
SERIAL_ECHOLNPAIR("Error opening Asset: ", fn);
|
|
|
|
#endif
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
disp_assets_update_progress(fn);
|
2020-07-26 04:08:30 +00:00
|
|
|
|
|
|
|
W25QXX.init(SPI_QUARTER_SPEED);
|
|
|
|
|
2020-07-01 06:30:24 +00:00
|
|
|
uint16_t pbr;
|
|
|
|
uint32_t pfileSize;
|
|
|
|
uint32_t totalSizeLoaded = 0;
|
|
|
|
uint32_t Pic_Write_Addr;
|
2020-07-25 05:52:07 +00:00
|
|
|
pfileSize = file.fileSize();
|
|
|
|
totalSizeLoaded += pfileSize;
|
|
|
|
if (assetType == ASSET_TYPE_LOGO) {
|
2020-08-04 09:50:05 +00:00
|
|
|
do {
|
2020-07-25 05:52:07 +00:00
|
|
|
pbr = file.read(public_buf, BMP_WRITE_BUF_LEN);
|
2020-08-04 09:50:05 +00:00
|
|
|
Pic_Logo_Write((uint8_t *)fn, public_buf, pbr);
|
|
|
|
} while (pbr >= BMP_WRITE_BUF_LEN);
|
2020-07-25 05:52:07 +00:00
|
|
|
}
|
|
|
|
else if (assetType == ASSET_TYPE_TITLE_LOGO) {
|
2020-08-04 09:50:05 +00:00
|
|
|
do {
|
2020-07-25 05:52:07 +00:00
|
|
|
pbr = file.read(public_buf, BMP_WRITE_BUF_LEN);
|
2020-08-04 09:50:05 +00:00
|
|
|
Pic_TitleLogo_Write((uint8_t *)fn, public_buf, pbr);
|
|
|
|
} while (pbr >= BMP_WRITE_BUF_LEN);
|
2020-07-25 05:52:07 +00:00
|
|
|
}
|
|
|
|
else if (assetType == ASSET_TYPE_G_PREVIEW) {
|
2020-08-04 09:50:05 +00:00
|
|
|
do {
|
2020-07-25 05:52:07 +00:00
|
|
|
pbr = file.read(public_buf, BMP_WRITE_BUF_LEN);
|
2020-08-04 09:50:05 +00:00
|
|
|
default_view_Write(public_buf, pbr);
|
|
|
|
} while (pbr >= BMP_WRITE_BUF_LEN);
|
2020-07-25 05:52:07 +00:00
|
|
|
}
|
|
|
|
else if (assetType == ASSET_TYPE_ICON) {
|
|
|
|
Pic_Write_Addr = Pic_Info_Write((uint8_t *)fn, pfileSize);
|
2020-08-04 09:50:05 +00:00
|
|
|
SPIFlash.beginWrite(Pic_Write_Addr);
|
|
|
|
#if HAS_SPI_FLASH_COMPRESSION
|
|
|
|
do {
|
|
|
|
pbr = file.read(public_buf, SPI_FLASH_PageSize);
|
|
|
|
TERN_(MARLIN_DEV_MODE, totalSizes += pbr);
|
|
|
|
SPIFlash.writeData(public_buf, SPI_FLASH_PageSize);
|
|
|
|
} while (pbr >= SPI_FLASH_PageSize);
|
|
|
|
#else
|
|
|
|
do {
|
|
|
|
pbr = file.read(public_buf, BMP_WRITE_BUF_LEN);
|
|
|
|
W25QXX.SPI_FLASH_BufferWrite(public_buf, Pic_Write_Addr, pbr);
|
|
|
|
Pic_Write_Addr += pbr;
|
|
|
|
} while (pbr >= BMP_WRITE_BUF_LEN);
|
|
|
|
#endif
|
|
|
|
#if ENABLED(MARLIN_DEV_MODE)
|
|
|
|
SERIAL_ECHOLNPAIR("Space used: ", fn, " - ", (SPIFlash.getCurrentPage() + 1) * SPI_FLASH_PageSize / 1024, "KB");
|
|
|
|
totalCompressed += (SPIFlash.getCurrentPage() + 1) * SPI_FLASH_PageSize;
|
|
|
|
#endif
|
|
|
|
SPIFlash.endWrite();
|
2020-07-25 05:52:07 +00:00
|
|
|
}
|
|
|
|
else if (assetType == ASSET_TYPE_FONT) {
|
|
|
|
Pic_Write_Addr = UNIGBK_FLASH_ADDR;
|
2020-08-04 09:50:05 +00:00
|
|
|
do {
|
2020-07-25 05:52:07 +00:00
|
|
|
pbr = file.read(public_buf, BMP_WRITE_BUF_LEN);
|
|
|
|
W25QXX.SPI_FLASH_BufferWrite(public_buf, Pic_Write_Addr, pbr);
|
|
|
|
Pic_Write_Addr += pbr;
|
2020-08-04 09:50:05 +00:00
|
|
|
} while (pbr >= BMP_WRITE_BUF_LEN);
|
2020-07-25 05:52:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
file.close();
|
|
|
|
|
|
|
|
#if ENABLED(MARLIN_DEV_MODE)
|
|
|
|
SERIAL_ECHOLNPAIR("Asset added: ", fn);
|
|
|
|
#endif
|
|
|
|
}
|
2020-07-01 06:30:24 +00:00
|
|
|
|
2020-07-25 05:52:07 +00:00
|
|
|
void UpdateAssets() {
|
2020-07-01 06:30:24 +00:00
|
|
|
SdFile dir, root = card.getroot();
|
2020-07-25 05:52:07 +00:00
|
|
|
if (dir.open(&root, assetsPath, O_RDONLY)) {
|
2020-07-01 06:30:24 +00:00
|
|
|
|
2020-07-25 05:52:07 +00:00
|
|
|
disp_assets_update();
|
2020-07-26 04:08:30 +00:00
|
|
|
disp_assets_update_progress("Erasing pics...");
|
2020-07-01 06:30:24 +00:00
|
|
|
spiFlashErase_PIC();
|
2020-07-25 05:52:07 +00:00
|
|
|
#if HAS_SPI_FLASH_FONT
|
2020-07-26 04:08:30 +00:00
|
|
|
disp_assets_update_progress("Erasing fonts...");
|
2020-07-25 05:52:07 +00:00
|
|
|
spiFlashErase_FONT();
|
|
|
|
#endif
|
2020-07-01 06:30:24 +00:00
|
|
|
|
2020-07-26 04:08:30 +00:00
|
|
|
disp_assets_update_progress("Reading files...");
|
2020-07-01 06:30:24 +00:00
|
|
|
dir_t d;
|
|
|
|
while (dir.readDir(&d, card.longFilename) > 0) {
|
2020-08-04 09:50:05 +00:00
|
|
|
// If we dont get a long name, but gets a short one, try it
|
2020-07-25 05:52:07 +00:00
|
|
|
if (card.longFilename[0] == 0 && d.name[0] != 0)
|
2020-07-01 06:30:24 +00:00
|
|
|
dosName2LongName((const char*)d.name, card.longFilename);
|
2020-07-25 05:52:07 +00:00
|
|
|
if (card.longFilename[0] == 0) continue;
|
|
|
|
if (card.longFilename[0] == '.') continue;
|
2020-06-16 02:05:33 +00:00
|
|
|
|
2020-08-04 09:50:05 +00:00
|
|
|
int8_t a = arrayFindStr(assets, COUNT(assets), card.longFilename);
|
2020-08-06 03:40:08 +00:00
|
|
|
if (a >= 0 && a < (int8_t)COUNT(assets)) {
|
2020-07-25 05:52:07 +00:00
|
|
|
uint8_t assetType = ASSET_TYPE_ICON;
|
|
|
|
if (strstr(assets[a], "_logo"))
|
|
|
|
assetType = ASSET_TYPE_LOGO;
|
|
|
|
else if (strstr(assets[a], "_titlelogo"))
|
|
|
|
assetType = ASSET_TYPE_TITLE_LOGO;
|
|
|
|
else if (strstr(assets[a], "_preview"))
|
|
|
|
assetType = ASSET_TYPE_G_PREVIEW;
|
2020-06-16 02:05:33 +00:00
|
|
|
|
2020-07-25 05:52:07 +00:00
|
|
|
loadAsset(dir, d, assets[a], assetType);
|
2020-06-16 02:05:33 +00:00
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2020-07-25 05:52:07 +00:00
|
|
|
#if HAS_SPI_FLASH_FONT
|
|
|
|
a = arrayFindStr(fonts, COUNT(fonts), card.longFilename);
|
2020-08-06 03:40:08 +00:00
|
|
|
if (a >= 0 && a < (int8_t)COUNT(fonts))
|
2020-07-25 05:52:07 +00:00
|
|
|
loadAsset(dir, d, fonts[a], ASSET_TYPE_FONT);
|
2020-06-16 02:05:33 +00:00
|
|
|
#endif
|
2020-07-01 06:30:24 +00:00
|
|
|
}
|
|
|
|
dir.rename(&root, bakPath);
|
2020-06-16 02:05:33 +00:00
|
|
|
}
|
2020-07-01 06:30:24 +00:00
|
|
|
dir.close();
|
|
|
|
|
|
|
|
#if ENABLED(MARLIN_DEV_MODE)
|
|
|
|
uint8_t pic_counter = 0;
|
|
|
|
W25QXX.SPI_FLASH_BufferRead(&pic_counter, PIC_COUNTER_ADDR, 1);
|
2020-07-25 05:52:07 +00:00
|
|
|
SERIAL_ECHOLNPAIR("Total assets loaded: ", pic_counter);
|
2020-08-06 13:15:19 +00:00
|
|
|
SERIAL_ECHOLNPAIR("Total Uncompressed: ", totalSizes, ", Compressed: ", totalCompressed);
|
2020-07-01 06:30:24 +00:00
|
|
|
#endif
|
2020-06-16 02:05:33 +00:00
|
|
|
}
|
|
|
|
|
2020-07-01 06:30:24 +00:00
|
|
|
#if HAS_SPI_FLASH_FONT
|
|
|
|
void spi_flash_read_test() { W25QXX.SPI_FLASH_BufferRead(public_buf, UNIGBK_FLASH_ADDR, BMP_WRITE_BUF_LEN); }
|
2020-08-04 09:50:05 +00:00
|
|
|
#endif
|
2020-06-16 02:05:33 +00:00
|
|
|
|
2020-07-01 06:30:24 +00:00
|
|
|
#endif // SDSUPPORT
|
2020-06-16 02:05:33 +00:00
|
|
|
|
|
|
|
void Pic_Read(uint8_t *Pname, uint8_t *P_Rbuff) {
|
|
|
|
uint8_t i, j;
|
|
|
|
uint8_t Pic_cnt;
|
|
|
|
uint32_t tmp_cnt = 0;
|
|
|
|
PIC_MSG PIC;
|
|
|
|
|
|
|
|
W25QXX.SPI_FLASH_BufferRead(&Pic_cnt, PIC_COUNTER_ADDR, 1);
|
|
|
|
if (Pic_cnt == 0xff)
|
|
|
|
Pic_cnt = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < Pic_cnt; i++) {
|
|
|
|
j = 0;
|
2020-07-01 06:30:24 +00:00
|
|
|
do {
|
2020-06-16 02:05:33 +00:00
|
|
|
W25QXX.SPI_FLASH_BufferRead(&PIC.name[j], PIC_NAME_ADDR + tmp_cnt, 1);
|
|
|
|
tmp_cnt++;
|
2020-07-01 06:30:24 +00:00
|
|
|
} while (PIC.name[j++] != '\0');
|
2020-06-16 02:05:33 +00:00
|
|
|
//pic size
|
|
|
|
W25QXX.SPI_FLASH_BufferRead(PIC.size.bytes, PIC_SIZE_ADDR + i * 4, 4);
|
|
|
|
|
|
|
|
if ((strcmp((char*)Pname, (char*)PIC.name)) == 0) {
|
|
|
|
W25QXX.SPI_FLASH_BufferRead((uint8_t *)P_Rbuff, PIC_DATA_ADDR_TFT35 + i * PER_PIC_MAX_SPACE_TFT35, PIC.size.dwords);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void lv_pic_test(uint8_t *P_Rbuff, uint32_t addr, uint32_t size) {
|
2020-08-04 09:50:05 +00:00
|
|
|
#if HAS_SPI_FLASH_COMPRESSION
|
|
|
|
if (currentFlashPage == 0)
|
|
|
|
SPIFlash.beginRead(addr);
|
|
|
|
SPIFlash.readData(P_Rbuff, size);
|
|
|
|
currentFlashPage++;
|
|
|
|
#else
|
|
|
|
W25QXX.init(SPI_QUARTER_SPEED);
|
|
|
|
W25QXX.SPI_FLASH_BufferRead((uint8_t *)P_Rbuff, addr, size);
|
|
|
|
#endif
|
2020-06-16 02:05:33 +00:00
|
|
|
}
|
|
|
|
|
2020-07-01 06:30:24 +00:00
|
|
|
#if HAS_SPI_FLASH_FONT
|
|
|
|
void get_spi_flash_data(const char *rec_buf, int addr, int size) {
|
|
|
|
W25QXX.init(SPI_QUARTER_SPEED);
|
|
|
|
W25QXX.SPI_FLASH_BufferRead((uint8_t *)rec_buf, UNIGBK_FLASH_ADDR + addr, size);
|
2020-06-16 02:05:33 +00:00
|
|
|
}
|
2020-07-01 06:30:24 +00:00
|
|
|
#endif
|
2020-06-16 02:05:33 +00:00
|
|
|
|
2020-07-01 06:30:24 +00:00
|
|
|
uint32_t logo_addroffset = 0;
|
|
|
|
void Pic_Logo_Read(uint8_t *LogoName, uint8_t *Logo_Rbuff, uint32_t LogoReadsize) {
|
2020-07-25 05:52:07 +00:00
|
|
|
W25QXX.init(SPI_QUARTER_SPEED);
|
2020-07-01 06:30:24 +00:00
|
|
|
W25QXX.SPI_FLASH_BufferRead(Logo_Rbuff, PIC_LOGO_ADDR + logo_addroffset, LogoReadsize);
|
|
|
|
logo_addroffset += LogoReadsize;
|
|
|
|
if (logo_addroffset >= LOGO_MAX_SIZE_TFT35)
|
|
|
|
logo_addroffset = 0;
|
|
|
|
}
|
2020-06-16 02:05:33 +00:00
|
|
|
|
2020-07-01 06:30:24 +00:00
|
|
|
uint32_t default_view_addroffset = 0;
|
|
|
|
void default_view_Read(uint8_t *default_view_Rbuff, uint32_t default_view_Readsize) {
|
|
|
|
W25QXX.init(SPI_QUARTER_SPEED);
|
|
|
|
W25QXX.SPI_FLASH_BufferRead(default_view_Rbuff, DEFAULT_VIEW_ADDR_TFT35 + default_view_addroffset, default_view_Readsize);
|
|
|
|
default_view_addroffset += default_view_Readsize;
|
|
|
|
if (default_view_addroffset >= DEFAULT_VIEW_MAX_SIZE)
|
|
|
|
default_view_addroffset = 0;
|
|
|
|
}
|
2020-06-16 02:05:33 +00:00
|
|
|
|
2020-07-01 06:30:24 +00:00
|
|
|
#if HAS_BAK_VIEW_IN_FLASH
|
2020-06-16 02:05:33 +00:00
|
|
|
uint32_t flash_view_addroffset = 0;
|
|
|
|
void flash_view_Read(uint8_t *flash_view_Rbuff, uint32_t flash_view_Readsize) {
|
|
|
|
W25QXX.init(SPI_QUARTER_SPEED);
|
|
|
|
W25QXX.SPI_FLASH_BufferRead(flash_view_Rbuff, BAK_VIEW_ADDR_TFT35 + flash_view_addroffset, flash_view_Readsize);
|
|
|
|
flash_view_addroffset += flash_view_Readsize;
|
|
|
|
if (flash_view_addroffset >= FLASH_VIEW_MAX_SIZE)
|
|
|
|
flash_view_addroffset = 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2020-07-25 05:52:07 +00:00
|
|
|
#endif // HAS_TFT_LVGL_UI
|