zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Clean up W25QXXFlash class

Browse source
This commit is contained in:
Scott Lahteine 2020-09-10 17:34:41 -05:00
parent a2a53406c8
commit ade9476721
6 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/gcode/control/M993_M994.cpp
View file

@ -41,8 +41,6 @@ void GcodeSuite::M993() {
return; return;
} }
W25QXXFlash W25QXX;
uint8_t buf[1024]; uint8_t buf[1024];
uint32_t addr = 0; uint32_t addr = 0;
W25QXX.init(SPI_QUARTER_SPEED); W25QXX.init(SPI_QUARTER_SPEED);
@ -71,8 +69,6 @@ void GcodeSuite::M994() {
return; return;
} }
W25QXXFlash W25QXX;
uint8_t buf[1024]; uint8_t buf[1024];
uint32_t addr = 0; uint32_t addr = 0;
W25QXX.init(SPI_QUARTER_SPEED); W25QXX.init(SPI_QUARTER_SPEED);

2
Marlin/src/lcd/extui/lib/mks_ui/SPIFlashStorage.cpp
View file

@ -27,8 +27,6 @@
#include "../../../../inc/MarlinConfig.h" #include "../../../../inc/MarlinConfig.h"
#include "SPIFlashStorage.h" #include "SPIFlashStorage.h"
extern W25QXXFlash W25QXX;
uint8_t SPIFlashStorage::m_pageData[SPI_FLASH_PageSize]; uint8_t SPIFlashStorage::m_pageData[SPI_FLASH_PageSize];
uint32_t SPIFlashStorage::m_currentPage; uint32_t SPIFlashStorage::m_currentPage;
uint16_t SPIFlashStorage::m_pageDataUsed; uint16_t SPIFlashStorage::m_pageDataUsed;

1
Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp
View file

@ -49,7 +49,6 @@
#include "../../../../feature/pause.h" #include "../../../../feature/pause.h"
#endif #endif
W25QXXFlash W25QXX;
CFG_ITMES gCfgItems; CFG_ITMES gCfgItems;
UI_CFG uiCfg; UI_CFG uiCfg;
DISP_STATE_STACK disp_state_stack; DISP_STATE_STACK disp_state_stack;

2
Marlin/src/lcd/extui/lib/mks_ui/pic_manager.h
View file

@ -156,8 +156,6 @@ extern void spi_flash_read_test();
extern void default_view_Read(uint8_t *default_view_Rbuff, uint32_t default_view_Readsize); 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); extern void flash_view_Read(uint8_t *flash_view_Rbuff, uint32_t flash_view_Readsize);
extern W25QXXFlash W25QXX;
#ifdef __cplusplus #ifdef __cplusplus
} /* C-declarations for C++ */ } /* C-declarations for C++ */
#endif #endif

3
Marlin/src/libs/W25Qxx.cpp
View file

@ -24,9 +24,10 @@
#if HAS_SPI_FLASH #if HAS_SPI_FLASH
#include "W25Qxx.h"
#include <SPI.h> #include <SPI.h>
#include "W25Qxx.h" W25QXXFlash W25QXX;
#ifndef SPI_FLASH_MISO_PIN #ifndef SPI_FLASH_MISO_PIN
#define SPI_FLASH_MISO_PIN W25QXX_MISO_PIN #define SPI_FLASH_MISO_PIN W25QXX_MISO_PIN

10
Marlin/src/libs/W25Qxx.h
View file

@ -1,4 +1,4 @@
/** /**
* Marlin 3D Printer Firmware * Marlin 3D Printer Firmware
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* *
@ -21,10 +21,6 @@
*/ */
#pragma once #pragma once
//#ifdef __cplusplus
//extern "C" { /* C-declarations for C++ */
//#endif
#include <stdint.h> #include <stdint.h>
#define W25X_WriteEnable 0x06 #define W25X_WriteEnable 0x06
@ -71,6 +67,4 @@ public:
static void SPI_FLASH_BufferRead(uint8_t* pBuffer, uint32_t ReadAddr, uint16_t NumByteToRead); static void SPI_FLASH_BufferRead(uint8_t* pBuffer, uint32_t ReadAddr, uint16_t NumByteToRead);
}; };
//#ifdef __cplusplus extern W25QXXFlash W25QXX;
//} /* C-declarations for C++ */
//#endif