SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix compiling error BIGTREE_SKR_MINI (#15197)

Browse source 
Let's get STM32F1 working again!
This commit is contained in:
Ludy 2019-09-09 17:34:54 +02:00 committed by Roxy-3D
parent 565a0e11ed
commit 3c3a956a17
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Marlin/src/HAL/HAL_STM32F1/onboard_sd.cpp
View file

@ -1,23 +1,23 @@
/*------------------------------------------------------------------------*/ /**
/* STM32F1: MMCv3/SDv1/SDv2 (SPI mode) control module */ * STM32F1: MMCv3/SDv1/SDv2 (SPI mode) control module
/*------------------------------------------------------------------------*/ *
/* * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
/ * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Copyright (c) 2019 BigTreeTech [https://github.com/bigtreetech]
/ * Copyright (c) 2019 BigTreeTech [https://github.com/bigtreetech] * Copyright (C) 2015, ChaN, all right reserved.
/ * Copyright (C) 2015, ChaN, all right reserved. *
/ * This software is a free software and there is NO WARRANTY.
/ * This software is a free software and there is NO WARRANTY. * No restriction on use. You can use, modify and redistribute it for
/ * No restriction on use. You can use, modify and redistribute it for * personal, non-profit or commercial products UNDER YOUR RESPONSIBILITY.
/ personal, non-profit or commercial products UNDER YOUR RESPONSIBILITY. * Redistributions of source code must retain the above copyright notice.
/ * Redistributions of source code must retain the above copyright notice. *
/ */
/-------------------------------------------------------------------------*/
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"
#ifdef HAS_ONBOARD_SD #ifdef HAS_ONBOARD_SD
#include "onboard_sd.h" #include "onboard_sd.h"
#include "spi.h" #include "SPI.h"
#include "fastio.h" #include "fastio.h"
#ifdef SHARED_SD_CARD #ifdef SHARED_SD_CARD
@ -26,7 +26,7 @@
#endif #endif
#define ONBOARD_SD_SPI SPI #define ONBOARD_SD_SPI SPI
#else #else
SPIClass OnBoardSPI(ON_BOARD_SPI_DEVICE) SPIClass OnBoardSPI(ON_BOARD_SPI_DEVICE);
#define ONBOARD_SD_SPI OnBoardSPI #define ONBOARD_SD_SPI OnBoardSPI
#endif #endif
@ -46,8 +46,6 @@
Module Private Functions Module Private Functions
---------------------------------------------------------------------------*/ ---------------------------------------------------------------------------*/
#include "onboard_sd.h"
/* MMC/SD command */ /* MMC/SD command */
#define CMD0 (0) /* GO_IDLE_STATE */ #define CMD0 (0) /* GO_IDLE_STATE */
#define CMD1 (1) /* SEND_OP_COND (MMC) */ #define CMD1 (1) /* SEND_OP_COND (MMC) */

2
Marlin/src/lcd/dogm/status_screen_DOGM.cpp
View file

@ -271,6 +271,8 @@ FORCE_INLINE void _draw_heater_status(const heater_ind_t heater, const bool blin
#endif #endif
#if HAS_HEATED_CHAMBER #if HAS_HEATED_CHAMBER
if (dodraw) _draw_centered_temp(target + 0.5, STATUS_CHAMBER_TEXT_X, 7); if (dodraw) _draw_centered_temp(target + 0.5, STATUS_CHAMBER_TEXT_X, 7);
#else
UNUSED(dodraw);
#endif #endif
} }
if (PAGE_CONTAINS(28 - INFO_FONT_ASCENT, 28 - 1)) if (PAGE_CONTAINS(28 - INFO_FONT_ASCENT, 28 - 1))

2
Marlin/src/pins/stm32/pins_BIGTREE_SKR_MINI_V1_1.h
View file

@ -173,7 +173,7 @@
#define MISO_PIN PB4 #define MISO_PIN PB4
#define MOSI_PIN PB5 #define MOSI_PIN PB5
#define SS_PIN PA15 #define SS_PIN PA15
#if SD_CONNECTION_IS(ONBOARD) #elif SD_CONNECTION_IS(ONBOARD)
#define ENABLE_SPI1 #define ENABLE_SPI1
#define SD_DETECT_PIN PA3 #define SD_DETECT_PIN PA3
#define SCK_PIN PA5 #define SCK_PIN PA5