Merge pull request #216 from mwinters-stuff/main

Fixes CMakeLists.txt to properly import the paths into any location. pico-sdk compatible.
TcMenu · Jan 25, 2025 · b511041 · b511041
2 parents 07b6dec + fce9e8f
commit b511041
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 20 deletions.
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -1,3 +1,5 @@
+cmake_minimum_required(VERSION 3.13)
+
 add_library(IoAbstraction
         ../src/EepromAbstraction.cpp
         ../src/EepromAbstractionWire.cpp
@@ -17,7 +19,7 @@ target_compile_definitions(IoAbstraction
 )
 
 target_include_directories(IoAbstraction PUBLIC
-        ${PROJECT_SOURCE_DIR}/lib/IoAbstraction/src
+        ../src
 )
 
 target_link_libraries(IoAbstraction PUBLIC

diff --git a/src/AnalogDeviceAbstraction.h b/src/AnalogDeviceAbstraction.h
@@ -7,7 +7,7 @@
 #define _ANALOG_DEVICE_ABSTRACTION_H_
 
 #include "PlatformDetermination.h"
-#include <BasicIoAbstraction.h>
+#include "BasicIoAbstraction.h"
 
 /**
  * @file AnalogDeviceAbstraction.h

diff --git a/src/DeviceEvents.h b/src/DeviceEvents.h
@@ -11,9 +11,9 @@
  * @brief This file contains events that are associated with the device, such as the Analog Device.
  */
 
-#include "TaskManagerIO.h"
-#include "PlatformDetermination.h"
-#include "AnalogDeviceAbstraction.h"
+#include <TaskManagerIO.h>
+#include <PlatformDetermination.h>
+#include <AnalogDeviceAbstraction.h>
 
 /**
  * An event that triggers when a certain analog condition is reached, based on a made and a threshold. It can either

diff --git a/src/EepromAbstraction.cpp b/src/EepromAbstraction.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 2018 https://www.thecoderscorner.com (Dave Cherry).
  * This product is licensed under an Apache license, see the LICENSE file in the top-level directory.
  */
-#include <EepromAbstraction.h>
+#include "EepromAbstraction.h"
 
 #ifdef __AVR__
 

diff --git a/src/EepromAbstractionWire.cpp b/src/EepromAbstractionWire.cpp
@@ -4,8 +4,8 @@
  */
 
 #include "PlatformDetermination.h"
-#include "IoLogging.h"
-#include <EepromAbstractionWire.h>
+#include <IoLogging.h>
+#include "EepromAbstractionWire.h"
 
 #ifdef WIRE_BUFFER_SIZE
 # define MAX_BUFFER_SIZE_TO_USE WIRE_BUFFER_SIZE

diff --git a/src/EepromAbstractionWire.h b/src/EepromAbstractionWire.h
@@ -13,7 +13,7 @@
 
 #include "PlatformDeterminationWire.h"
 #include "EepromAbstraction.h"
-#include <TaskManager.h>
+#include "TaskManager.h"
 
 /**
  * Defines all the variants of the chip that we can pass to the I2cAt24Eeprom constructor. From this we can determine

diff --git a/src/KeyboardManager.cpp b/src/KeyboardManager.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "KeyboardManager.h"
-#include "IoLogging.h"
+#include <IoLogging.h>
 
 MatrixKeyboardManager* MatrixKeyboardManager::INSTANCE = nullptr;
 

diff --git a/src/MockEepromAbstraction.h b/src/MockEepromAbstraction.h
@@ -2,7 +2,7 @@
 #define _MOCK_EEPROM_ABSTRACTION_H_
 
 #include "EepromAbstraction.h"
-#include "IoLogging.h"
+#include <IoLogging.h>
 
 /**
  * @ file MockEepromAbstraction.h

diff --git a/src/MockIoAbstraction.h b/src/MockIoAbstraction.h
@@ -12,7 +12,7 @@
  * Neither of the implementations in this file are designed for use in production.
  */
 
-#include <IoAbstraction.h>
+#include "IoAbstraction.h"
 
 /**
  * During any call to the mock version of IoAbstraction, any error detected

diff --git a/src/ResistiveTouchScreen.cpp b/src/ResistiveTouchScreen.cpp
@@ -1,5 +1,5 @@
 #include "ResistiveTouchScreen.h"
-#include <SwitchInput.h>
+#include "SwitchInput.h"
 
 namespace iotouch {
 

diff --git a/src/SwitchInput.cpp b/src/SwitchInput.cpp
@@ -5,6 +5,7 @@
 
 #include <inttypes.h>
 #include "SwitchInput.h"
+#include "BasicIoAbstraction.h"
 
 #define ONE_TURN_OF_ENCODER 32
 
@@ -427,8 +428,8 @@ int AbstractHwRotaryEncoder::amountFromChange(unsigned long change) {
 
 void HardwareRotaryEncoder::encoderChanged() {
     // Read the current states of pins A and B
-    uint8_t a = digitalRead(pinA);
-    uint8_t b = digitalRead(pinB);
+    uint8_t a = switches.getIoAbstraction()->digitalRead(pinA);
+    uint8_t b = switches.getIoAbstraction()->digitalRead(pinB);
 
     /**
      * Calculate the new state from signals A and B.

diff --git a/src/SwitchInput.h b/src/SwitchInput.h
@@ -14,8 +14,8 @@
 #ifndef _SWITCHINPUT_H
 #define _SWITCHINPUT_H
 
-#include <IoAbstraction.h>
-#include <TaskManager.h>
+#include "IoAbstraction.h"
+#include "TaskManager.h"
 #include <SimpleCollections.h>
 
 // START user adjustable section

diff --git a/src/pico/PicoDigitalIO.cpp b/src/pico/PicoDigitalIO.cpp
@@ -1,7 +1,7 @@
 
 #include "PicoDigitalIO.h"
-#include "../IoAbstraction.h"
-#include <SimpleCollections.h>
+#include "IoAbstraction.h"
+#include "SimpleCollections.h"
 
 #ifdef BUILD_FOR_PICO_CMAKE
 

diff --git a/src/wireHelpers.h b/src/wireHelpers.h
@@ -9,7 +9,7 @@
 #include "IoAbstraction.h"
 #include "PlatformDetermination.h"
 #include "PlatformDeterminationWire.h"
-#include "IoLogging.h"
+#include <IoLogging.h>
 
 /**
  * @file wireHelpers.h