From bc860252604b3fd29e828fd48a958f5007302f88 Mon Sep 17 00:00:00 2001 From: Gordon Bolton Date: Tue, 25 Jun 2024 21:41:16 +0100 Subject: [PATCH] Moved headers to /include, removed leftovers from migration from Sloeber to PlatformIO --- include/README | 39 ------ {src => include}/config.h | 0 {src => include}/devSequence.h | 0 {src => include}/display.h | 0 {src => include}/menu.h | 0 {src => include}/motor.h | 0 {src => include}/sound.h | 0 {src => include}/temperature.h | 0 {src => include}/watchdog.h | 0 lib/README | 46 ------- src/.cproject | 112 ------------------ src/.project | 75 ------------ src/.settings/language.settings.xml | 11 -- .../org.eclipse.core.resources.prefs | 2 - src/.sproject | 29 ----- 15 files changed, 314 deletions(-) delete mode 100644 include/README rename {src => include}/config.h (100%) rename {src => include}/devSequence.h (100%) rename {src => include}/display.h (100%) rename {src => include}/menu.h (100%) rename {src => include}/motor.h (100%) rename {src => include}/sound.h (100%) rename {src => include}/temperature.h (100%) rename {src => include}/watchdog.h (100%) delete mode 100644 lib/README delete mode 100644 src/.cproject delete mode 100644 src/.project delete mode 100644 src/.settings/language.settings.xml delete mode 100644 src/.settings/org.eclipse.core.resources.prefs delete mode 100644 src/.sproject diff --git a/include/README b/include/README deleted file mode 100644 index 194dcd4..0000000 --- a/include/README +++ /dev/null @@ -1,39 +0,0 @@ - -This directory is intended for project header files. - -A header file is a file containing C declarations and macro definitions -to be shared between several project source files. You request the use of a -header file in your project source file (C, C++, etc) located in `src` folder -by including it, with the C preprocessing directive `#include'. - -```src/main.c - -#include "header.h" - -int main (void) -{ - ... -} -``` - -Including a header file produces the same results as copying the header file -into each source file that needs it. Such copying would be time-consuming -and error-prone. With a header file, the related declarations appear -in only one place. If they need to be changed, they can be changed in one -place, and programs that include the header file will automatically use the -new version when next recompiled. The header file eliminates the labor of -finding and changing all the copies as well as the risk that a failure to -find one copy will result in inconsistencies within a program. - -In C, the usual convention is to give header files names that end with `.h'. -It is most portable to use only letters, digits, dashes, and underscores in -header file names, and at most one dot. - -Read more about using header files in official GCC documentation: - -* Include Syntax -* Include Operation -* Once-Only Headers -* Computed Includes - -https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html diff --git a/src/config.h b/include/config.h similarity index 100% rename from src/config.h rename to include/config.h diff --git a/src/devSequence.h b/include/devSequence.h similarity index 100% rename from src/devSequence.h rename to include/devSequence.h diff --git a/src/display.h b/include/display.h similarity index 100% rename from src/display.h rename to include/display.h diff --git a/src/menu.h b/include/menu.h similarity index 100% rename from src/menu.h rename to include/menu.h diff --git a/src/motor.h b/include/motor.h similarity index 100% rename from src/motor.h rename to include/motor.h diff --git a/src/sound.h b/include/sound.h similarity index 100% rename from src/sound.h rename to include/sound.h diff --git a/src/temperature.h b/include/temperature.h similarity index 100% rename from src/temperature.h rename to include/temperature.h diff --git a/src/watchdog.h b/include/watchdog.h similarity index 100% rename from src/watchdog.h rename to include/watchdog.h diff --git a/lib/README b/lib/README deleted file mode 100644 index 2593a33..0000000 --- a/lib/README +++ /dev/null @@ -1,46 +0,0 @@ - -This directory is intended for project specific (private) libraries. -PlatformIO will compile them to static libraries and link into executable file. - -The source code of each library should be placed in an own separate directory -("lib/your_library_name/[here are source files]"). - -For example, see a structure of the following two libraries `Foo` and `Bar`: - -|--lib -| | -| |--Bar -| | |--docs -| | |--examples -| | |--src -| | |- Bar.c -| | |- Bar.h -| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html -| | -| |--Foo -| | |- Foo.c -| | |- Foo.h -| | -| |- README --> THIS FILE -| -|- platformio.ini -|--src - |- main.c - -and a contents of `src/main.c`: -``` -#include -#include - -int main (void) -{ - ... -} - -``` - -PlatformIO Library Dependency Finder will find automatically dependent -libraries scanning project source files. - -More information about PlatformIO Library Dependency Finder -- https://docs.platformio.org/page/librarymanager/ldf.html diff --git a/src/.cproject b/src/.cproject deleted file mode 100644 index 7f5fb0d..0000000 --- a/src/.cproject +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/.project b/src/.project deleted file mode 100644 index 322346a..0000000 --- a/src/.project +++ /dev/null @@ -1,75 +0,0 @@ - - - AutoFilmESP32 - - - - - - io.sloeber.core.inoToCpp - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.core.ccnature - io.sloeber.arduinonature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - - core/core - 2 - ECLIPSE_HOME/arduinoPlugin/packages/esp32/hardware/esp32/3.0.1/cores/esp32 - - - core/variant - 2 - ECLIPSE_HOME/arduinoPlugin/packages/esp32/hardware/esp32/3.0.1/variants/esp32 - - - libraries/AccelStepper - 2 - C:/Users/gordon/Documents/Arduino/libraries/AccelStepper - - - libraries/DallasTemperature - 2 - C:/Users/gordon/Documents/Arduino/libraries/DallasTemperature - - - libraries/Keypad - 2 - C:/Users/gordon/Documents/Arduino/libraries/Keypad - - - libraries/LiquidCrystal_I2C - 2 - C:/Users/gordon/Documents/Arduino/libraries/LiquidCrystal_I2C - - - libraries/OneWire - 2 - C:/Users/gordon/Documents/Arduino/libraries/OneWire - - - libraries/Wire - 2 - ECLIPSE_HOME/arduinoPlugin/packages/esp32/hardware/esp32/3.0.1/libraries/Wire - - - diff --git a/src/.settings/language.settings.xml b/src/.settings/language.settings.xml deleted file mode 100644 index 842132e..0000000 --- a/src/.settings/language.settings.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/.settings/org.eclipse.core.resources.prefs b/src/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/src/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/src/.sproject b/src/.sproject deleted file mode 100644 index 7ef5964..0000000 --- a/src/.sproject +++ /dev/null @@ -1,29 +0,0 @@ -Config.Release.board.BOARD.ID=esp32 -Config.Release.board.BOARD.MENU.CPUFreq=240 -Config.Release.board.BOARD.MENU.DebugLevel=error -Config.Release.board.BOARD.MENU.EraseFlash=none -Config.Release.board.BOARD.MENU.EventsCore=0 -Config.Release.board.BOARD.MENU.FlashFreq=80 -Config.Release.board.BOARD.MENU.FlashMode=qio -Config.Release.board.BOARD.MENU.FlashSize=4M -Config.Release.board.BOARD.MENU.JTAGAdapter=bridge -Config.Release.board.BOARD.MENU.LoopCore=1 -Config.Release.board.BOARD.MENU.PSRAM=enabled -Config.Release.board.BOARD.MENU.PartitionScheme=default -Config.Release.board.BOARD.MENU.UploadSpeed=921600 -Config.Release.board.BOARD.MENU.ZigbeeMode=default -Config.Release.board.BOARD.TXT=C:\Users\gordon\Sloeber\arduinoPlugin\packages\esp32\hardware\esp32\3.0.1\boards.txt -Config.Release.board.PROGRAMMER.NAME=Esptool -Config.Release.board.UPLOAD.PORT=COM10 -Config.Release.compile.sloeber.extra.all= -Config.Release.compile.sloeber.extra.archive= -Config.Release.compile.sloeber.extra.assembly= -Config.Release.compile.sloeber.extra.c.compile= -Config.Release.compile.sloeber.extra.compile= -Config.Release.compile.sloeber.extra.cpp.compile= -Config.Release.compile.sloeber.extra.link= -Config.Release.compile.sloeber.size.custom= -Config.Release.compile.sloeber.size.type=RAW_RESULT -Config.Release.compile.sloeber.warning_level=NONE -Config.Release.compile.sloeber.warning_level.custom= -Config.Release.other.IS_VERSION_CONTROLLED=false