From e6eaf7ac65ed158b1724a4ccd34437cc818db987 Mon Sep 17 00:00:00 2001
From: svollenweider <34137138+svollenweider@users.noreply.github.com>
Date: Thu, 24 Mar 2022 17:30:47 +0100
Subject: [PATCH 01/15] Update ArduinoIOExpander.cpp

---
 src/utility/ioexpander/ArduinoIOExpander.cpp | 26 +++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/utility/ioexpander/ArduinoIOExpander.cpp b/src/utility/ioexpander/ArduinoIOExpander.cpp
index 3dc1be0..89af7b2 100644
--- a/src/utility/ioexpander/ArduinoIOExpander.cpp
+++ b/src/utility/ioexpander/ArduinoIOExpander.cpp
@@ -88,6 +88,19 @@ void ArduinoIOExpanderClass::initPins()
 
     if (_tca.getAddress() == IO_ADD) {
       PinStatus status = SWITCH_OFF;
+      set(IO_WRITE_CH_PIN_00, status);
+      set(IO_WRITE_CH_PIN_01, status);
+      set(IO_WRITE_CH_PIN_02, status);
+      set(IO_WRITE_CH_PIN_03, status);
+      set(IO_WRITE_CH_PIN_04, status);
+      set(IO_WRITE_CH_PIN_05, status);
+      set(IO_WRITE_CH_PIN_06, status);
+      set(IO_WRITE_CH_PIN_07, status);
+      set(IO_WRITE_CH_PIN_08, status);
+      set(IO_WRITE_CH_PIN_09, status);
+      set(IO_WRITE_CH_PIN_10, status);
+      set(IO_WRITE_CH_PIN_11, status);
+      
       pinMode(IO_WRITE_CH_PIN_00, OUTPUT);
       pinMode(IO_WRITE_CH_PIN_01, OUTPUT);
       pinMode(IO_WRITE_CH_PIN_02, OUTPUT);
@@ -113,18 +126,7 @@ void ArduinoIOExpanderClass::initPins()
       pinMode(IO_READ_CH_PIN_10, INPUT);
       pinMode(IO_READ_CH_PIN_11, INPUT);
 
-      set(IO_WRITE_CH_PIN_00, status);
-      set(IO_WRITE_CH_PIN_01, status);
-      set(IO_WRITE_CH_PIN_02, status);
-      set(IO_WRITE_CH_PIN_03, status);
-      set(IO_WRITE_CH_PIN_04, status);
-      set(IO_WRITE_CH_PIN_05, status);
-      set(IO_WRITE_CH_PIN_06, status);
-      set(IO_WRITE_CH_PIN_07, status);
-      set(IO_WRITE_CH_PIN_08, status);
-      set(IO_WRITE_CH_PIN_09, status);
-      set(IO_WRITE_CH_PIN_10, status);
-      set(IO_WRITE_CH_PIN_11, status);
+
     } else {
       pinMode(DIN_READ_CH_PIN_00, INPUT);
       pinMode(DIN_READ_CH_PIN_01, INPUT);

From 1cdceadb73a4a6ba05c087c3dcea5bc3f3614c72 Mon Sep 17 00:00:00 2001
From: svollenweider <34137138+svollenweider@users.noreply.github.com>
Date: Mon, 23 May 2022 13:20:45 +0200
Subject: [PATCH 02/15] Update QEI.cpp

Added X1 Encoding
---
 src/utility/QEI/QEI.cpp | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/utility/QEI/QEI.cpp b/src/utility/QEI/QEI.cpp
index 22f32e4..970b1f9 100644
--- a/src/utility/QEI/QEI.cpp
+++ b/src/utility/QEI/QEI.cpp
@@ -152,7 +152,9 @@ QEI::QEI(PinName channelA,
     //X4 encoding uses interrupts on      channel A,
     //and on channel B.
     channelA_.rise(mbed::callback(this, &QEI::encode));
-    channelA_.fall(mbed::callback(this, &QEI::encode));
+    if(encoding != X1_ENCODING){
+        channelA_.fall(mbed::callback(this, &QEI::encode));
+    }
 
     //If we're using X4 encoding, then attach interrupts to channel B too.
     if (encoding == X4_ENCODING) {
@@ -191,6 +193,20 @@ int QEI::getRevolutions(void) {
 
 }
 
+// +-------------+
+// | X1 Encoding |
+// +-------------+
+//
+// When observing states two patterns will appear:
+//
+// Counter clockwise rotation:
+//
+// 10 -> 10 -> 10 -> 10 -> ...
+//
+// Clockwise rotation:
+//
+// 11 ->  11 -> 11 -> ...
+//
 // +-------------+
 // | X2 Encoding |
 // +-------------+
@@ -243,8 +259,15 @@ void QEI::encode(void) {
 
     //2-bit state.
     currState_ = (chanA << 1) | (chanB);
-
-    if (encoding_ == X2_ENCODING) {
+         
+    if(encoding_ == X1_ENCODING){
+        if(currState_ == 0x3){
+            pulses++;
+        }
+        if(currState_ == 0x2){
+            pulses--;
+        }
+    } else if (encoding_ == X2_ENCODING) {
 
         //11->00->11->00 is counter clockwise rotation or "forward".
         if ((prevState_ == 0x3 && currState_ == 0x0) ||

From 1f9f0a884bb6948cb37f9d7e0fc83065637bc209 Mon Sep 17 00:00:00 2001
From: svollenweider <34137138+svollenweider@users.noreply.github.com>
Date: Mon, 23 May 2022 13:22:40 +0200
Subject: [PATCH 03/15] Update QEI.cpp

Fixed Typo
---
 src/utility/QEI/QEI.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utility/QEI/QEI.cpp b/src/utility/QEI/QEI.cpp
index 970b1f9..db767db 100644
--- a/src/utility/QEI/QEI.cpp
+++ b/src/utility/QEI/QEI.cpp
@@ -262,10 +262,10 @@ void QEI::encode(void) {
          
     if(encoding_ == X1_ENCODING){
         if(currState_ == 0x3){
-            pulses++;
+            pulses_++;
         }
         if(currState_ == 0x2){
-            pulses--;
+            pulses_--;
         }
     } else if (encoding_ == X2_ENCODING) {
 

From 29642fe0d8256fcc8f33da9d687f8981a52b02d6 Mon Sep 17 00:00:00 2001
From: svollenweider <34137138+svollenweider@users.noreply.github.com>
Date: Mon, 23 May 2022 13:23:14 +0200
Subject: [PATCH 04/15] Update QEI.h

Added X1_Encoding in header File
---
 src/utility/QEI/QEI.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utility/QEI/QEI.h b/src/utility/QEI/QEI.h
index 5ab79d2..8e6fba0 100644
--- a/src/utility/QEI/QEI.h
+++ b/src/utility/QEI/QEI.h
@@ -148,7 +148,7 @@ class QEI {
 public:
 
     typedef enum Encoding {
-
+        X1_ENCODING,
         X2_ENCODING,
         X4_ENCODING
 

From 493324e203e7d4ce8f8e7a486590c66c0884823e Mon Sep 17 00:00:00 2001
From: Romain Reignier <rre@robopec.com>
Date: Mon, 1 Aug 2022 14:36:35 +0200
Subject: [PATCH 05/15] Fix voltage reference in examples

The MachineControl boards features a REF3330 3.0 V Reference Voltage.
---
 examples/Analog_input/Analog_input_0_10V/Analog_input_0_10V.ino | 2 +-
 .../Analog_input/Analog_input_4_20mA/Analog_input_4_20mA.ino    | 2 +-
 examples/Analog_input/Analog_input_NTC/Analog_input_NTC.ino     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/Analog_input/Analog_input_0_10V/Analog_input_0_10V.ino b/examples/Analog_input/Analog_input_0_10V/Analog_input_0_10V.ino
index 9305875..4a81400 100644
--- a/examples/Analog_input/Analog_input_0_10V/Analog_input_0_10V.ino
+++ b/examples/Analog_input/Analog_input_0_10V/Analog_input_0_10V.ino
@@ -20,7 +20,7 @@
 using namespace machinecontrol;
 
 float res_divider = 0.28057;
-float reference = 3.3;
+float reference = 3.0;
 
 void setup() {
   analogReadResolution(16);
diff --git a/examples/Analog_input/Analog_input_4_20mA/Analog_input_4_20mA.ino b/examples/Analog_input/Analog_input_4_20mA/Analog_input_4_20mA.ino
index 167de2d..6c9b614 100644
--- a/examples/Analog_input/Analog_input_4_20mA/Analog_input_4_20mA.ino
+++ b/examples/Analog_input/Analog_input_4_20mA/Analog_input_4_20mA.ino
@@ -21,7 +21,7 @@ using namespace machinecontrol;
 
 #define SENSE_RES 120
 
-float reference = 3.3;
+float reference = 3.0;
 
 void setup() {
   analogReadResolution(16);
diff --git a/examples/Analog_input/Analog_input_NTC/Analog_input_NTC.ino b/examples/Analog_input/Analog_input_NTC/Analog_input_NTC.ino
index d15149c..cada7d0 100644
--- a/examples/Analog_input/Analog_input_NTC/Analog_input_NTC.ino
+++ b/examples/Analog_input/Analog_input_NTC/Analog_input_NTC.ino
@@ -26,7 +26,7 @@ using namespace machinecontrol;
 
 #define REFERENCE_RES 100000
 
-float reference = 3.3;
+float reference = 3.0;
 float lowest_voltage = 2.7;
 
 void setup() {

From 75e458228ab4070ae5e29cc06e8eb2f53d36daa8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 11:13:25 +0000
Subject: [PATCH 06/15] Bump carlosperate/download-file-action from 1 to 2

Bumps [carlosperate/download-file-action](https://github.com/carlosperate/download-file-action) from 1 to 2.
- [Release notes](https://github.com/carlosperate/download-file-action/releases)
- [Commits](https://github.com/carlosperate/download-file-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: carlosperate/download-file-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/sync-labels.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
index 10abaea..94938f3 100644
--- a/.github/workflows/sync-labels.yml
+++ b/.github/workflows/sync-labels.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Download JSON schema for labels configuration file
         id: download-schema
-        uses: carlosperate/download-file-action@v1
+        uses: carlosperate/download-file-action@v2
         with:
           file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/arduino-tooling-gh-label-configuration-schema.json
           location: ${{ runner.temp }}/label-configuration-schema
@@ -65,7 +65,7 @@ jobs:
 
     steps:
       - name: Download
-        uses: carlosperate/download-file-action@v1
+        uses: carlosperate/download-file-action@v2
         with:
           file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/${{ matrix.filename }}
 

From 91b4b557076f6d7b466f7fc916793a162ac03b43 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 11:19:59 +0000
Subject: [PATCH 07/15] Bump actions/checkout from 3 to 4

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/check-arduino.yml    | 2 +-
 .github/workflows/compile-examples.yml | 2 +-
 .github/workflows/spell-check.yml      | 2 +-
 .github/workflows/sync-labels.yml      | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/check-arduino.yml b/.github/workflows/check-arduino.yml
index 3e0d26c..adb330f 100644
--- a/.github/workflows/check-arduino.yml
+++ b/.github/workflows/check-arduino.yml
@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Arduino Lint
         uses: arduino/arduino-lint-action@v1
diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml
index 302f9b9..38999da 100644
--- a/.github/workflows/compile-examples.yml
+++ b/.github/workflows/compile-examples.yml
@@ -34,7 +34,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Compile example sketches
         uses: arduino/compile-sketches@v1
diff --git a/.github/workflows/spell-check.yml b/.github/workflows/spell-check.yml
index 3f6b03f..ef7d894 100644
--- a/.github/workflows/spell-check.yml
+++ b/.github/workflows/spell-check.yml
@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Spell check
         uses: codespell-project/actions-codespell@master
diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
index 94938f3..9cde1ac 100644
--- a/.github/workflows/sync-labels.yml
+++ b/.github/workflows/sync-labels.yml
@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download JSON schema for labels configuration file
         id: download-schema
@@ -105,7 +105,7 @@ jobs:
           echo "::set-output name=flag::--dry-run"
 
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download configuration files artifact
         uses: actions/download-artifact@v3

From ffb18f7c4cb106e26c01d03f182de185aaa91f31 Mon Sep 17 00:00:00 2001
From: marqdevx <p.marquinez@arduino.cc>
Date: Thu, 7 Sep 2023 14:44:01 +0200
Subject: [PATCH 08/15] Fix hour alarm register

Co-authored-by: Hamza-Proline <h.benabdeljawed@arduino.cc>
---
 src/utility/RTC/PCF8563T.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utility/RTC/PCF8563T.cpp b/src/utility/RTC/PCF8563T.cpp
index 6d0176f..a21b36a 100644
--- a/src/utility/RTC/PCF8563T.cpp
+++ b/src/utility/RTC/PCF8563T.cpp
@@ -347,7 +347,7 @@ void PCF8563TClass::setHourAlarm(uint8_t hours) {
   uint8_t dec = hours / 10;
   uint8_t unit = hours - (dec * 10);
   uint8_t hour_alarm = PCF8563T_HOUR_ALARM_AE_H_MASK & ((dec << 4) + unit);
-  writeByte(PCF8563T_HOURS_REG, hour_alarm); //check formula on datasheet val + 6 * (val / 10)
+  writeByte(PCF8563T_HOUR_ALARM_REG, hour_alarm); //check formula on datasheet val + 6 * (val / 10)
 }
 
 /**

From 9ebdfd2c527d791f2416f93bb0f8c8bab937cb52 Mon Sep 17 00:00:00 2001
From: Leonardo Cavagnis <l.cavagnis@arduino.cc>
Date: Fri, 12 Jan 2024 16:28:33 +0100
Subject: [PATCH 09/15] add deprecated note to library.properties and README

---
 README.md          | 8 +++++++-
 library.properties | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 1cf6533..33f18c9 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,10 @@
-# Portenta Machine Control Library for Arduino
+# [Deprecated] Portenta Machine Control Library for Arduino
+
+> ⚠️ **Warning**: This library is deprecated and no longer actively maintained.
+
+> We recommend transitioning to the [Arduino_PortentaMachineControl](https://github.com/arduino-libraries/Arduino_PortentaMachineControl) library for ongoing support, new features and contributions.
+
+> Please note that the [examples](./examples/) provided with this library are not compatible with the new library.
 
 [![Check Arduino status](https://github.com/arduino-libraries/Arduino_MachineControl/actions/workflows/check-arduino.yml/badge.svg)](https://github.com/arduino-libraries/Arduino_MachineControl/actions/workflows/check-arduino.yml)
 [![Compile Examples status](https://github.com/arduino-libraries/Arduino_MachineControl/actions/workflows/compile-examples.yml/badge.svg)](https://github.com/arduino-libraries/Arduino_MachineControl/actions/workflows/compile-examples.yml)
diff --git a/library.properties b/library.properties
index 4c23538..440f0de 100644
--- a/library.properties
+++ b/library.properties
@@ -2,8 +2,8 @@ name=Arduino_MachineControl
 version=1.1.1
 author=Arduino
 maintainer=Arduino <info@arduino.cc>
-sentence=Arduino Library for Portenta Machine Control - PMC
-paragraph=
+sentence=DEPRECATED. Arduino Library for Portenta Machine Control - PMC
+paragraph=This library is no longer actively maintained and is deprecated. Consider migrating to <a href="https://github.com/arduino-libraries/Arduino_PortentaMachineControl">Arduino_PortentaMachineControl</a> library.
 category=Communication
 url=https://github.com/arduino-libraries/Arduino_MachineControl
 architectures=mbed, mbed_portenta

From 719b57018b73a1b526ba4872813fb81787e37aee Mon Sep 17 00:00:00 2001
From: Leonardo Cavagnis <l.cavagnis@arduino.cc>
Date: Fri, 12 Jan 2024 16:28:47 +0100
Subject: [PATCH 10/15] add deprecated note to examples

---
 examples/Analog_Out/Analog_Out.ino                   | 12 ++++++++++++
 .../Analog_input_0_10V/Analog_input_0_10V.ino        | 12 ++++++++++++
 .../Analog_input_4_20mA/Analog_input_4_20mA.ino      | 12 ++++++++++++
 .../Analog_input_NTC/Analog_input_NTC.ino            | 12 ++++++++++++
 examples/CAN/ReadCan/ReadCan.ino                     | 12 ++++++++++++
 examples/CAN/WriteCan/WriteCan.ino                   | 12 ++++++++++++
 examples/Digital_output/Digital_output.ino           | 12 ++++++++++++
 .../CombinedIOExpander/CombinedIOExpander.ino        | 12 ++++++++++++
 .../Digital_input/Digital_input.ino                  | 12 ++++++++++++
 .../GPIO_programmable/GPIO_programmable.ino          | 12 ++++++++++++
 examples/Encoders/Encoders.ino                       | 12 ++++++++++++
 examples/RS232/RS232.ino                             | 12 ++++++++++++
 examples/RS485_fullduplex/RS485_fullduplex.ino       | 12 ++++++++++++
 examples/RS485_halfduplex/RS485_halfduplex.ino       | 12 ++++++++++++
 examples/RTC/RTC.ino                                 | 12 ++++++++++++
 examples/RTC_Alarm/RTC_Alarm.ino                     | 12 ++++++++++++
 examples/Temp_probes_RTD/Temp_probes_RTD.ino         | 12 ++++++++++++
 .../Temp_probes_Thermocouples.ino                    | 12 ++++++++++++
 examples/USB_host/USB_host.ino                       | 12 ++++++++++++
 19 files changed, 228 insertions(+)

diff --git a/examples/Analog_Out/Analog_Out.ino b/examples/Analog_Out/Analog_Out.ino
index 89110e7..1e77034 100644
--- a/examples/Analog_Out/Analog_Out.ino
+++ b/examples/Analog_Out/Analog_Out.ino
@@ -1,3 +1,15 @@
+/*
+ * IMPORTANT NOTE:
+ *
+ * This example is associated with the deprecated Arduino_MachineControl library.
+ * We have introduced a new and improved library called Arduino_PortentaMachineControl, which offers enhanced features
+ * and ongoing support. 
+ * We encourage you to update your projects to use the new library.
+ * 
+ * The functions and syntax in this example are not compatible with Arduino_PortentaMachineControl.
+ * Please refer to the migration guide for necessary adjustments.
+ */
+
 /*
   Machine Control - Analog out Example
 
diff --git a/examples/Analog_input/Analog_input_0_10V/Analog_input_0_10V.ino b/examples/Analog_input/Analog_input_0_10V/Analog_input_0_10V.ino
index 4a81400..21634d8 100644
--- a/examples/Analog_input/Analog_input_0_10V/Analog_input_0_10V.ino
+++ b/examples/Analog_input/Analog_input_0_10V/Analog_input_0_10V.ino
@@ -1,3 +1,15 @@
+/*
+ * IMPORTANT NOTE:
+ *
+ * This example is associated with the deprecated Arduino_MachineControl library.
+ * We have introduced a new and improved library called Arduino_PortentaMachineControl, which offers enhanced features
+ * and ongoing support. 
+ * We encourage you to update your projects to use the new library.
+ * 
+ * The functions and syntax in this example are not compatible with Arduino_PortentaMachineControl.
+ * Please refer to the migration guide for necessary adjustments.
+ */
+
 /*
   Machine Control - Analog in 0 - 10 V Example
 
diff --git a/examples/Analog_input/Analog_input_4_20mA/Analog_input_4_20mA.ino b/examples/Analog_input/Analog_input_4_20mA/Analog_input_4_20mA.ino
index 6c9b614..cae68fb 100644
--- a/examples/Analog_input/Analog_input_4_20mA/Analog_input_4_20mA.ino
+++ b/examples/Analog_input/Analog_input_4_20mA/Analog_input_4_20mA.ino
@@ -1,3 +1,15 @@
+/*
+ * IMPORTANT NOTE:
+ *
+ * This example is associated with the deprecated Arduino_MachineControl library.
+ * We have introduced a new and improved library called Arduino_PortentaMachineControl, which offers enhanced features
+ * and ongoing support. 
+ * We encourage you to update your projects to use the new library.
+ * 
+ * The functions and syntax in this example are not compatible with Arduino_PortentaMachineControl.
+ * Please refer to the migration guide for necessary adjustments.
+ */
+
 /*
   Machine Control - Analog in 4 - 20 mA Example
 
diff --git a/examples/Analog_input/Analog_input_NTC/Analog_input_NTC.ino b/examples/Analog_input/Analog_input_NTC/Analog_input_NTC.ino
index cada7d0..7628f1f 100644
--- a/examples/Analog_input/Analog_input_NTC/Analog_input_NTC.ino
+++ b/examples/Analog_input/Analog_input_NTC/Analog_input_NTC.ino
@@ -1,3 +1,15 @@
+/*
+ * IMPORTANT NOTE:
+ *
+ * This example is associated with the deprecated Arduino_MachineControl library.
+ * We have introduced a new and improved library called Arduino_PortentaMachineControl, which offers enhanced features
+ * and ongoing support. 
+ * We encourage you to update your projects to use the new library.
+ * 
+ * The functions and syntax in this example are not compatible with Arduino_PortentaMachineControl.
+ * Please refer to the migration guide for necessary adjustments.
+ */
+
 /*
   Machine Control - Analog in NTC Example
 
diff --git a/examples/CAN/ReadCan/ReadCan.ino b/examples/CAN/ReadCan/ReadCan.ino
index c7273f7..50d96a1 100644
--- a/examples/CAN/ReadCan/ReadCan.ino
+++ b/examples/CAN/ReadCan/ReadCan.ino
@@ -1,3 +1,15 @@
+/*
+ * IMPORTANT NOTE:
+ *
+ * This example is associated with the deprecated Arduino_MachineControl library.
+ * We have introduced a new and improved library called Arduino_PortentaMachineControl, which offers enhanced features
+ * and ongoing support. 
+ * We encourage you to update your projects to use the new library.
+ * 
+ * The functions and syntax in this example are not compatible with Arduino_PortentaMachineControl.
+ * Please refer to the migration guide for necessary adjustments.
+ */
+
 /*
   CAN Read Example
 
diff --git a/examples/CAN/WriteCan/WriteCan.ino b/examples/CAN/WriteCan/WriteCan.ino
index 6250cfd..7471de7 100644
--- a/examples/CAN/WriteCan/WriteCan.ino
+++ b/examples/CAN/WriteCan/WriteCan.ino
@@ -1,3 +1,15 @@
+/*
+ * IMPORTANT NOTE:
+ *
+ * This example is associated with the deprecated Arduino_MachineControl library.
+ * We have introduced a new and improved library called Arduino_PortentaMachineControl, which offers enhanced features
+ * and ongoing support. 
+ * We encourage you to update your projects to use the new library.
+ * 
+ * The functions and syntax in this example are not compatible with Arduino_PortentaMachineControl.
+ * Please refer to the migration guide for necessary adjustments.
+ */
+
 /*
   CAN Write Example
 
diff --git a/examples/Digital_output/Digital_output.ino b/examples/Digital_output/Digital_output.ino
index 5bf6b51..c391ceb 100644
--- a/examples/Digital_output/Digital_output.ino
+++ b/examples/Digital_output/Digital_output.ino
@@ -1,3 +1,15 @@
+/*
+ * IMPORTANT NOTE:
+ *
+ * This example is associated with the deprecated Arduino_MachineControl library.
+ * We have introduced a new and improved library called Arduino_PortentaMachineControl, which offers enhanced features
+ * and ongoing support. 
+ * We encourage you to update your projects to use the new library.
+ * 
+ * The functions and syntax in this example are not compatible with Arduino_PortentaMachineControl.
+ * Please refer to the migration guide for necessary adjustments.
+ */
+
 /*
   Machine Control - Digital Output Example
 
diff --git a/examples/Digital_programmable/CombinedIOExpander/CombinedIOExpander.ino b/examples/Digital_programmable/CombinedIOExpander/CombinedIOExpander.ino
index 9615050..afcc4d6 100644
--- a/examples/Digital_programmable/CombinedIOExpander/CombinedIOExpander.ino
+++ b/examples/Digital_programmable/CombinedIOExpander/CombinedIOExpander.ino
@@ -1,3 +1,15 @@
+/*
+ * IMPORTANT NOTE:
+ *
+ * This example is associated with the deprecated Arduino_MachineControl library.
+ * We have introduced a new and improved library called Arduino_PortentaMachineControl, which offers enhanced features
+ * and ongoing support. 
+ * We encourage you to update your projects to use the new library.
+ * 
+ * The functions and syntax in this example are not compatible with Arduino_PortentaMachineControl.
+ * Please refer to the migration guide for necessary adjustments.
+ */
+
 /*
   Machine Control - IOExpander Read And Write Example
 
diff --git a/examples/Digital_programmable/Digital_input/Digital_input.ino b/examples/Digital_programmable/Digital_input/Digital_input.ino
index 91c0f7d..beb5ecb 100644
--- a/examples/Digital_programmable/Digital_input/Digital_input.ino
+++ b/examples/Digital_programmable/Digital_input/Digital_input.ino
@@ -1,3 +1,15 @@
+/*
+ * IMPORTANT NOTE:
+ *
+ * This example is associated with the deprecated Arduino_MachineControl library.
+ * We have introduced a new and improved library called Arduino_PortentaMachineControl, which offers enhanced features
+ * and ongoing support. 
+ * We encourage you to update your projects to use the new library.
+ * 
+ * The functions and syntax in this example are not compatible with Arduino_PortentaMachineControl.
+ * Please refer to the migration guide for necessary adjustments.
+ */
+
 /*
   Machine Control - Digital Input Example
 
diff --git a/examples/Digital_programmable/GPIO_programmable/GPIO_programmable.ino b/examples/Digital_programmable/GPIO_programmable/GPIO_programmable.ino
index cf80f0a..c7d34ba 100644
--- a/examples/Digital_programmable/GPIO_programmable/GPIO_programmable.ino
+++ b/examples/Digital_programmable/GPIO_programmable/GPIO_programmable.ino
@@ -1,3 +1,15 @@
+/*
+ * IMPORTANT NOTE:
+ *
+ * This example is associated with the deprecated Arduino_MachineControl library.
+ * We have introduced a new and improved library called Arduino_PortentaMachineControl, which offers enhanced features
+ * and ongoing support. 
+ * We encourage you to update your projects to use the new library.
+ * 
+ * The functions and syntax in this example are not compatible with Arduino_PortentaMachineControl.
+ * Please refer to the migration guide for necessary adjustments.
+ */
+
 /*
   Machine Control - IOExpander Read And Write Example
 
diff --git a/examples/Encoders/Encoders.ino b/examples/Encoders/Encoders.ino
index 0e91d45..67a4d4c 100644
--- a/examples/Encoders/Encoders.ino
+++ b/examples/Encoders/Encoders.ino
@@ -1,3 +1,15 @@
+/*
+ * IMPORTANT NOTE:
+ *
+ * This example is associated with the deprecated Arduino_MachineControl library.
+ * We have introduced a new and improved library called Arduino_PortentaMachineControl, which offers enhanced features
+ * and ongoing support. 
+ * We encourage you to update your projects to use the new library.
+ * 
+ * The functions and syntax in this example are not compatible with Arduino_PortentaMachineControl.
+ * Please refer to the migration guide for necessary adjustments.
+ */
+
 #include <Arduino_MachineControl.h>
 
 using namespace machinecontrol;
diff --git a/examples/RS232/RS232.ino b/examples/RS232/RS232.ino
index 97b4a0b..1f44fc6 100644
--- a/examples/RS232/RS232.ino
+++ b/examples/RS232/RS232.ino
@@ -1,3 +1,15 @@
+/*
+ * IMPORTANT NOTE:
+ *
+ * This example is associated with the deprecated Arduino_MachineControl library.
+ * We have introduced a new and improved library called Arduino_PortentaMachineControl, which offers enhanced features
+ * and ongoing support. 
+ * We encourage you to update your projects to use the new library.
+ * 
+ * The functions and syntax in this example are not compatible with Arduino_PortentaMachineControl.
+ * Please refer to the migration guide for necessary adjustments.
+ */
+
 /*
   RS232 communication
 
diff --git a/examples/RS485_fullduplex/RS485_fullduplex.ino b/examples/RS485_fullduplex/RS485_fullduplex.ino
index 4c1a04a..1f13922 100644
--- a/examples/RS485_fullduplex/RS485_fullduplex.ino
+++ b/examples/RS485_fullduplex/RS485_fullduplex.ino
@@ -1,3 +1,15 @@
+/*
+ * IMPORTANT NOTE:
+ *
+ * This example is associated with the deprecated Arduino_MachineControl library.
+ * We have introduced a new and improved library called Arduino_PortentaMachineControl, which offers enhanced features
+ * and ongoing support. 
+ * We encourage you to update your projects to use the new library.
+ * 
+ * The functions and syntax in this example are not compatible with Arduino_PortentaMachineControl.
+ * Please refer to the migration guide for necessary adjustments.
+ */
+
 /*
   RS485 Full duplex communication
 
diff --git a/examples/RS485_halfduplex/RS485_halfduplex.ino b/examples/RS485_halfduplex/RS485_halfduplex.ino
index 3e5de9d..0291e1a 100644
--- a/examples/RS485_halfduplex/RS485_halfduplex.ino
+++ b/examples/RS485_halfduplex/RS485_halfduplex.ino
@@ -1,3 +1,15 @@
+/*
+ * IMPORTANT NOTE:
+ *
+ * This example is associated with the deprecated Arduino_MachineControl library.
+ * We have introduced a new and improved library called Arduino_PortentaMachineControl, which offers enhanced features
+ * and ongoing support. 
+ * We encourage you to update your projects to use the new library.
+ * 
+ * The functions and syntax in this example are not compatible with Arduino_PortentaMachineControl.
+ * Please refer to the migration guide for necessary adjustments.
+ */
+
 /*
   RS485 Half Duplex communication
 
diff --git a/examples/RTC/RTC.ino b/examples/RTC/RTC.ino
index 954e237..7edf77f 100644
--- a/examples/RTC/RTC.ino
+++ b/examples/RTC/RTC.ino
@@ -1,3 +1,15 @@
+/*
+ * IMPORTANT NOTE:
+ *
+ * This example is associated with the deprecated Arduino_MachineControl library.
+ * We have introduced a new and improved library called Arduino_PortentaMachineControl, which offers enhanced features
+ * and ongoing support. 
+ * We encourage you to update your projects to use the new library.
+ * 
+ * The functions and syntax in this example are not compatible with Arduino_PortentaMachineControl.
+ * Please refer to the migration guide for necessary adjustments.
+ */
+
 /*
   Machine Control - RTC Example
 
diff --git a/examples/RTC_Alarm/RTC_Alarm.ino b/examples/RTC_Alarm/RTC_Alarm.ino
index c455af6..f5c4325 100644
--- a/examples/RTC_Alarm/RTC_Alarm.ino
+++ b/examples/RTC_Alarm/RTC_Alarm.ino
@@ -1,3 +1,15 @@
+/*
+ * IMPORTANT NOTE:
+ *
+ * This example is associated with the deprecated Arduino_MachineControl library.
+ * We have introduced a new and improved library called Arduino_PortentaMachineControl, which offers enhanced features
+ * and ongoing support. 
+ * We encourage you to update your projects to use the new library.
+ * 
+ * The functions and syntax in this example are not compatible with Arduino_PortentaMachineControl.
+ * Please refer to the migration guide for necessary adjustments.
+ */
+
 /*
   Machine Control - RTC Alarm Example
 
diff --git a/examples/Temp_probes_RTD/Temp_probes_RTD.ino b/examples/Temp_probes_RTD/Temp_probes_RTD.ino
index 2899dc6..b2c1edb 100644
--- a/examples/Temp_probes_RTD/Temp_probes_RTD.ino
+++ b/examples/Temp_probes_RTD/Temp_probes_RTD.ino
@@ -1,3 +1,15 @@
+/*
+ * IMPORTANT NOTE:
+ *
+ * This example is associated with the deprecated Arduino_MachineControl library.
+ * We have introduced a new and improved library called Arduino_PortentaMachineControl, which offers enhanced features
+ * and ongoing support. 
+ * We encourage you to update your projects to use the new library.
+ * 
+ * The functions and syntax in this example are not compatible with Arduino_PortentaMachineControl.
+ * Please refer to the migration guide for necessary adjustments.
+ */
+
 /*
   Machine Control - Temperature probes RTD example
 
diff --git a/examples/Temp_probes_Thermocouples/Temp_probes_Thermocouples.ino b/examples/Temp_probes_Thermocouples/Temp_probes_Thermocouples.ino
index 5fef867..a224288 100644
--- a/examples/Temp_probes_Thermocouples/Temp_probes_Thermocouples.ino
+++ b/examples/Temp_probes_Thermocouples/Temp_probes_Thermocouples.ino
@@ -1,3 +1,15 @@
+/*
+ * IMPORTANT NOTE:
+ *
+ * This example is associated with the deprecated Arduino_MachineControl library.
+ * We have introduced a new and improved library called Arduino_PortentaMachineControl, which offers enhanced features
+ * and ongoing support. 
+ * We encourage you to update your projects to use the new library.
+ * 
+ * The functions and syntax in this example are not compatible with Arduino_PortentaMachineControl.
+ * Please refer to the migration guide for necessary adjustments.
+ */
+
 /*
   Machine Control - Thermocouples Read Sensors
 
diff --git a/examples/USB_host/USB_host.ino b/examples/USB_host/USB_host.ino
index 69cc975..0fa9695 100644
--- a/examples/USB_host/USB_host.ino
+++ b/examples/USB_host/USB_host.ino
@@ -1,3 +1,15 @@
+/*
+ * IMPORTANT NOTE:
+ *
+ * This example is associated with the deprecated Arduino_MachineControl library.
+ * We have introduced a new and improved library called Arduino_PortentaMachineControl, which offers enhanced features
+ * and ongoing support. 
+ * We encourage you to update your projects to use the new library.
+ * 
+ * The functions and syntax in this example are not compatible with Arduino_PortentaMachineControl.
+ * Please refer to the migration guide for necessary adjustments.
+ */
+
 #include <Arduino_MachineControl.h>
 #include <USBHost.h>
 

From f0c30b56547ff3d4276f3e591cd888a94d21c284 Mon Sep 17 00:00:00 2001
From: Leonardo Cavagnis <45899760+leonardocavagnis@users.noreply.github.com>
Date: Sat, 13 Jan 2024 19:37:05 +0100
Subject: [PATCH 11/15] Update library.properties (remove html link)

Co-authored-by: per1234 <accounts@perglass.com>
---
 library.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.properties b/library.properties
index 440f0de..9d37919 100644
--- a/library.properties
+++ b/library.properties
@@ -3,7 +3,7 @@ version=1.1.1
 author=Arduino
 maintainer=Arduino <info@arduino.cc>
 sentence=DEPRECATED. Arduino Library for Portenta Machine Control - PMC
-paragraph=This library is no longer actively maintained and is deprecated. Consider migrating to <a href="https://github.com/arduino-libraries/Arduino_PortentaMachineControl">Arduino_PortentaMachineControl</a> library.
+paragraph=This library is no longer actively maintained and is deprecated. Consider migrating to the Arduino_PortentaMachineControl library.
 category=Communication
 url=https://github.com/arduino-libraries/Arduino_MachineControl
 architectures=mbed, mbed_portenta

From a7a19c0fc956e19d461c36b36a8f9fdc7767c8a9 Mon Sep 17 00:00:00 2001
From: Leonardo Cavagnis <45899760+leonardocavagnis@users.noreply.github.com>
Date: Thu, 18 Jan 2024 10:17:18 +0100
Subject: [PATCH 12/15] Update README.md: warning notation

Co-authored-by: Sebastian Romero <s.romero.zh@gmail.com>
---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 33f18c9..703056e 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,8 @@
 # [Deprecated] Portenta Machine Control Library for Arduino
 
-> ⚠️ **Warning**: This library is deprecated and no longer actively maintained.
-
+> [!WARNING]
+> This library is deprecated and no longer actively maintained.
 > We recommend transitioning to the [Arduino_PortentaMachineControl](https://github.com/arduino-libraries/Arduino_PortentaMachineControl) library for ongoing support, new features and contributions.
-
 > Please note that the [examples](./examples/) provided with this library are not compatible with the new library.
 
 [![Check Arduino status](https://github.com/arduino-libraries/Arduino_MachineControl/actions/workflows/check-arduino.yml/badge.svg)](https://github.com/arduino-libraries/Arduino_MachineControl/actions/workflows/check-arduino.yml)

From bd65147d16b10a5346c6e0d159255ebec6e590fe Mon Sep 17 00:00:00 2001
From: Leonardo Cavagnis <l.cavagnis@arduino.cc>
Date: Tue, 23 Jan 2024 11:14:05 +0100
Subject: [PATCH 13/15] update I2CDev library (until commit:
 https://github.com/jrowberg/i2cdevlib/commit/605a7401b05baebef146dc5caa3d0e8e15841e49)

---
 src/utility/ioexpander/I2Cdev.cpp | 265 +++++++++++++++---------------
 src/utility/ioexpander/I2Cdev.h   |  64 +++++---
 2 files changed, 173 insertions(+), 156 deletions(-)

diff --git a/src/utility/ioexpander/I2Cdev.cpp b/src/utility/ioexpander/I2Cdev.cpp
index 5525624..40b5dfc 100644
--- a/src/utility/ioexpander/I2Cdev.cpp
+++ b/src/utility/ioexpander/I2Cdev.cpp
@@ -3,6 +3,9 @@
 // 2013-06-05 by Jeff Rowberg <jeff@rowberg.net>
 //
 // Changelog:
+//      2021-09-28 - allow custom Wire object as transaction function argument
+//      2020-01-20 - hardija : complete support for Teensy 3.x
+//      2015-10-30 - simondlevy : support i2c_t3 for Teensy3.1
 //      2013-05-06 - add Francesco Ferrara's Fastwire v0.24 implementation with small modifications
 //      2013-05-05 - fix issue with writing bit values to words (Sasquatch/Farzanegan)
 //      2012-06-09 - fix major issue with reading > 32 bytes at a time with Arduino Wire
@@ -87,11 +90,6 @@ THE SOFTWARE.
 
 #endif
 
-#ifndef BUFFER_LENGTH
-// band-aid fix for platforms without Wire-defined BUFFER_LENGTH (removed from some official implementations)
-#define BUFFER_LENGTH 32
-#endif
-
 /** Default constructor.
  */
 I2Cdev::I2Cdev() {
@@ -105,9 +103,9 @@ I2Cdev::I2Cdev() {
  * @param timeout Optional read timeout in milliseconds (0 to disable, leave off to use default class value in I2Cdev::readTimeout)
  * @return Status of read operation (true = success)
  */
-int8_t I2Cdev::readBit(uint8_t devAddr, uint8_t regAddr, uint8_t bitNum, uint8_t *data, uint16_t timeout) {
+int8_t I2Cdev::readBit(uint8_t devAddr, uint8_t regAddr, uint8_t bitNum, uint8_t *data, uint16_t timeout, void *wireObj) {
     uint8_t b;
-    uint8_t count = readByte(devAddr, regAddr, &b, timeout);
+    uint8_t count = readByte(devAddr, regAddr, &b, timeout, wireObj);
     *data = b & (1 << bitNum);
     return count;
 }
@@ -120,9 +118,9 @@ int8_t I2Cdev::readBit(uint8_t devAddr, uint8_t regAddr, uint8_t bitNum, uint8_t
  * @param timeout Optional read timeout in milliseconds (0 to disable, leave off to use default class value in I2Cdev::readTimeout)
  * @return Status of read operation (true = success)
  */
-int8_t I2Cdev::readBitW(uint8_t devAddr, uint8_t regAddr, uint8_t bitNum, uint16_t *data, uint16_t timeout) {
+int8_t I2Cdev::readBitW(uint8_t devAddr, uint8_t regAddr, uint8_t bitNum, uint16_t *data, uint16_t timeout, void *wireObj) {
     uint16_t b;
-    uint8_t count = readWord(devAddr, regAddr, &b, timeout);
+    uint8_t count = readWord(devAddr, regAddr, &b, timeout, wireObj);
     *data = b & (1 << bitNum);
     return count;
 }
@@ -136,14 +134,14 @@ int8_t I2Cdev::readBitW(uint8_t devAddr, uint8_t regAddr, uint8_t bitNum, uint16
  * @param timeout Optional read timeout in milliseconds (0 to disable, leave off to use default class value in I2Cdev::readTimeout)
  * @return Status of read operation (true = success)
  */
-int8_t I2Cdev::readBits(uint8_t devAddr, uint8_t regAddr, uint8_t bitStart, uint8_t length, uint8_t *data, uint16_t timeout) {
+int8_t I2Cdev::readBits(uint8_t devAddr, uint8_t regAddr, uint8_t bitStart, uint8_t length, uint8_t *data, uint16_t timeout, void *wireObj) {
     // 01101001 read byte
     // 76543210 bit numbers
     //    xxx   args: bitStart=4, length=3
     //    010   masked
     //   -> 010 shifted
     uint8_t count, b;
-    if ((count = readByte(devAddr, regAddr, &b, timeout)) != 0) {
+    if ((count = readByte(devAddr, regAddr, &b, timeout, wireObj)) != 0) {
         uint8_t mask = ((1 << length) - 1) << (bitStart - length + 1);
         b &= mask;
         b >>= (bitStart - length + 1);
@@ -161,7 +159,7 @@ int8_t I2Cdev::readBits(uint8_t devAddr, uint8_t regAddr, uint8_t bitStart, uint
  * @param timeout Optional read timeout in milliseconds (0 to disable, leave off to use default class value in I2Cdev::readTimeout)
  * @return Status of read operation (1 = success, 0 = failure, -1 = timeout)
  */
-int8_t I2Cdev::readBitsW(uint8_t devAddr, uint8_t regAddr, uint8_t bitStart, uint8_t length, uint16_t *data, uint16_t timeout) {
+int8_t I2Cdev::readBitsW(uint8_t devAddr, uint8_t regAddr, uint8_t bitStart, uint8_t length, uint16_t *data, uint16_t timeout, void *wireObj) {
     // 1101011001101001 read byte
     // fedcba9876543210 bit numbers
     //    xxx           args: bitStart=12, length=3
@@ -169,7 +167,7 @@ int8_t I2Cdev::readBitsW(uint8_t devAddr, uint8_t regAddr, uint8_t bitStart, uin
     //           -> 010 shifted
     uint8_t count;
     uint16_t w;
-    if ((count = readWord(devAddr, regAddr, &w, timeout)) != 0) {
+    if ((count = readWord(devAddr, regAddr, &w, timeout, wireObj)) != 0) {
         uint16_t mask = ((1 << length) - 1) << (bitStart - length + 1);
         w &= mask;
         w >>= (bitStart - length + 1);
@@ -185,8 +183,8 @@ int8_t I2Cdev::readBitsW(uint8_t devAddr, uint8_t regAddr, uint8_t bitStart, uin
  * @param timeout Optional read timeout in milliseconds (0 to disable, leave off to use default class value in I2Cdev::readTimeout)
  * @return Status of read operation (true = success)
  */
-int8_t I2Cdev::readByte(uint8_t devAddr, uint8_t regAddr, uint8_t *data, uint16_t timeout) {
-    return readBytes(devAddr, regAddr, 1, data, timeout);
+int8_t I2Cdev::readByte(uint8_t devAddr, uint8_t regAddr, uint8_t *data, uint16_t timeout, void *wireObj) {
+    return readBytes(devAddr, regAddr, 1, data, timeout, wireObj);
 }
 
 /** Read single word from a 16-bit device register.
@@ -196,8 +194,8 @@ int8_t I2Cdev::readByte(uint8_t devAddr, uint8_t regAddr, uint8_t *data, uint16_
  * @param timeout Optional read timeout in milliseconds (0 to disable, leave off to use default class value in I2Cdev::readTimeout)
  * @return Status of read operation (true = success)
  */
-int8_t I2Cdev::readWord(uint8_t devAddr, uint8_t regAddr, uint16_t *data, uint16_t timeout) {
-    return readWords(devAddr, regAddr, 1, data, timeout);
+int8_t I2Cdev::readWord(uint8_t devAddr, uint8_t regAddr, uint16_t *data, uint16_t timeout, void *wireObj) {
+    return readWords(devAddr, regAddr, 1, data, timeout, wireObj);
 }
 
 /** Read multiple bytes from an 8-bit device register.
@@ -208,7 +206,7 @@ int8_t I2Cdev::readWord(uint8_t devAddr, uint8_t regAddr, uint16_t *data, uint16
  * @param timeout Optional read timeout in milliseconds (0 to disable, leave off to use default class value in I2Cdev::readTimeout)
  * @return Number of bytes read (-1 indicates failure)
  */
-int8_t I2Cdev::readBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8_t *data, uint16_t timeout) {
+int8_t I2Cdev::readBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8_t *data, uint16_t timeout, void *wireObj) {
     #ifdef I2CDEV_SERIAL_DEBUG
         Serial.print("I2C (0x");
         Serial.print(devAddr, HEX);
@@ -219,74 +217,66 @@ int8_t I2Cdev::readBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8
         Serial.print("...");
     #endif
 
-    int8_t count = 0;
+    uint8_t count = 0;
     uint32_t t1 = millis();
 
     #if (I2CDEV_IMPLEMENTATION == I2CDEV_ARDUINO_WIRE || I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_SBWIRE || I2CDEV_IMPLEMENTATION == I2CDEV_TEENSY_3X_WIRE)
+        TwoWire *useWire = &Wire;
+        if (wireObj) useWire = (TwoWire *)wireObj;
 
         #if (ARDUINO < 100)
             // Arduino v00xx (before v1.0), Wire library
 
             // I2C/TWI subsystem uses internal buffer that breaks with large data requests
-            // so if user requests more than BUFFER_LENGTH bytes, we have to do it in
+            // so if user requests more than I2CDEVLIB_WIRE_BUFFER_LENGTH bytes, we have to do it in
             // smaller chunks instead of all at once
-            for (uint8_t k = 0; k < length; k += min((int)length, BUFFER_LENGTH)) {
-                Wire.beginTransmission(devAddr);
-                Wire.send(regAddr);
-                Wire.endTransmission();
-                Wire.beginTransmission(devAddr);
-                Wire.requestFrom(devAddr, (uint8_t)min(length - k, BUFFER_LENGTH));
-
-                for (; Wire.available() && (timeout == 0 || millis() - t1 < timeout); count++) {
-                    data[count] = Wire.receive();
+            for (int k = 0; k < length; k += min((int)length, I2CDEVLIB_WIRE_BUFFER_LENGTH)) {
+                useWire->beginTransmission(devAddr);
+                useWire->send(regAddr);
+                useWire->endTransmission();
+                useWire->requestFrom((uint8_t)devAddr, (uint8_t)min((int)length - k, I2CDEVLIB_WIRE_BUFFER_LENGTH));
+                for (; useWire->available() && (timeout == 0 || millis() - t1 < timeout); count++) {
+                    data[count] = useWire->receive();
                     #ifdef I2CDEV_SERIAL_DEBUG
                         Serial.print(data[count], HEX);
                         if (count + 1 < length) Serial.print(" ");
                     #endif
                 }
-
-                Wire.endTransmission();
             }
         #elif (ARDUINO == 100)
             // Arduino v1.0.0, Wire library
             // Adds standardized write() and read() stream methods instead of send() and receive()
 
             // I2C/TWI subsystem uses internal buffer that breaks with large data requests
-            // so if user requests more than BUFFER_LENGTH bytes, we have to do it in
+            // so if user requests more than I2CDEVLIB_WIRE_BUFFER_LENGTH bytes, we have to do it in
             // smaller chunks instead of all at once
-            for (uint8_t k = 0; k < length; k += min((int)length, BUFFER_LENGTH)) {
-                Wire.beginTransmission(devAddr);
-                Wire.write(regAddr);
-                Wire.endTransmission();
-                Wire.beginTransmission(devAddr);
-                Wire.requestFrom(devAddr, (uint8_t)min(length - k, BUFFER_LENGTH));
-        
-                for (; Wire.available() && (timeout == 0 || millis() - t1 < timeout); count++) {
-                    data[count] = Wire.read();
+            for (int k = 0; k < length; k += min((int)length, I2CDEVLIB_WIRE_BUFFER_LENGTH)) {
+                useWire->beginTransmission(devAddr);
+                useWire->write(regAddr);
+                useWire->endTransmission();
+                useWire->requestFrom((uint8_t)devAddr, (uint8_t)min((int)length - k, I2CDEVLIB_WIRE_BUFFER_LENGTH));
+                for (; useWire->available() && (timeout == 0 || millis() - t1 < timeout); count++) {
+                    data[count] = useWire->read();
                     #ifdef I2CDEV_SERIAL_DEBUG
                         Serial.print(data[count], HEX);
                         if (count + 1 < length) Serial.print(" ");
                     #endif
                 }
-        
-                Wire.endTransmission();
             }
         #elif (ARDUINO > 100)
             // Arduino v1.0.1+, Wire library
             // Adds official support for repeated start condition, yay!
 
             // I2C/TWI subsystem uses internal buffer that breaks with large data requests
-            // so if user requests more than BUFFER_LENGTH bytes, we have to do it in
+            // so if user requests more than I2CDEVLIB_WIRE_BUFFER_LENGTH bytes, we have to do it in
             // smaller chunks instead of all at once
-            for (uint8_t k = 0; k < length; k += min((int)length, BUFFER_LENGTH)) {
-                Wire.beginTransmission(devAddr);
-                Wire.write(regAddr);
-                Wire.endTransmission();
-                Wire.beginTransmission(devAddr);
-                Wire.requestFrom(devAddr, (uint8_t)min(length - k, BUFFER_LENGTH));
-        
-                for (; Wire.available() && (timeout == 0 || millis() - t1 < timeout); count++) {
-                    data[count] = Wire.read();
+            for (int k = 0; k < length; k += min((int)length, I2CDEVLIB_WIRE_BUFFER_LENGTH)) {
+                useWire->beginTransmission(devAddr);
+                useWire->write(regAddr);
+                useWire->endTransmission();
+                useWire->requestFrom((uint8_t)devAddr, (uint8_t)min((int)length - k, I2CDEVLIB_WIRE_BUFFER_LENGTH));
+                for (; useWire->available() && (timeout == 0 || millis() - t1 < timeout); count++) {
+                    data[count] = useWire->read();
                     #ifdef I2CDEV_SERIAL_DEBUG
                         Serial.print(data[count], HEX);
                         if (count + 1 < length) Serial.print(" ");
@@ -328,7 +318,7 @@ int8_t I2Cdev::readBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8
  * @param timeout Optional read timeout in milliseconds (0 to disable, leave off to use default class value in I2Cdev::readTimeout)
  * @return Number of words read (-1 indicates failure)
  */
-int8_t I2Cdev::readWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint16_t *data, uint16_t timeout) {
+int8_t I2Cdev::readWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint16_t *data, uint16_t timeout, void *wireObj) {
     #ifdef I2CDEV_SERIAL_DEBUG
         Serial.print("I2C (0x");
         Serial.print(devAddr, HEX);
@@ -339,32 +329,33 @@ int8_t I2Cdev::readWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint1
         Serial.print("...");
     #endif
 
-    int8_t count = 0;
+    uint8_t count = 0;
     uint32_t t1 = millis();
 
 #if I2CDEV_IMPLEMENTATION == I2CDEV_ARDUINO_WIRE || I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_SBWIRE || I2CDEV_IMPLEMENTATION == I2CDEV_TEENSY_3X_WIRE
+        TwoWire *useWire = &Wire;
+        if (wireObj) useWire = (TwoWire *)wireObj;
 
         #if (ARDUINO < 100)
             // Arduino v00xx (before v1.0), Wire library
 
             // I2C/TWI subsystem uses internal buffer that breaks with large data requests
-            // so if user requests more than BUFFER_LENGTH bytes, we have to do it in
+            // so if user requests more than I2CDEVLIB_WIRE_BUFFER_LENGTH bytes, we have to do it in
             // smaller chunks instead of all at once
-            for (uint8_t k = 0; k < length * 2; k += min(length * 2, BUFFER_LENGTH)) {
-                Wire.beginTransmission(devAddr);
-                Wire.send(regAddr);
-                Wire.endTransmission();
-                Wire.beginTransmission(devAddr);
-                Wire.requestFrom(devAddr, (uint8_t)(length * 2)); // length=words, this wants bytes
+            for (uint8_t k = 0; k < length * 2; k += min(length * 2, I2CDEVLIB_WIRE_BUFFER_LENGTH)) {
+                useWire->beginTransmission(devAddr);
+                useWire->send(regAddr);
+                useWire->endTransmission();
+                useWire->requestFrom(devAddr, (uint8_t)(length * 2)); // length=words, this wants bytes
     
                 bool msb = true; // starts with MSB, then LSB
-                for (; Wire.available() && count < length && (timeout == 0 || millis() - t1 < timeout);) {
+                for (; useWire->available() && count < length && (timeout == 0 || millis() - t1 < timeout);) {
                     if (msb) {
                         // first byte is bits 15-8 (MSb=15)
-                        data[count] = Wire.receive() << 8;
+                        data[count] = useWire->receive() << 8;
                     } else {
                         // second byte is bits 7-0 (LSb=0)
-                        data[count] |= Wire.receive();
+                        data[count] |= useWire->receive();
                         #ifdef I2CDEV_SERIAL_DEBUG
                             Serial.print(data[count], HEX);
                             if (count + 1 < length) Serial.print(" ");
@@ -373,31 +364,28 @@ int8_t I2Cdev::readWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint1
                     }
                     msb = !msb;
                 }
-
-                Wire.endTransmission();
             }
         #elif (ARDUINO == 100)
             // Arduino v1.0.0, Wire library
             // Adds standardized write() and read() stream methods instead of send() and receive()
     
             // I2C/TWI subsystem uses internal buffer that breaks with large data requests
-            // so if user requests more than BUFFER_LENGTH bytes, we have to do it in
+            // so if user requests more than I2CDEVLIB_WIRE_BUFFER_LENGTH bytes, we have to do it in
             // smaller chunks instead of all at once
-            for (uint8_t k = 0; k < length * 2; k += min(length * 2, BUFFER_LENGTH)) {
-                Wire.beginTransmission(devAddr);
-                Wire.write(regAddr);
-                Wire.endTransmission();
-                Wire.beginTransmission(devAddr);
-                Wire.requestFrom(devAddr, (uint8_t)(length * 2)); // length=words, this wants bytes
+            for (uint8_t k = 0; k < length * 2; k += min(length * 2, I2CDEVLIB_WIRE_BUFFER_LENGTH)) {
+                useWire->beginTransmission(devAddr);
+                useWire->write(regAddr);
+                useWire->endTransmission();
+                useWire->requestFrom(devAddr, (uint8_t)(length * 2)); // length=words, this wants bytes
     
                 bool msb = true; // starts with MSB, then LSB
-                for (; Wire.available() && count < length && (timeout == 0 || millis() - t1 < timeout);) {
+                for (; useWire->available() && count < length && (timeout == 0 || millis() - t1 < timeout);) {
                     if (msb) {
                         // first byte is bits 15-8 (MSb=15)
-                        data[count] = Wire.read() << 8;
+                        data[count] = useWire->read() << 8;
                     } else {
                         // second byte is bits 7-0 (LSb=0)
-                        data[count] |= Wire.read();
+                        data[count] |= useWire->read();
                         #ifdef I2CDEV_SERIAL_DEBUG
                             Serial.print(data[count], HEX);
                             if (count + 1 < length) Serial.print(" ");
@@ -406,31 +394,28 @@ int8_t I2Cdev::readWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint1
                     }
                     msb = !msb;
                 }
-        
-                Wire.endTransmission();
             }
         #elif (ARDUINO > 100)
             // Arduino v1.0.1+, Wire library
             // Adds official support for repeated start condition, yay!
 
             // I2C/TWI subsystem uses internal buffer that breaks with large data requests
-            // so if user requests more than BUFFER_LENGTH bytes, we have to do it in
+            // so if user requests more than I2CDEVLIB_WIRE_BUFFER_LENGTH bytes, we have to do it in
             // smaller chunks instead of all at once
-            for (uint8_t k = 0; k < length * 2; k += min(length * 2, BUFFER_LENGTH)) {
-                Wire.beginTransmission(devAddr);
-                Wire.write(regAddr);
-                Wire.endTransmission();
-                Wire.beginTransmission(devAddr);
-                Wire.requestFrom(devAddr, (uint8_t)(length * 2)); // length=words, this wants bytes
+            for (uint8_t k = 0; k < length * 2; k += min(length * 2, I2CDEVLIB_WIRE_BUFFER_LENGTH)) {
+                useWire->beginTransmission(devAddr);
+                useWire->write(regAddr);
+                useWire->endTransmission();
+                useWire->requestFrom(devAddr, (uint8_t)(length * 2)); // length=words, this wants bytes
         
                 bool msb = true; // starts with MSB, then LSB
-                for (; Wire.available() && count < length && (timeout == 0 || millis() - t1 < timeout);) {
+                for (; useWire->available() && count < length && (timeout == 0 || millis() - t1 < timeout);) {
                     if (msb) {
                         // first byte is bits 15-8 (MSb=15)
-                        data[count] = Wire.read() << 8;
+                        data[count] = useWire->read() << 8;
                     } else {
                         // second byte is bits 7-0 (LSb=0)
-                        data[count] |= Wire.read();
+                        data[count] |= useWire->read();
                         #ifdef I2CDEV_SERIAL_DEBUG
                             Serial.print(data[count], HEX);
                             if (count + 1 < length) Serial.print(" ");
@@ -439,8 +424,6 @@ int8_t I2Cdev::readWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint1
                     }
                     msb = !msb;
                 }
-        
-                Wire.endTransmission();
             }
         #endif
 
@@ -479,11 +462,11 @@ int8_t I2Cdev::readWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint1
  * @param value New bit value to write
  * @return Status of operation (true = success)
  */
-bool I2Cdev::writeBit(uint8_t devAddr, uint8_t regAddr, uint8_t bitNum, uint8_t data) {
+bool I2Cdev::writeBit(uint8_t devAddr, uint8_t regAddr, uint8_t bitNum, uint8_t data, void *wireObj) {
     uint8_t b;
-    readByte(devAddr, regAddr, &b);
+    readByte(devAddr, regAddr, &b, I2Cdev::readTimeout, wireObj);
     b = (data != 0) ? (b | (1 << bitNum)) : (b & ~(1 << bitNum));
-    return writeByte(devAddr, regAddr, b);
+    return writeByte(devAddr, regAddr, b, wireObj);
 }
 
 /** write a single bit in a 16-bit device register.
@@ -493,11 +476,11 @@ bool I2Cdev::writeBit(uint8_t devAddr, uint8_t regAddr, uint8_t bitNum, uint8_t
  * @param value New bit value to write
  * @return Status of operation (true = success)
  */
-bool I2Cdev::writeBitW(uint8_t devAddr, uint8_t regAddr, uint8_t bitNum, uint16_t data) {
+bool I2Cdev::writeBitW(uint8_t devAddr, uint8_t regAddr, uint8_t bitNum, uint16_t data, void *wireObj) {
     uint16_t w;
-    readWord(devAddr, regAddr, &w);
+    readWord(devAddr, regAddr, &w, I2Cdev::readTimeout, wireObj);
     w = (data != 0) ? (w | (1 << bitNum)) : (w & ~(1 << bitNum));
-    return writeWord(devAddr, regAddr, w);
+    return writeWord(devAddr, regAddr, w, wireObj);
 }
 
 /** Write multiple bits in an 8-bit device register.
@@ -508,7 +491,7 @@ bool I2Cdev::writeBitW(uint8_t devAddr, uint8_t regAddr, uint8_t bitNum, uint16_
  * @param data Right-aligned value to write
  * @return Status of operation (true = success)
  */
-bool I2Cdev::writeBits(uint8_t devAddr, uint8_t regAddr, uint8_t bitStart, uint8_t length, uint8_t data) {
+bool I2Cdev::writeBits(uint8_t devAddr, uint8_t regAddr, uint8_t bitStart, uint8_t length, uint8_t data, void *wireObj) {
     //      010 value to write
     // 76543210 bit numbers
     //    xxx   args: bitStart=4, length=3
@@ -517,13 +500,13 @@ bool I2Cdev::writeBits(uint8_t devAddr, uint8_t regAddr, uint8_t bitStart, uint8
     // 10100011 original & ~mask
     // 10101011 masked | value
     uint8_t b;
-    if (readByte(devAddr, regAddr, &b) != 0) {
+    if (readByte(devAddr, regAddr, &b, I2Cdev::readTimeout, wireObj) != 0) {
         uint8_t mask = ((1 << length) - 1) << (bitStart - length + 1);
         data <<= (bitStart - length + 1); // shift data into correct position
         data &= mask; // zero all non-important bits in data
         b &= ~(mask); // zero all important bits in existing byte
         b |= data; // combine data with existing byte
-        return writeByte(devAddr, regAddr, b);
+        return writeByte(devAddr, regAddr, b, wireObj);
     } else {
         return false;
     }
@@ -537,7 +520,7 @@ bool I2Cdev::writeBits(uint8_t devAddr, uint8_t regAddr, uint8_t bitStart, uint8
  * @param data Right-aligned value to write
  * @return Status of operation (true = success)
  */
-bool I2Cdev::writeBitsW(uint8_t devAddr, uint8_t regAddr, uint8_t bitStart, uint8_t length, uint16_t data) {
+bool I2Cdev::writeBitsW(uint8_t devAddr, uint8_t regAddr, uint8_t bitStart, uint8_t length, uint16_t data, void *wireObj) {
     //              010 value to write
     // fedcba9876543210 bit numbers
     //    xxx           args: bitStart=12, length=3
@@ -546,13 +529,13 @@ bool I2Cdev::writeBitsW(uint8_t devAddr, uint8_t regAddr, uint8_t bitStart, uint
     // 1010001110010110 original & ~mask
     // 1010101110010110 masked | value
     uint16_t w;
-    if (readWord(devAddr, regAddr, &w) != 0) {
+    if (readWord(devAddr, regAddr, &w, I2Cdev::readTimeout, wireObj) != 0) {
         uint16_t mask = ((1 << length) - 1) << (bitStart - length + 1);
         data <<= (bitStart - length + 1); // shift data into correct position
         data &= mask; // zero all non-important bits in data
         w &= ~(mask); // zero all important bits in existing word
         w |= data; // combine data with existing word
-        return writeWord(devAddr, regAddr, w);
+        return writeWord(devAddr, regAddr, w, wireObj);
     } else {
         return false;
     }
@@ -564,8 +547,8 @@ bool I2Cdev::writeBitsW(uint8_t devAddr, uint8_t regAddr, uint8_t bitStart, uint
  * @param data New byte value to write
  * @return Status of operation (true = success)
  */
-bool I2Cdev::writeByte(uint8_t devAddr, uint8_t regAddr, uint8_t data) {
-    return writeBytes(devAddr, regAddr, 1, &data);
+bool I2Cdev::writeByte(uint8_t devAddr, uint8_t regAddr, uint8_t data, void *wireObj) {
+    return writeBytes(devAddr, regAddr, 1, &data, wireObj);
 }
 
 /** Write single word to a 16-bit device register.
@@ -574,8 +557,8 @@ bool I2Cdev::writeByte(uint8_t devAddr, uint8_t regAddr, uint8_t data) {
  * @param data New word value to write
  * @return Status of operation (true = success)
  */
-bool I2Cdev::writeWord(uint8_t devAddr, uint8_t regAddr, uint16_t data) {
-    return writeWords(devAddr, regAddr, 1, &data);
+bool I2Cdev::writeWord(uint8_t devAddr, uint8_t regAddr, uint16_t data, void *wireObj) {
+    return writeWords(devAddr, regAddr, 1, &data, wireObj);
 }
 
 /** Write multiple bytes to an 8-bit device register.
@@ -585,7 +568,7 @@ bool I2Cdev::writeWord(uint8_t devAddr, uint8_t regAddr, uint16_t data) {
  * @param data Buffer to copy new data from
  * @return Status of operation (true = success)
  */
-bool I2Cdev::writeBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8_t* data) {
+bool I2Cdev::writeBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8_t* data, void *wireObj) {
     #ifdef I2CDEV_SERIAL_DEBUG
         Serial.print("I2C (0x");
         Serial.print(devAddr, HEX);
@@ -596,14 +579,20 @@ bool I2Cdev::writeBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8_
         Serial.print("...");
     #endif
     uint8_t status = 0;
+
+#if I2CDEV_IMPLEMENTATION == I2CDEV_ARDUINO_WIRE || I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_SBWIRE || I2CDEV_IMPLEMENTATION == I2CDEV_TEENSY_3X_WIRE
+    TwoWire *useWire = &Wire;
+    if (wireObj) useWire = (TwoWire *)wireObj;
+#endif
+
     #if ((I2CDEV_IMPLEMENTATION == I2CDEV_ARDUINO_WIRE && ARDUINO < 100) || I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_NBWIRE)
-        Wire.beginTransmission(devAddr);
-        Wire.send((uint8_t) regAddr); // send address
+        useWire->beginTransmission(devAddr);
+        useWire->send((uint8_t) regAddr); // send address
     #elif ((I2CDEV_IMPLEMENTATION == I2CDEV_ARDUINO_WIRE && ARDUINO >= 100) \
             || (I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_SBWIRE && ARDUINO >= 100) \
             || I2CDEV_IMPLEMENTATION == I2CDEV_TEENSY_3X_WIRE)
-        Wire.beginTransmission(devAddr);
-        Wire.write((uint8_t) regAddr); // send address
+        useWire->beginTransmission(devAddr);
+        useWire->write((uint8_t) regAddr); // send address
     #elif (I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_FASTWIRE)
         Fastwire::beginTransmission(devAddr);
         Fastwire::write(regAddr);
@@ -614,21 +603,21 @@ bool I2Cdev::writeBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8_
             if (i + 1 < length) Serial.print(" ");
         #endif
         #if ((I2CDEV_IMPLEMENTATION == I2CDEV_ARDUINO_WIRE && ARDUINO < 100) || I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_NBWIRE)
-            Wire.send((uint8_t) data[i]);
+            useWire->send((uint8_t) data[i]);
         #elif ((I2CDEV_IMPLEMENTATION == I2CDEV_ARDUINO_WIRE && ARDUINO >= 100) \
                 || (I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_SBWIRE && ARDUINO >= 100) \
                 || I2CDEV_IMPLEMENTATION == I2CDEV_TEENSY_3X_WIRE)
-            Wire.write((uint8_t) data[i]);
+            useWire->write((uint8_t) data[i]);
         #elif (I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_FASTWIRE)
             Fastwire::write((uint8_t) data[i]);
         #endif
     }
     #if ((I2CDEV_IMPLEMENTATION == I2CDEV_ARDUINO_WIRE && ARDUINO < 100) || I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_NBWIRE)
-        Wire.endTransmission();
+        useWire->endTransmission();
     #elif ((I2CDEV_IMPLEMENTATION == I2CDEV_ARDUINO_WIRE && ARDUINO >= 100) \
             || (I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_SBWIRE && ARDUINO >= 100) \
             || I2CDEV_IMPLEMENTATION == I2CDEV_TEENSY_3X_WIRE)
-        status = Wire.endTransmission();
+        status = useWire->endTransmission();
     #elif (I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_FASTWIRE)
         Fastwire::stop();
         //status = Fastwire::endTransmission();
@@ -646,7 +635,7 @@ bool I2Cdev::writeBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8_
  * @param data Buffer to copy new data from
  * @return Status of operation (true = success)
  */
-bool I2Cdev::writeWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint16_t* data) {
+bool I2Cdev::writeWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint16_t* data, void *wireObj) {
     #ifdef I2CDEV_SERIAL_DEBUG
         Serial.print("I2C (0x");
         Serial.print(devAddr, HEX);
@@ -657,14 +646,20 @@ bool I2Cdev::writeWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint16
         Serial.print("...");
     #endif
     uint8_t status = 0;
+
+#if I2CDEV_IMPLEMENTATION == I2CDEV_ARDUINO_WIRE || I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_SBWIRE || I2CDEV_IMPLEMENTATION == I2CDEV_TEENSY_3X_WIRE
+    TwoWire *useWire = &Wire;
+    if (wireObj) useWire = (TwoWire *)wireObj;
+#endif
+
     #if ((I2CDEV_IMPLEMENTATION == I2CDEV_ARDUINO_WIRE && ARDUINO < 100) || I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_NBWIRE)
-        Wire.beginTransmission(devAddr);
-        Wire.send(regAddr); // send address
+        useWire->beginTransmission(devAddr);
+        useWire->send(regAddr); // send address
     #elif ((I2CDEV_IMPLEMENTATION == I2CDEV_ARDUINO_WIRE && ARDUINO >= 100) \
             || (I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_SBWIRE && ARDUINO >= 100) \
             || I2CDEV_IMPLEMENTATION == I2CDEV_TEENSY_3X_WIRE)
-        Wire.beginTransmission(devAddr);
-        Wire.write(regAddr); // send address
+        useWire->beginTransmission(devAddr);
+        useWire->write(regAddr); // send address
     #elif (I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_FASTWIRE)
         Fastwire::beginTransmission(devAddr);
         Fastwire::write(regAddr);
@@ -675,13 +670,13 @@ bool I2Cdev::writeWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint16
             if (i + 1 < length) Serial.print(" ");
         #endif
         #if ((I2CDEV_IMPLEMENTATION == I2CDEV_ARDUINO_WIRE && ARDUINO < 100) || I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_NBWIRE)
-            Wire.send((uint8_t)(data[i] >> 8));     // send MSB
-            Wire.send((uint8_t)data[i]);          // send LSB
+            useWire->send((uint8_t)(data[i] >> 8));     // send MSB
+            useWire->send((uint8_t)data[i]);          // send LSB
         #elif ((I2CDEV_IMPLEMENTATION == I2CDEV_ARDUINO_WIRE && ARDUINO >= 100) \
                 || (I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_SBWIRE && ARDUINO >= 100) \
                 || I2CDEV_IMPLEMENTATION == I2CDEV_TEENSY_3X_WIRE)
-            Wire.write((uint8_t)(data[i] >> 8));    // send MSB
-            Wire.write((uint8_t)data[i]);         // send LSB
+            useWire->write((uint8_t)(data[i] >> 8));    // send MSB
+            useWire->write((uint8_t)data[i]);         // send LSB
         #elif (I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_FASTWIRE)
             Fastwire::write((uint8_t)(data[i] >> 8));       // send MSB
             status = Fastwire::write((uint8_t)data[i]);   // send LSB
@@ -689,11 +684,11 @@ bool I2Cdev::writeWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint16
         #endif
     }
     #if ((I2CDEV_IMPLEMENTATION == I2CDEV_ARDUINO_WIRE && ARDUINO < 100) || I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_NBWIRE)
-        Wire.endTransmission();
+        useWire->endTransmission();
     #elif ((I2CDEV_IMPLEMENTATION == I2CDEV_ARDUINO_WIRE && ARDUINO >= 100) \
             || (I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_SBWIRE && ARDUINO >= 100) \
             || I2CDEV_IMPLEMENTATION == I2CDEV_TEENSY_3X_WIRE)
-        status = Wire.endTransmission();
+        status = useWire->endTransmission();
     #elif (I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_FASTWIRE)
         Fastwire::stop();
         //status = Fastwire::endTransmission();
@@ -753,7 +748,7 @@ uint16_t I2Cdev::readTimeout = I2CDEV_DEFAULT_READ_TIMEOUT;
         #endif
 
         TWSR = 0; // no prescaler => prescaler = 1
-        TWBR = ((16000L / khz) - 16) / 2; // change the I2C clock rate
+        TWBR = F_CPU / 2000 / khz - 8; // change the I2C clock rate
         TWCR = 1 << TWEN; // enable twi module, no interrupt
     }
 
@@ -993,7 +988,7 @@ uint16_t I2Cdev::readTimeout = I2CDEV_DEFAULT_READ_TIMEOUT;
         TWBR = ((CPU_FREQ / TWI_FREQ) - 16) / 2; // bitrate register
         // enable twi module, acks, and twi interrupt
 
-        TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWEA);
+        TWCR = (1 << TWEN) | (1 << TWIE) | (1 << TWEA);
 
         /* TWEN - TWI Enable Bit
         TWIE - TWI Interrupt Enable
@@ -1062,7 +1057,7 @@ uint16_t I2Cdev::readTimeout = I2CDEV_DEFAULT_READ_TIMEOUT;
     }
 
     void twii_SetStart() {
-        TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWEA) | _BV(TWINT) | _BV(TWSTA);
+        TWCR = (1 << TWEN) | (1 << TWIE) | (1 << TWEA) | (1 << TWINT) | (1 << TWSTA);
     }
 
     void twi_write01() {
@@ -1145,19 +1140,19 @@ uint16_t I2Cdev::readTimeout = I2CDEV_DEFAULT_READ_TIMEOUT;
     void twi_reply(uint8_t ack) {
         // transmit master read ready signal, with or without ack
         if (ack){
-            TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWINT) | _BV(TWEA);
+            TWCR = (1 << TWEN) | (1 << TWIE) | (1 << TWINT) | (1 << TWEA);
         } else {
-            TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWINT);
+            TWCR = (1 << TWEN) | (1 << TWIE) | (1 << TWINT);
         }
     }
     
     void twi_stop(void) {
         // send stop condition
-        TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWEA) | _BV(TWINT) | _BV(TWSTO);
+        TWCR = (1 << TWEN) | (1 << TWIE) | (1 << TWEA) | (1 << TWINT) | (1 << TWSTO);
     
         // wait for stop condition to be exectued on bus
         // TWINT is not set after a stop condition!
-        while (TWCR & _BV(TWSTO)) {
+        while (TWCR & (1 << TWSTO)) {
             continue;
         }
     
@@ -1167,7 +1162,7 @@ uint16_t I2Cdev::readTimeout = I2CDEV_DEFAULT_READ_TIMEOUT;
 
     void twi_releaseBus(void) {
         // release bus
-        TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWEA) | _BV(TWINT);
+        TWCR = (1 << TWEN) | (1 << TWIE) | (1 << TWEA) | (1 << TWINT);
     
         // update twi state
         twi_state = TWI_READY;
diff --git a/src/utility/ioexpander/I2Cdev.h b/src/utility/ioexpander/I2Cdev.h
index 60c3195..5b59c56 100644
--- a/src/utility/ioexpander/I2Cdev.h
+++ b/src/utility/ioexpander/I2Cdev.h
@@ -3,6 +3,7 @@
 // 2013-06-05 by Jeff Rowberg <jeff@rowberg.net>
 //
 // Changelog:
+//      2021-09-28 - allow custom Wire object as transaction function argument
 //      2020-01-20 - hardija : complete support for Teensy 3.x
 //      2015-10-30 - simondlevy : support i2c_t3 for Teensy3.1
 //      2013-05-06 - add Francesco Ferrara's Fastwire v0.24 implementation with small modifications
@@ -48,6 +49,11 @@ THE SOFTWARE.
 #ifndef _I2CDEV_H_
 #define _I2CDEV_H_
 
+// -----------------------------------------------------------------------------
+// Enable deprecated pgmspace typedefs in avr-libc
+// -----------------------------------------------------------------------------
+#define __PROG_TYPES_COMPAT__
+
 // -----------------------------------------------------------------------------
 // I2C interface implementation setting
 // -----------------------------------------------------------------------------
@@ -99,10 +105,26 @@ THE SOFTWARE.
 #endif
 
 #ifdef SPARK
-    #include <spark_wiring_i2c.h>
+    #include "application.h"
     #define ARDUINO 101
+    #define BUFFER_LENGTH 32
 #endif
 
+#ifndef I2CDEVLIB_WIRE_BUFFER_LENGTH
+    #if defined(I2C_BUFFER_LENGTH)
+        // Arduino ESP32 core Wire uses this
+        #define I2CDEVLIB_WIRE_BUFFER_LENGTH I2C_BUFFER_LENGTH
+    #elif defined(BUFFER_LENGTH)
+        // Arduino AVR core Wire and many others use this
+        #define I2CDEVLIB_WIRE_BUFFER_LENGTH BUFFER_LENGTH
+    #elif defined(SERIAL_BUFFER_SIZE)
+        // Arduino SAMD core Wire uses this
+        #define I2CDEVLIB_WIRE_BUFFER_LENGTH SERIAL_BUFFER_SIZE
+    #else
+        // should be a safe fallback, though possibly inefficient
+        #define I2CDEVLIB_WIRE_BUFFER_LENGTH 32
+    #endif
+#endif
 
 // 1000ms default read timeout (modify with "I2Cdev::readTimeout = [ms];")
 #define I2CDEV_DEFAULT_READ_TIMEOUT     1000
@@ -111,23 +133,23 @@ class I2Cdev {
     public:
         I2Cdev();
 
-        static int8_t readBit(uint8_t devAddr, uint8_t regAddr, uint8_t bitNum, uint8_t *data, uint16_t timeout=I2Cdev::readTimeout);
-        static int8_t readBitW(uint8_t devAddr, uint8_t regAddr, uint8_t bitNum, uint16_t *data, uint16_t timeout=I2Cdev::readTimeout);
-        static int8_t readBits(uint8_t devAddr, uint8_t regAddr, uint8_t bitStart, uint8_t length, uint8_t *data, uint16_t timeout=I2Cdev::readTimeout);
-        static int8_t readBitsW(uint8_t devAddr, uint8_t regAddr, uint8_t bitStart, uint8_t length, uint16_t *data, uint16_t timeout=I2Cdev::readTimeout);
-        static int8_t readByte(uint8_t devAddr, uint8_t regAddr, uint8_t *data, uint16_t timeout=I2Cdev::readTimeout);
-        static int8_t readWord(uint8_t devAddr, uint8_t regAddr, uint16_t *data, uint16_t timeout=I2Cdev::readTimeout);
-        static int8_t readBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8_t *data, uint16_t timeout=I2Cdev::readTimeout);
-        static int8_t readWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint16_t *data, uint16_t timeout=I2Cdev::readTimeout);
-
-        static bool writeBit(uint8_t devAddr, uint8_t regAddr, uint8_t bitNum, uint8_t data);
-        static bool writeBitW(uint8_t devAddr, uint8_t regAddr, uint8_t bitNum, uint16_t data);
-        static bool writeBits(uint8_t devAddr, uint8_t regAddr, uint8_t bitStart, uint8_t length, uint8_t data);
-        static bool writeBitsW(uint8_t devAddr, uint8_t regAddr, uint8_t bitStart, uint8_t length, uint16_t data);
-        static bool writeByte(uint8_t devAddr, uint8_t regAddr, uint8_t data);
-        static bool writeWord(uint8_t devAddr, uint8_t regAddr, uint16_t data);
-        static bool writeBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8_t *data);
-        static bool writeWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint16_t *data);
+        static int8_t readBit(uint8_t devAddr, uint8_t regAddr, uint8_t bitNum, uint8_t *data, uint16_t timeout=I2Cdev::readTimeout, void *wireObj=0);
+        static int8_t readBitW(uint8_t devAddr, uint8_t regAddr, uint8_t bitNum, uint16_t *data, uint16_t timeout=I2Cdev::readTimeout, void *wireObj=0);
+        static int8_t readBits(uint8_t devAddr, uint8_t regAddr, uint8_t bitStart, uint8_t length, uint8_t *data, uint16_t timeout=I2Cdev::readTimeout, void *wireObj=0);
+        static int8_t readBitsW(uint8_t devAddr, uint8_t regAddr, uint8_t bitStart, uint8_t length, uint16_t *data, uint16_t timeout=I2Cdev::readTimeout, void *wireObj=0);
+        static int8_t readByte(uint8_t devAddr, uint8_t regAddr, uint8_t *data, uint16_t timeout=I2Cdev::readTimeout, void *wireObj=0);
+        static int8_t readWord(uint8_t devAddr, uint8_t regAddr, uint16_t *data, uint16_t timeout=I2Cdev::readTimeout, void *wireObj=0);
+        static int8_t readBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8_t *data, uint16_t timeout=I2Cdev::readTimeout, void *wireObj=0);
+        static int8_t readWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint16_t *data, uint16_t timeout=I2Cdev::readTimeout, void *wireObj=0);
+
+        static bool writeBit(uint8_t devAddr, uint8_t regAddr, uint8_t bitNum, uint8_t data, void *wireObj=0);
+        static bool writeBitW(uint8_t devAddr, uint8_t regAddr, uint8_t bitNum, uint16_t data, void *wireObj=0);
+        static bool writeBits(uint8_t devAddr, uint8_t regAddr, uint8_t bitStart, uint8_t length, uint8_t data, void *wireObj=0);
+        static bool writeBitsW(uint8_t devAddr, uint8_t regAddr, uint8_t bitStart, uint8_t length, uint16_t data, void *wireObj=0);
+        static bool writeByte(uint8_t devAddr, uint8_t regAddr, uint8_t data, void *wireObj=0);
+        static bool writeWord(uint8_t devAddr, uint8_t regAddr, uint16_t data, void *wireObj=0);
+        static bool writeBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8_t *data, void *wireObj=0);
+        static bool writeWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint16_t *data, void *wireObj=0);
 
         static uint16_t readTimeout;
 };
@@ -240,7 +262,7 @@ class I2Cdev {
 
     /* TWI Status is in TWSR, in the top 5 bits: TWS7 - TWS3 */
 
-    #define TW_STATUS_MASK              (_BV(TWS7)|_BV(TWS6)|_BV(TWS5)|_BV(TWS4)|_BV(TWS3))
+    #define TW_STATUS_MASK              ((1 << TWS7)|(1 << TWS6)|(1 << TWS5)|(1 << TWS4)|(1 << TWS3))
     #define TW_STATUS                   (TWSR & TW_STATUS_MASK)
     #define TW_START                    0x08
     #define TW_REP_START                0x10
@@ -275,11 +297,11 @@ class I2Cdev {
     //#define _SFR_BYTE(sfr) _MMIO_BYTE(_SFR_ADDR(sfr))
 
     #ifndef sbi // set bit
-        #define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
+        #define sbi(sfr, bit) (_SFR_BYTE(sfr) |= (1 << bit))
     #endif // sbi
 
     #ifndef cbi // clear bit
-        #define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
+        #define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~(1 << bit))
     #endif // cbi
 
     extern TwoWire Wire;

From 87736c28f2d4f6d26d1f46f513e28b44abfc9e44 Mon Sep 17 00:00:00 2001
From: Leonardo Cavagnis <45899760+leonardocavagnis@users.noreply.github.com>
Date: Tue, 27 Feb 2024 12:06:09 +0100
Subject: [PATCH 14/15] Update README.md

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 703056e..1672e27 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,9 @@
 
 > [!WARNING]
 > This library is deprecated and no longer actively maintained.
-> We recommend transitioning to the [Arduino_PortentaMachineControl](https://github.com/arduino-libraries/Arduino_PortentaMachineControl) library for ongoing support, new features and contributions.
+>
+> We recommend transitioning to the [Arduino_PortentaMachineControl](https://github.com/arduino-libraries/Arduino_PortentaMachineControl) library for ongoing support, new features and contributions. If you need assistance with migration, refer to the [migration guide](https://docs.arduino.cc/tutorials/portenta-machine-control/pmc-arduino-library).
+>
 > Please note that the [examples](./examples/) provided with this library are not compatible with the new library.
 
 [![Check Arduino status](https://github.com/arduino-libraries/Arduino_MachineControl/actions/workflows/check-arduino.yml/badge.svg)](https://github.com/arduino-libraries/Arduino_MachineControl/actions/workflows/check-arduino.yml)

From a3357daf0531ff29c8c23e56fc7dac4e59c62586 Mon Sep 17 00:00:00 2001
From: Leonardo Cavagnis <45899760+leonardocavagnis@users.noreply.github.com>
Date: Tue, 27 Feb 2024 12:32:22 +0100
Subject: [PATCH 15/15] Update library.properties 1.1.2

---
 library.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.properties b/library.properties
index 9d37919..4f5ea82 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=Arduino_MachineControl
-version=1.1.1
+version=1.1.2
 author=Arduino
 maintainer=Arduino <info@arduino.cc>
 sentence=DEPRECATED. Arduino Library for Portenta Machine Control - PMC