Wire slave sender working with stops and with repeated starts

libraries/Wire/Wire.cpp

@@ -220,7 +220,7 @@ void TwoWire::onService(void)
   if ( sercom->isSlaveWIRE() )
   {
     if(sercom->isStopDetectedWIRE() || 
-        (sercom->isAddressMatch() && sercom->isRestartDetectedWIRE())) //Stop or Restart detected
+        (sercom->isAddressMatch() && sercom->isRestartDetectedWIRE() && !sercom->isMasterReadOperationWIRE())) //Stop or Restart detected
     {
       sercom->prepareAckBitWIRE();
       sercom->prepareCommandBitsWire(0x03);
@@ -240,6 +240,10 @@ void TwoWire::onService(void)
 
       if(sercom->isMasterReadOperationWIRE()) //Is a request ?
       {
+        // wait for data ready flag,
+        // before calling request callback
+        while(!sercom->isDataReadyWIRE());
+
         //Calling onRequestCallback, if exists
         if(onRequestCallback)
         {