Merge pull request #211 from TcMenu/main-logging-testremove

#208 #207 Remove SimpleTest, Move logging to TcMenuLog library, Add m…

cmake/CMakeLists.txt

@@ -3,11 +3,9 @@ add_library(IoAbstraction
         ../src/EepromAbstractionWire.cpp
         ../src/IoAbstraction.cpp
         ../src/IoAbstractionWire.cpp
-        ../src/IoLogging.cpp
         ../src/KeyboardManager.cpp
         ../src/ResistiveTouchScreen.cpp
         ../src/SwitchInput.cpp
-        ../src/TextUtilities.cpp
         ../src/wireHelpers.cpp
         ../src/pico/PicoDigitalIO.cpp
         ../src/pico/i2cWrapper.cpp
@@ -19,7 +17,7 @@ target_compile_definitions(IoAbstraction
 )
 
 target_include_directories(IoAbstraction PUBLIC
-        ${PROJECT_SOURCE_DIR}/IoAbstraction/src
+        ${PROJECT_SOURCE_DIR}/lib/IoAbstraction/src
 )
 
 target_link_libraries(IoAbstraction PUBLIC

library.json

@@ -23,9 +23,12 @@
     },
     {
       "name": "TaskManagerIO"
+    },
+    {
+      "name": "TcMenuLog"
     }
   ],
-  "version": "4.3.0",
+  "version": "4.4.0",
   "license": "Apache-2.0",
   "frameworks": "arduino, mbed",
   "platforms": "*",

library.properties

@@ -4,12 +4,12 @@
 #
 
 name=IoAbstraction
-version=4.3.0
+version=4.4.0
 maintainer=https://www.thecoderscorner.com
 author=davetcc
 category=Other
 url=https://github.com/TcMenu/IoAbstraction
 sentence=Treat PCF8574, MCP23017 and Shift registers like pins, matrix keypad, touch screen handler,  button press and rotary encoder management (switches) on any supported IO (including DfRobot & Joysticks) with event handling, interchangable AVR/I2C(AT24) EEPROMs.
 paragraph=Interchange between PCF8574, MCP23017, 74HC595, and regular pins. Fully debounced switches, rotary encoders, joystick encoder emulation (including on DfRobot), matrix keypads/keyboards, and touch screen input on any IO device that require no extra components in most cases. An EEPROM abstraction that works with AVR & I2C AT24x ROMs. Simple cross device btree collection.
 includes=IoAbstraction.h
-depends=TaskManagerIO,SimpleCollections
+depends=TaskManagerIO,SimpleCollections,TcMenuLog

platformio-test.ini

@@ -6,6 +6,7 @@ extra_scripts = post:merge-bin.py
 test_build_src = true
 
 lib_deps =
+    TcMenuLog
     TaskManagerIO
     SimpleCollections
 

platformio.ini

@@ -2,9 +2,10 @@
 framework = arduino
 
 lib_deps =
-    davetcc/TaskManagerIO@^1.4.3
-    davetcc/SimpleCollections@^1.2.3
-    davetcc/LiquidCrystalIO@^1.4.3
+    davetcc/TcMenuLog
+    tcmenu/TaskManagerIO@^1.4.3
+    tcmenu/SimpleCollections@^1.2.3
+    tcmenu/LiquidCrystalIO@^1.4.3
     adafruit/Adafruit GFX Library@^1.11.9
     adafruit/Adafruit ILI9341@^1.6.1
     adafruit/Adafruit FT6206 Library@^1.1.0

src/EepromAbstractionWire.cpp

@@ -67,11 +67,11 @@ uint8_t I2cAt24Eeprom::findMaximumInPage(uint16_t destEeprom, uint8_t len) const
 	// We can read/write in bulk, but do no exceed the page size or we will read / write
 	// the wrong bytes
 	uint16_t offs = destEeprom % pageSize;
-    uint16_t currentGo = min((uint16_t)pageSize, uint16_t(offs + len)) - offs;
+    uint16_t currentGo = internal_min((uint16_t)pageSize, uint16_t(offs + len)) - offs;
 
 	// dont exceed the buffer length of the  wire library
     auto absoluteMax = MAX_BUFFER_SIZE_TO_USE - 2;
-	return min(currentGo, (uint16_t) absoluteMax);
+	return internal_min(currentGo, (uint16_t) absoluteMax);
 }
 
 uint8_t I2cAt24Eeprom::read8(EepromPosition position) {