Enable RFID UID output and tidy car mass input
This commit is contained in:
+2
-9
@@ -21,17 +21,11 @@ bool seatBelts = false;
|
||||
void setup() {
|
||||
Serial.begin(9600);
|
||||
|
||||
// -----------------------------------------------------------------
|
||||
// 1. Ask the user for the car mass (kg) via the Serial monitor.
|
||||
// We block only until a valid number is received – this is OK
|
||||
// because it happens once at startup.
|
||||
// -----------------------------------------------------------------
|
||||
Serial.println(F("Enter car mass in kg (e.g. 1200):"));
|
||||
while (true) {
|
||||
// Wait until something is typed
|
||||
if (Serial.available() > 0) {
|
||||
float mass = Serial.parseFloat(); // reads the number
|
||||
if (mass > 0) { // basic sanity check
|
||||
float mass = Serial.parseFloat();
|
||||
if (mass > 0) {
|
||||
engine.setCarMass(mass);
|
||||
Serial.print(F("Car mass set to "));
|
||||
Serial.print(mass);
|
||||
@@ -43,7 +37,6 @@ void setup() {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
pinMode(IN_1, OUTPUT);
|
||||
pinMode(IN_2, OUTPUT);
|
||||
pinMode(ENA_1, OUTPUT);
|
||||
|
||||
@@ -11,8 +11,6 @@ void RFIDReader::begin() {
|
||||
bool RFIDReader::check() {
|
||||
if (!_rfid.PICC_IsNewCardPresent()) return false;
|
||||
if (!_rfid.PICC_ReadCardSerial()) return false;
|
||||
// _rfid.PICC_HaltA(); // stop the tag
|
||||
// _rfid.PCD_StopCrypto1(); // clear RC522 crypto
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -31,10 +29,10 @@ bool RFIDReader::matches(const byte* expectedUid, byte expectedSize) const {
|
||||
|
||||
void RFIDReader::printUID() const {
|
||||
Serial.println(F("RFID Tag UID:"));
|
||||
// for (byte i = 0; i < _rfid.uid.size; i++) {
|
||||
// Serial.print(_rfid.uid.uidByte[i] < 0x10 ? " 0" : " ");
|
||||
// Serial.print(_rfid.uid.uidByte[i], HEX);
|
||||
// }
|
||||
for (byte i = 0; i < _rfid.uid.size; i++) {
|
||||
Serial.print(_rfid.uid.uidByte[i] < 0x10 ? " 0" : " ");
|
||||
Serial.print(_rfid.uid.uidByte[i], HEX);
|
||||
}
|
||||
}
|
||||
|
||||
const byte* RFIDReader::getUID() const {
|
||||
|
||||
Reference in New Issue
Block a user