PlatformIO compatibility

carlk3 · Feb 7, 2023 · b15bab9 · b15bab9
1 parent 469e343
commit b15bab9
Show file tree

Hide file tree

Showing 65 changed files with 33 additions and 94 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/FatFs_SPI b/FatFs_SPI
diff --git a/FatFs_SPI b/FatFs_SPI
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/examples/dynamic_config_example/CMakeLists.txt b/examples/dynamic_config_example/CMakeLists.txt
diff --git a/examples/dynamic_config_example/dynamic_config_example.cpp b/examples/dynamic_config_example/dynamic_config_example.cpp
@@ -111,6 +111,7 @@ int main() {
     add_sd_card(p_sd_card);
 
     /* Add another SD card */
+//FIXME: This is broken because SDIO_CLK_GPIO is set statically in sd_driver/SDIO/rp2040_sdio.pio!
     p_sd_card = new sd_card_t;
     if (!p_sd_card) panic("Out of memory");
     memset(p_sd_card, 0, sizeof(sd_card_t));

diff --git a/examples/dynamic_config_example/pico_sdk_import.cmake b/examples/dynamic_config_example/pico_sdk_import.cmake
diff --git a/examples/dynamic_config_example/thing_plus.dynamic_config_example.cpp b/examples/dynamic_config_example/thing_plus.dynamic_config_example.cpp
diff --git a/examples/example/CMakeLists.txt b/examples/example/CMakeLists.txt
diff --git a/examples/example/FatFS_SPI_example.cpp b/examples/example/FatFS_SPI_example.cpp
diff --git a/examples/example/data_log_demo.c b/examples/example/data_log_demo.c
diff --git a/examples/example/hw_config.c b/examples/example/hw_config.c
diff --git a/examples/example/maker_pi_pico.hw_config.c b/examples/example/maker_pi_pico.hw_config.c
diff --git a/examples/example/pico_sdk_import.cmake b/examples/example/pico_sdk_import.cmake
diff --git a/examples/example/tests/CreateAndVerifyExampleFiles.c b/examples/example/tests/CreateAndVerifyExampleFiles.c
diff --git a/examples/example/tests/app4-IO_module_function_checker.c b/examples/example/tests/app4-IO_module_function_checker.c
diff --git a/examples/example/tests/big_file_test.c b/examples/example/tests/big_file_test.c
diff --git a/examples/example/tests/ff_stdio_tests_with_cwd.c b/examples/example/tests/ff_stdio_tests_with_cwd.c
diff --git a/examples/example/tests/simple.c b/examples/example/tests/simple.c
diff --git a/examples/example/thing_plus.hw_config.c b/examples/example/thing_plus.hw_config.c
diff --git a/examples/simple_example/CMakeLists.txt b/examples/simple_example/CMakeLists.txt
diff --git a/examples/simple_example/hw_config.c b/examples/simple_example/hw_config.c
diff --git a/examples/simple_example/pico_sdk_import.cmake b/examples/simple_example/pico_sdk_import.cmake
diff --git a/examples/simple_example/simple_example.cpp b/examples/simple_example/simple_example.cpp
diff --git a/examples/simple_example/thing_plus.hw_config.c b/examples/simple_example/thing_plus.hw_config.c
diff --git a/include/FatFsSd.h b/include/FatFsSd.h
@@ -0,0 +1,31 @@
+/* FatFsSd.h
+Copyright 2023 Carl John Kugler III
+
+Licensed under the Apache License, Version 2.0 (the License); you may not use 
+this file except in compliance with the License. You may obtain a copy of the 
+License at
+
+   http://www.apache.org/licenses/LICENSE-2.0 
+Unless required by applicable law or agreed to in writing, software distributed 
+under the License is distributed on an AS IS BASIS, WITHOUT WARRANTIES OR 
+CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+specific language governing permissions and limitations under the License.
+*/
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "../src/include/f_util.h"
+#include "../src/ff15/source/ff.h"
+#include "../src/include/rtc.h"
+//
+#include "../src/ff15/source/diskio.h" /* Declarations of disk functions */
+//
+#include "../src/sd_driver/SDIO/rp2040_sdio.h"
+// #include "rp2040_sdio.pio.h"
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/include/ff.h b/include/ff.h
diff --git a/include/ffconf.h b/include/ffconf.h
diff --git a/library.json b/library.json
@@ -1,5 +1,5 @@
 {
-    "name": "FatFsSd",
+    "name": "no-OS-FatFS-SD-SPI-RPi-Pico",
     "version": "1.0.0",
     "description": "Simple library for SD Cards on the RP2040",
     "keywords": ["Data Storage", "FatFs", "SD card", "Secure Digital card", "SPI", "SDIO"],

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
diff --git a/src/SdFat/LICENSE.md b/src/SdFat/LICENSE.md
diff --git a/src/SdFat/README.md b/src/SdFat/README.md
diff --git a/src/SdFat/SdCardInfo.h b/src/SdFat/SdCardInfo.h
diff --git a/src/SdFat/bench.c b/src/SdFat/bench.c
diff --git a/src/include/f_util.h b/src/include/f_util.h
diff --git a/src/include/ff_stdio.h b/src/include/ff_stdio.h
diff --git a/src/include/ffconf.h b/src/include/ffconf.h
diff --git a/src/include/ffconf.h b/src/include/ffconf.h
diff --git a/src/include/my_debug.h b/src/include/my_debug.h
diff --git a/src/include/rtc.h b/src/include/rtc.h
diff --git a/src/include/util.h b/src/include/util.h
diff --git a/src/sd_driver/SDIO/LICENSE b/src/sd_driver/SDIO/LICENSE
diff --git a/src/sd_driver/SDIO/README.md b/src/sd_driver/SDIO/README.md
diff --git a/src/sd_driver/SDIO/SdioCard.h b/src/sd_driver/SDIO/SdioCard.h
diff --git a/src/sd_driver/SDIO/ZuluSCSI_platform.h b/src/sd_driver/SDIO/ZuluSCSI_platform.h
diff --git a/src/sd_driver/SDIO/rp2040_sdio.c b/src/sd_driver/SDIO/rp2040_sdio.c
diff --git a/src/sd_driver/SDIO/rp2040_sdio.h b/src/sd_driver/SDIO/rp2040_sdio.h
diff --git a/src/sd_driver/SDIO/rp2040_sdio.pio b/src/sd_driver/SDIO/rp2040_sdio.pio
diff --git a/src/sd_driver/SDIO/sd_card_sdio.c b/src/sd_driver/SDIO/sd_card_sdio.c
diff --git a/src/sd_driver/SPI/crc.c b/src/sd_driver/SPI/crc.c
diff --git a/src/sd_driver/SPI/crc.h b/src/sd_driver/SPI/crc.h
diff --git a/src/sd_driver/SPI/sd_card_constants.h b/src/sd_driver/SPI/sd_card_constants.h
diff --git a/src/sd_driver/SPI/sd_card_spi.c b/src/sd_driver/SPI/sd_card_spi.c
diff --git a/src/sd_driver/SPI/sd_card_spi.h b/src/sd_driver/SPI/sd_card_spi.h
diff --git a/src/sd_driver/SPI/sd_spi.c b/src/sd_driver/SPI/sd_spi.c
diff --git a/src/sd_driver/SPI/sd_spi.h b/src/sd_driver/SPI/sd_spi.h
diff --git a/src/sd_driver/SPI/spi.c b/src/sd_driver/SPI/spi.c
diff --git a/src/sd_driver/SPI/spi.h b/src/sd_driver/SPI/spi.h
diff --git a/src/sd_driver/hw_config.h b/src/sd_driver/hw_config.h
diff --git a/src/sd_driver/sd_card.c b/src/sd_driver/sd_card.c
diff --git a/src/sd_driver/sd_card.h b/src/sd_driver/sd_card.h
diff --git a/src/src/f_util.c b/src/src/f_util.c
diff --git a/src/src/ff_stdio.c b/src/src/ff_stdio.c
diff --git a/src/src/glue.c b/src/src/glue.c
diff --git a/src/src/my_debug.c b/src/src/my_debug.c
diff --git a/src/src/rtc.c b/src/src/rtc.c