Use TwiBuffers class for all buffers needed by Wire and twi. Allows

optionally tweaking Wire buffer and twi buffer sizes at compile time.

enum TWI_STATE : uint8_t becomes uint8_t.
twi_state type changed form uint8_t to TWI_STATE.

Added examples for customized buffers.

Do println() after all received characters have been printed in
master_reader.ino.

Author: dac1e

libraries/Wire/examples/master_reader/master_reader.ino

@@ -24,6 +24,7 @@ void loop() {
     char c = Wire.read(); // receive a byte as character
     Serial.print(c);         // print the character
   }
+  Serial.println();
 
   delay(500);
 }

libraries/Wire/examples/master_reader_custombuffer/master_reader_custombuffer.ino

@@ -0,0 +1,73 @@
+// Wire Master Reader Custom Buffer
+
+// Demonstrates use of the Wire library
+// Reads data from an I2C/TWI slave device
+// Refer to the "Wire Slave Sender Custom Buffer" example for use with this
+
+// Created 31 Dec 2024
+
+// This example code is in the public domain.
+
+
+#include <Wire.h>
+#include <TwoWireBuffers.h>
+
+// request 6 bytes from slave device #8
+size_t constexpr REQUESTED_BYTE_COUNT = 6;
+
+/**** Begin Customize buffers ****/
+// Note: If you spell namespace 'WireBuffers' wrongly, all buffer
+// sizes of the 'Wire' object stay at default (32 bytes).
+namespace WireBuffers {
+  size_t constexpr RECEIVE_BUFFER_SIZE  = REQUESTED_BYTE_COUNT;
+  size_t constexpr TRANSMIT_BUFFER_SIZE = 0; // There is no transmit in this sketch.
+  // We operate as a master only, so we use the macro that will set slave buffers to zero.
+  SET_BUFFERS_FOR_MASTER_ONLY(RECEIVE_BUFFER_SIZE, TRANSMIT_BUFFER_SIZE);
+}
+/**** End Customize buffers ******/
+
+// This is just for curiosity.
+// Set to false if you don't want to see actual buffer sizes on serial monitor.
+#define VERBOSE true
+
+void setup() {
+  Wire.begin();        // join I2C bus (address optional for master)
+  Serial.begin(9600);  // start serial for output
+#if VERBOSE
+  printWireBuffers();
+#endif
+}
+
+void loop() {
+  Wire.requestFrom(8, REQUESTED_BYTE_COUNT);
+
+  while (Wire.available()) { // slave may send less than requested
+    char c = Wire.read(); // receive a byte as character
+    Serial.print(c);         // print the character
+  }
+  Serial.println();
+
+  delay(500);
+}
+
+#if VERBOSE
+void printWireBuffers() {
+  delay(100);
+  Serial.println();
+  Serial.print("Wire transmit buffer size is ");
+  Serial.println(Wire.txBufferCapacity());
+  Serial.print("Wire receive buffer size is ");
+  Serial.println(Wire.rxBufferCapacity());
+
+  TwoWireBuffers::Interface& buffers = WireBuffers::instance();
+  Serial.print("twi_masterBuffer size is ");
+  Serial.println(buffers.twi_masterBufferCapacity());
+
+  Serial.print("twi_rxBuffer size is ");
+  Serial.println(buffers.twi_rxBufferCapacity());
+
+  Serial.print("twi_txBuffer size is ");
+  Serial.println(buffers.twi_txBufferCapacity());
+  delay(500);
+}
+#endif

libraries/Wire/examples/master_writer/master_writer.ino

@@ -16,7 +16,7 @@ void setup() {
   Wire.begin(); // join I2C bus (address optional for master)
 }
 
-byte x = 0;
+static byte x = 0;
 
 void loop() {
   Wire.beginTransmission(8); // transmit to device #8

libraries/Wire/examples/master_writer_custombuffer/master_writer_custombuffer.ino

@@ -0,0 +1,73 @@
+// Wire Master Writer Custom Buffer
+
+// Demonstrates use of the Wire library
+// Writes data to an I2C/TWI slave device
+// Refer to the "Wire Slave Receiver Custom Buffer" example for use with this
+
+// Created 31 Dec 2024
+
+// This example code is in the public domain.
+
+
+#include <Wire.h>
+#include <TwoWireBuffers.h>
+
+// The following text will not fit into the default buffer of 32 bytes.
+static const char text[] = "You really won't believe it, but x is ";
+
+/**** Begin Customize buffers ****/
+// Note: If you spell namespace 'WireBuffers' wrongly, all buffer sizes
+// of the 'Wire' object stay at default (32 bytes).
+namespace WireBuffers {
+  size_t constexpr RECEIVE_BUFFER_SIZE  = 0;  // There is no receive in this sketch.
+  size_t constexpr TRANSMIT_BUFFER_SIZE = 42; // Enhance the buffer to 42 characters.
+  // We operate as a master only, so we use the macro that will set slave buffers to zero.
+  SET_BUFFERS_FOR_MASTER_ONLY(RECEIVE_BUFFER_SIZE, TRANSMIT_BUFFER_SIZE);
+}
+/**** End Customize buffers ******/
+
+// This is just for curiosity.
+// Set to false if you don't want to see actual buffer sizes on serial monitor.
+#define VERBOSE true
+
+void setup() {
+  Wire.begin(); // join I2C bus (address optional for master)
+#if VERBOSE
+  Serial.begin(9600);           // start serial for output
+  printWireBuffers();
+#endif
+}
+
+static byte x = 0;
+
+void loop() {
+  Wire.beginTransmission(8); // transmit to device #8
+  Wire.write(text);        // sends five bytes
+  Wire.write(x);              // sends one byte
+  Wire.endTransmission();    // stop transmitting
+
+  x++;
+  delay(500);
+}
+
+#if VERBOSE
+void printWireBuffers() {
+  delay(100);
+  Serial.println();
+  Serial.print("Wire transmit buffer size is ");
+  Serial.println(Wire.txBufferCapacity());
+  Serial.print("Wire receive buffer size is ");
+  Serial.println(Wire.rxBufferCapacity());
+
+  TwoWireBuffers::Interface& buffers = WireBuffers::instance();
+  Serial.print("twi_masterBuffer size is ");
+  Serial.println(buffers.twi_masterBufferCapacity());
+
+  Serial.print("twi_rxBuffer size is ");
+  Serial.println(buffers.twi_rxBufferCapacity());
+
+  Serial.print("twi_txBuffer size is ");
+  Serial.println(buffers.twi_txBufferCapacity());
+  delay(500);
+}
+#endif

libraries/Wire/examples/slave_receiver_custombuffer/slave_receiver_custombuffer.ino

@@ -0,0 +1,74 @@
+// Wire Slave Receiver Custom Buffer
+
+// Demonstrates use of the Wire library
+// Receives data as an I2C/TWI slave device
+// Refer to the "Wire Master Writer Custom Buffer" example for use with this
+
+// Created 31 Dec 2024
+
+// This example code is in the public domain.
+
+
+#include <Wire.h>
+#include <TwoWireBuffers.h>
+
+/**** Begin Customize buffers ****/
+// Note: If you spell namespace 'WireBuffers' wrongly, all buffer sizes
+// of the 'Wire' object stay at default (32 bytes).
+namespace WireBuffers {
+  size_t constexpr RECEIVE_BUFFER_SIZE  = 42; // Be able receive up to 42 characters in one message.
+  size_t constexpr TRANSMIT_BUFFER_SIZE = 0;  // There is no transmit in this sketch.
+  // We operate as a slave only, so we use the macro that will set master buffers to zero.
+  SET_BUFFERS_FOR_SLAVE_ONLY(RECEIVE_BUFFER_SIZE, TRANSMIT_BUFFER_SIZE);
+}
+/**** End Customize buffers ******/
+
+// This is just for curiosity.
+// Set to false if you don't want to see actual buffer sizes on serial monitor.
+#define VERBOSE true
+
+void setup() {
+  Wire.begin(8);                // join I2C bus with address #8
+  Wire.onReceive(receiveEvent); // register event
+  Serial.begin(9600);           // start serial for output
+#if VERBOSE
+  printWireBuffers();
+#endif
+}
+
+void loop() {
+  delay(100);
+}
+
+// function that executes whenever data is received from master
+// this function is registered as an event, see setup()
+void receiveEvent(int howMany) {
+  while (1 < Wire.available()) { // loop through all but the last
+    char c = Wire.read(); // receive byte as a character
+    Serial.print(c);         // print the character
+  }
+  int x = Wire.read();    // receive byte as an integer
+  Serial.println(x);         // print the integer
+}
+
+#if VERBOSE
+void printWireBuffers() {
+  delay(100);
+  Serial.println();
+  Serial.print("Wire transmit buffer size is ");
+  Serial.println(Wire.txBufferCapacity());
+  Serial.print("Wire receive buffer size is ");
+  Serial.println(Wire.rxBufferCapacity());
+
+  TwoWireBuffers::Interface& buffers = WireBuffers::instance();
+  Serial.print("twi_masterBuffer size is ");
+  Serial.println(buffers.twi_masterBufferCapacity());
+
+  Serial.print("twi_rxBuffer size is ");
+  Serial.println(buffers.twi_rxBufferCapacity());
+
+  Serial.print("twi_txBuffer size is ");
+  Serial.println(buffers.twi_txBufferCapacity());
+  delay(500);
+}
+#endif

libraries/Wire/examples/slave_sender_custombuffer/slave_sender_custombuffer.ino

@@ -0,0 +1,72 @@
+// Wire Slave Sender Custom Buffer
+
+// Demonstrates use of the Wire library
+// Sends data as an I2C/TWI slave device
+// Refer to the "Wire Master Reader Custom Buffer" example for use with this
+
+// Created 31 Dec 2024
+
+// This example code is in the public domain.
+
+
+#include <Wire.h>
+#include <TwoWireBuffers.h>
+
+static const char text[] = "hello "; // respond with message of 6 bytes
+
+/**** Begin Customize buffers ****/
+// Note: If you spell namespace 'WireBuffers' wrongly, all buffer sizes
+// of the 'Wire' object stay at default (32 bytes).
+namespace WireBuffers {
+  size_t constexpr RECEIVE_BUFFER_SIZE  = 0; // There is no receive in this sketch.
+  size_t constexpr TRANSMIT_BUFFER_SIZE = sizeof(text); // Don't need a byte for the \0
+  // We operate as a slave only, so we use the macro that will set master buffers to zero.
+  SET_BUFFERS_FOR_SLAVE_ONLY(RECEIVE_BUFFER_SIZE, TRANSMIT_BUFFER_SIZE);
+}
+/**** End Customize buffers ******/
+
+// This is just for curiosity.
+// Set to false if you don't want to see actual buffer sizes on serial monitor.
+#define VERBOSE true
+
+void setup() {
+  Wire.begin(8);                // join I2C bus with address #8
+  Wire.onRequest(requestEvent); // register event
+#if VERBOSE
+  Serial.begin(9600);           // start serial for output
+  printWireBuffers();
+#endif
+}
+
+void loop() {
+  delay(100);
+}
+
+// function that executes whenever data is requested by master
+// this function is registered as an event, see setup()
+void requestEvent() {
+  Wire.write(text);
+  // as expected by master
+}
+
+#if VERBOSE
+void printWireBuffers() {
+  delay(100);
+  Serial.println();
+  Serial.print("Wire transmit buffer size is ");
+  Serial.println(Wire.txBufferCapacity());
+  Serial.print("Wire receive buffer size is ");
+  Serial.println(Wire.rxBufferCapacity());
+
+  TwoWireBuffers::Interface& buffers = WireBuffers::instance();
+  Serial.print("twi_masterBuffer size is ");
+  Serial.println(buffers.twi_masterBufferCapacity());
+
+  Serial.print("twi_rxBuffer size is ");
+  Serial.println(buffers.twi_rxBufferCapacity());
+
+  Serial.print("twi_txBuffer size is ");
+  Serial.println(buffers.twi_txBufferCapacity());
+  delay(500);
+}
+#endif

libraries/Wire/src/TwoWireBuffers.cpp

@@ -0,0 +1,29 @@
+/*
+  twi.c - TWI/I2C library for Wiring & Arduino
+  Copyright (c) 2006 Nicholas Zambetti.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "TwoWireBuffers.h"
+
+
+constexpr size_t RX_BUFFER_DEFAULT_LENGTH = 32;
+constexpr size_t TX_BUFFER_DEFAULT_LENGTH = 32;
+
+// Default buffers for the one and only Wire object
+namespace WireBuffers {
+  __attribute__((weak)) SET_BUFFERS_FOR_BOTH(RX_BUFFER_DEFAULT_LENGTH, TX_BUFFER_DEFAULT_LENGTH);
+} // namespace Twi