Отключение WIFI

Marlin/src/libs/Segger/log.h

@@ -3,10 +3,10 @@
 #include "SEGGER_RTT.h"
 #include "../../module/mks_wifi/debug_to_uart.h"
 
-#define DEBUG_MSG
-#define INFO_MSG
-#define WARNING_MSG
-#define ERROR_MSG
+//#define DEBUG_MSG
+//#define INFO_MSG
+//#define WARNING_MSG
+//#define ERROR_MSG
 
 //#define COLOR_LOG_RTT 
 

Marlin/src/libs/fatfs/diskio.cpp

@@ -9,6 +9,7 @@
 
 
 #include "diskio.h"		/* FatFs lower layer API */
+#ifdef MKS_WIFI
 
 volatile uint8_t __attribute__ ((aligned (4))) buf_copy[512];
 
@@ -220,3 +221,4 @@ DWORD get_fattime (void) {
 };
 
 
+#endif

Marlin/src/libs/fatfs/diskio.h

@@ -2,6 +2,7 @@
 /  Low level disk interface modlue include file   (C)ChaN, 2014          /
 /-----------------------------------------------------------------------*/
 
+
 #ifndef _DISKIO_DEFINED
 #define _DISKIO_DEFINED
 
@@ -13,6 +14,8 @@
 #include "sdio_driver.h"
 #include "../../MarlinCore.h"
 
+#ifdef MKS_WIFI
+
 /* Status of Disk Functions */
 typedef BYTE	DSTATUS;
 
@@ -79,3 +82,5 @@ DRESULT disk_ioctl (BYTE pdrv, BYTE cmd, void* buff);
 // #endif
 
 #endif
+
+#endif

Marlin/src/libs/fatfs/fatfs_shared.cpp

@@ -4,4 +4,3 @@ FRESULT res;
 FATFS FATFS_Obj;
 DIR dir;
 FILINFO fno;
-

Marlin/src/libs/fatfs/fatfs_shared.h

@@ -9,5 +9,4 @@ extern DIR dir;
 extern FILINFO fno;
 
 
-
 #endif

Marlin/src/libs/fatfs/ff.cpp

@@ -18,11 +18,9 @@
 /
 /----------------------------------------------------------------------------*/
 
-
 #include "ff.h"			/* Declarations of FatFs API */
 #include "diskio.h"		/* Declarations of device I/O functions */
-
-
+#ifdef MKS_WIFI
 /*--------------------------------------------------------------------------
 
    Module Private Definitions
@@ -6859,4 +6857,4 @@ FRESULT f_setcp (
 	return FR_OK;
 }
 #endif	/* FF_CODE_PAGE == 0 */
-
+#endif

Marlin/src/libs/fatfs/ff.h

@@ -28,6 +28,7 @@
 
 #include "ffconf.h"		/* FatFs configuration options */
 
+
 #if FF_DEFINED != FFCONF_DEF
 #error Wrong configuration file (ffconf.h).
 #endif

Marlin/src/libs/fatfs/sdio_driver.cpp

@@ -1,4 +1,5 @@
 #include "sdio_driver.h"
+#ifdef MKS_WIFI
 
 volatile SDCard_TypeDef SDCard;
 volatile SD_Status_TypeDef SDStatus;
@@ -296,3 +297,4 @@ void SD_parse_CSD(uint32_t* reg){
 	SDCard.Capacity=(tmp+1)*512;
 };
 
+#endif

Marlin/src/libs/fatfs/sdio_driver.h

@@ -2,6 +2,7 @@
 #define SDIO_DRIVER_H
 
 #include "../../module/mks_wifi/small_cmsis.h"
+#ifdef MKS_WIFI
 
 // SD card description
 typedef struct {
@@ -153,4 +154,6 @@ uint32_t SD_transfer(uint8_t *buf, uint32_t blk, uint32_t cnt, uint32_t dir);
 uint8_t SD_Init(void);
 //void SDIO_Config(void);
 
+#endif
+
 #endif

Marlin/src/module/mks_wifi/dwt.cpp

@@ -1,5 +1,8 @@
 #include "dwt.h"
 
+#include "../../MarlinCore.h"
+#include "../../inc/MarlinConfig.h"
+
 volatile uint32_t timeout;
 
 /*

Marlin/src/module/mks_wifi/mkf_test_sdio.cpp

@@ -1,10 +1,12 @@
 #include "mks_test_sdio.h"
+
 #include "../../MarlinCore.h"
 #include "../../inc/MarlinConfig.h"
 #include "../../libs/Segger/log.h"
 #include "../../sd/cardreader.h"
 #ifdef MKS_WIFI
 
+
 void mks_test_sdio(void){
     uint8_t data[512];
     CardReader::mount();

Marlin/src/module/mks_wifi/mks_test_sdio.h

@@ -1,6 +1,7 @@
 #ifndef MKS_WIFI_SDIOTEST_H
 #define MKS_WIFI_SDIOTEST_H
 #ifdef MKS_WIFI
+
 void mks_test_sdio(void);
 #endif
 #endif

Marlin/src/module/mks_wifi/mks_wifi.cpp

@@ -1,6 +1,7 @@
 #include "mks_wifi.h"
 #ifdef MKS_WIFI
 
+
 #include "../../lcd/ultralcd.h"
 #include "mks_wifi_sd.h"
 #include "mks_test_sdio.h"

Marlin/src/module/mks_wifi/mks_wifi.h

@@ -8,6 +8,7 @@
 
 #ifdef MKS_WIFI
 
+
 #define MKS_OUT_BUFF_SIZE (ESP_PACKET_DATA_MAX_SIZE)
 #define MKS_IN_BUFF_SIZE (ESP_PACKET_DATA_MAX_SIZE + 30)
 

Marlin/src/module/mks_wifi/mks_wifi_gcodes.cpp

@@ -1,6 +1,8 @@
+
 #include "mks_wifi_gcodes.h"
 #ifdef MKS_WIFI
 
+
 const uint8_t pak[5]={0xA5,0x07,0x00,0x00,0xFC};
 
 const char m997_idle[]="M997 IDLE\n";

Marlin/src/module/mks_wifi/mks_wifi_gcodes.h

@@ -1,3 +1,4 @@
+
 #ifndef MKS_WIFI_GCODES_H
 #define MKS_WIFI_GCODES_H
 
@@ -9,6 +10,7 @@
 
 #ifdef MKS_WIFI
 
+
 void mks_m991(void);
 void mks_m997(void);
 void mks_m115(void);

Marlin/src/module/mks_wifi/mks_wifi_sd.cpp

@@ -1,13 +1,13 @@
 #include "mks_wifi_sd.h"
 
-#ifdef MKS_WIFI
-
 #include "../../lcd/ultralcd.h"
 #include "../../libs/fatfs/ff.h"
 #include "../../libs/buzzer.h"  
 #include "../temperature.h"
 #include "../../libs/fatfs/fatfs_shared.h"
 
+#ifdef MKS_WIFI
+
 volatile uint8_t *file_buff=shared_mem;
 volatile uint8_t *file_buff_pos;
 volatile uint16_t file_data_size;

Marlin/src/module/mks_wifi/mks_wifi_sd.h

@@ -1,16 +1,14 @@
 #ifndef MKS_WIFI_SD_H
 #define MKS_WIFI_SD_H
 #include "mks_wifi.h"
-
-#ifdef MKS_WIFI
-
-#define DMA_TIMEOUT 0xFffffff
-
 #include "../../sd/cardreader.h"
 #include "small_cmsis.h"
 
 #include "../shared_mem/shared_mem.h"
 
+#ifdef MKS_WIFI
+
+#define DMA_TIMEOUT 0xFffffff
 #define ESP_PACKET_SIZE     1024
 
 //Под буфер для DMA два последних КБ из буфера

Marlin/src/module/mks_wifi/mks_wifi_settings.h

@@ -1,3 +1,5 @@
+#ifdef MKS_WIFI
+
 #ifndef MKS_WIFI_SETTINGS_H
 #define MKS_WIFI_SETTINGS_H
 
@@ -7,3 +9,5 @@
 #define MKS_WIFI_KEY					"password"
 
 #endif
+
+#endif

Marlin/src/module/mks_wifi/small_cmsis.h

@@ -1836,4 +1836,4 @@ typedef struct
 #define SPI_CRCPR_CRCPOLY                   SPI_CRCPR_CRCPOLY_Msk              /*!< CRC polynomial register */
 
 
-#endif
+#endif