Compare commits
No commits in common. "87a72e3e3e531d055bc067d5814a6be0487f68b2" and "54f73ccaf2f082e586818279ed737e1d1b5736e1" have entirely different histories.
87a72e3e3e
...
54f73ccaf2
2 changed files with 8 additions and 34 deletions
|
@ -23,7 +23,6 @@ void setup() {
|
|||
Serial.begin(115200);
|
||||
pinMode(LED_BUILTIN, OUTPUT);
|
||||
Wire.begin();
|
||||
Wire.setClock(400000);
|
||||
}
|
||||
|
||||
void loop() {
|
||||
|
|
|
@ -14,7 +14,6 @@ public class Arduino_Com : MonoBehaviour
|
|||
{
|
||||
Déconnecté,
|
||||
Connecté,
|
||||
Connexion,
|
||||
Lecture,
|
||||
Écriture,
|
||||
Invalide
|
||||
|
@ -69,21 +68,11 @@ public class Arduino_Com : MonoBehaviour
|
|||
return sum;
|
||||
}
|
||||
|
||||
// Core communication function.
|
||||
// Receives all the data from the cartridge and writes it out to the png file.
|
||||
// As the computer will probably read the serial data faster than the Arduino
|
||||
// /and/ the transfer is quite slow (lots of bits, low baudrate), make this a
|
||||
// coroutine.
|
||||
// This prevents the whole application freezing up why waiting for data and
|
||||
// allow presenting visual feedback.
|
||||
private IEnumerator<WaitUntil> ReceiveSerialData()
|
||||
{
|
||||
do
|
||||
{
|
||||
// We could use an event instead but as Unity is lagging behind .NET versions,
|
||||
// it wouldn't be cross-platform.
|
||||
yield return new WaitUntil(() => _serial.BytesToRead >= 1);
|
||||
|
||||
// Read all available data, up to the PageSize.
|
||||
_readBytes += _serial.Read(_pageBuffer, _readBytes, PageSize - _readBytes);
|
||||
|
||||
|
@ -115,7 +104,6 @@ public class Arduino_Com : MonoBehaviour
|
|||
_readBytes = 0;
|
||||
}
|
||||
} while (_currentPage < PageCount);
|
||||
|
||||
// We are done receiving the cart, we don't expect more data to be received so the coroutine can return.
|
||||
_currentPage = 0;
|
||||
_state = ArduinoState.Connecté;
|
||||
|
@ -234,7 +222,14 @@ public class Arduino_Com : MonoBehaviour
|
|||
return;
|
||||
}
|
||||
|
||||
StartCoroutine(DoSerialConnection());
|
||||
// TODO: Wait ~2s for Arduino startup
|
||||
_arduinoControlButton.text = "Déconnecter";
|
||||
|
||||
_cartLoadButton.SetEnabled(true);
|
||||
// _cartWriteButton.SetEnabled(true); TODO: Not implemented
|
||||
_arduinoSerialPort.SetEnabled(false);
|
||||
|
||||
_state = ArduinoState.Connecté;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -249,24 +244,4 @@ public class Arduino_Com : MonoBehaviour
|
|||
_state = SerialPort.GetPortNames().Contains(newPort.newValue) ? ArduinoState.Déconnecté : ArduinoState.Invalide;
|
||||
_arduinoControlButton.SetEnabled(_state != ArduinoState.Invalide);
|
||||
}
|
||||
|
||||
// Update UI during connection and when ready, prevent interacting too quickly.
|
||||
IEnumerator<WaitForSeconds> DoSerialConnection()
|
||||
{
|
||||
_arduinoControlButton.text = "Connexion...";
|
||||
_arduinoControlButton.SetEnabled(false);
|
||||
_arduinoSerialPort.SetEnabled(false);
|
||||
_state = ArduinoState.Connexion;
|
||||
|
||||
// Delay enabling transfers because the Arduino is slow to set-up the serial.
|
||||
yield return new WaitForSeconds(1.5f);
|
||||
|
||||
_arduinoControlButton.text = "Déconnecter";
|
||||
_arduinoControlButton.SetEnabled(true);
|
||||
|
||||
_cartLoadButton.SetEnabled(true);
|
||||
// _cartWriteButton.SetEnabled(true); TODO: Not implemented
|
||||
|
||||
_state = ArduinoState.Connecté;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue