Attempt to fix slave functionality

Reported in MCUdude#122
willietc · Jan 5, 2020 · 3be80b6 · 3be80b6
1 parent b5cd9c5
commit 3be80b6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/avr/libraries/Wire/src/Wire.cpp b/avr/libraries/Wire/src/Wire.cpp
@@ -17,6 +17,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  
   Modified 2012 by Todd Krein (todd@krein.org) to implement repeated starts
+  Modified 2017 by Chuck Todd (ctodd@cableone.net) to correct Unconfigured Slave Mode reboot
 */
 
 extern "C" {
@@ -60,14 +61,16 @@ void TwoWire::begin(void)
   txBufferLength = 0;
 
   twi_init();
+  twi_attachSlaveTxEvent(onRequestService); // default callback must exist
+  twi_attachSlaveRxEvent(onReceiveService); // default callback must exist
 }
 
 void TwoWire::begin(uint8_t address)
 {
-  twi_setAddress(address);
+  begin();
   twi_attachSlaveTxEvent(onRequestService);
   twi_attachSlaveRxEvent(onReceiveService);
-  begin();
+  twi_setAddress(address);
 }
 
 void TwoWire::begin(int address)

diff --git a/avr/libraries/Wire1/src/Wire1.cpp b/avr/libraries/Wire1/src/Wire1.cpp
@@ -17,6 +17,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  
   Modified 2012 by Todd Krein (todd@krein.org) to implement repeated starts
+  Modified 2017 by Chuck Todd (ctodd@cableone.net) to correct Unconfigured Slave Mode reboot
 */
 
 extern "C" {
@@ -60,14 +61,16 @@ void TwoWire1::begin(void)
   txBufferLength = 0;
 
   twi_init1();
+  twi_attachSlaveTxEvent1(onRequestService); // default callback must exist
+  twi_attachSlaveRxEvent1(onReceiveService); // default callback must exist
 }
 
 void TwoWire1::begin(uint8_t address)
 {
-  twi_setAddress1(address);
+  begin();
   twi_attachSlaveTxEvent1(onRequestService);
   twi_attachSlaveRxEvent1(onReceiveService);
-  begin();
+  twi_setAddress1(address);
 }
 
 void TwoWire1::begin(int address)