Browse Source

Prevent 'I2C_EEPROM' on LPC176x

Scott Lahteine 5 years ago
parent
commit
d666ef00e0

+ 0
- 26
Marlin/src/HAL/LPC1768/eeprom_api.h View File

@@ -1,26 +0,0 @@
1
-/**
2
- * Marlin 3D Printer Firmware
3
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
- *
5
- * Based on Sprinter and grbl.
6
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7
- *
8
- * This program is free software: you can redistribute it and/or modify
9
- * it under the terms of the GNU General Public License as published by
10
- * the Free Software Foundation, either version 3 of the License, or
11
- * (at your option) any later version.
12
- *
13
- * This program is distributed in the hope that it will be useful,
14
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
- * GNU General Public License for more details.
17
- *
18
- * You should have received a copy of the GNU General Public License
19
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
- *
21
- */
22
-#pragma once
23
-
24
-#include "../shared/eeprom_api.h"
25
-
26
-#define FLASH_EEPROM_EMULATION

+ 1
- 1
Marlin/src/HAL/LPC1768/eeprom_flash.cpp View File

@@ -40,7 +40,7 @@
40 40
 
41 41
 #if ENABLED(FLASH_EEPROM_EMULATION)
42 42
 
43
-#include "eeprom_api.h"
43
+#include "../shared/eeprom_api.h"
44 44
 
45 45
 extern "C" {
46 46
   #include <lpc17xx_iap.h>

+ 1
- 1
Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp View File

@@ -26,7 +26,7 @@
26 26
 
27 27
 #if ENABLED(SDCARD_EEPROM_EMULATION)
28 28
 
29
-#include "eeprom_api.h"
29
+#include "../shared/eeprom_api.h"
30 30
 
31 31
 #include <chanfs/diskio.h>
32 32
 #include <chanfs/ff.h>

+ 3
- 1
Marlin/src/HAL/LPC1768/inc/Conditionals_post.h View File

@@ -21,6 +21,8 @@
21 21
  */
22 22
 #pragma once
23 23
 
24
-#if USE_FALLBACK_EEPROM && NONE(SDCARD_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
24
+#undef I2C_EEPROM // Arduino framework provides code for I2C
25
+
26
+#if USE_FALLBACK_EEPROM
25 27
   #define FLASH_EEPROM_EMULATION
26 28
 #endif

Loading…
Cancel
Save