diff --git a/Engine.cpp b/Engine.cpp index 1e0d693..5e09640 100644 --- a/Engine.cpp +++ b/Engine.cpp @@ -14,74 +14,74 @@ float Engine::readNormalized(uint8_t pin) const { } void Engine::update(float dt, uint8_t gearIdx) { - Serial.println("----------------"); + // Serial.println("----------------"); const float throttle = readNormalized(_throttlePin); - Serial.print("Throttle: "); - Serial.println(throttle); + // Serial.print("Throttle: "); + // Serial.println(throttle); const float clutch = readNormalized(_clutchPin); - Serial.print("Clutch: "); - Serial.println(clutch); + // Serial.print("Clutch: "); + // Serial.println(clutch); const float brake = readNormalized(_brakePin); - Serial.print("Brake: "); - Serial.println(brake); + // Serial.print("Brake: "); + // Serial.println(brake); const float targetRPM = RPM_IDLE + throttle * (RPM_MAX - RPM_IDLE); - Serial.print("targetRPM: "); - Serial.println(targetRPM); + // Serial.print("targetRPM: "); + // Serial.println(targetRPM); const float wheelRPM = (_speedMs / (2.0f * PI * WHEEL_RADIUS)) * 60.0f; - Serial.print("wheelRPM: "); - Serial.println(wheelRPM); + // Serial.print("wheelRPM: "); + // Serial.println(wheelRPM); const float gearRatio = GEAR_RATIO[gearIdx]; - Serial.print("gearRatio: "); - Serial.println(gearRatio); + // Serial.print("gearRatio: "); + // Serial.println(gearRatio); const float drivenRPM = wheelRPM * fabs(gearRatio) * FINAL_DRIVE; - Serial.print("drivenRPM: "); - Serial.println(drivenRPM); + // Serial.print("drivenRPM: "); + // Serial.println(drivenRPM); _engineRPM = clutch * drivenRPM + (1.0f - clutch) * targetRPM; - Serial.print("_engineRPM: "); - Serial.println(_engineRPM); + // Serial.print("_engineRPM: "); + // Serial.println(_engineRPM); _engineRPM = constrain(_engineRPM, RPM_IDLE, 7500.0f); - Serial.print("_engineRPM (constrain): "); - Serial.println(_engineRPM); + // Serial.print("_engineRPM (constrain): "); + // Serial.println(_engineRPM); const float engineForce = (_engineRPM / RPM_MAX) * (1.0f - clutch) * ENGINE_FORCE_FACTOR; - Serial.print("engineForce: "); - Serial.println(engineForce); + // Serial.print("engineForce: "); + // Serial.println(engineForce); const float brakeForce = brake * BRAKE_FORCE_MAX; - Serial.print("brakeForce: "); - Serial.println(brakeForce); + // Serial.print("brakeForce: "); + // Serial.println(brakeForce); const float dragForce = 0.5f * DRAG_COEFF * FRONTAL_AREA * (_speedMs * _speedMs); - Serial.print("dragForce: "); - Serial.println(dragForce); + // Serial.print("dragForce: "); + // Serial.println(dragForce); - const int direction = (gearIdx == 5) ? -1 : 1; - Serial.print("direction: "); - Serial.println(direction); + const int direction = (gearIdx == -1) ? -1 : 1; + // Serial.print("direction: "); + // Serial.println(direction); const float netForce = direction * engineForce - brakeForce - dragForce; - Serial.print("netForce: "); - Serial.println(netForce); + // Serial.print("netForce: "); + // Serial.println(netForce); const float acceleration = netForce / CAR_MASS; - Serial.print("acceleration: "); - Serial.println(acceleration); + // Serial.print("acceleration: "); + // Serial.println(acceleration); _speedMs += acceleration * dt; if (_speedMs < 0.0f) _speedMs = 0.0f; - Serial.print("_speedMs: "); - Serial.println(_speedMs); + // Serial.print("_speedMs: "); + // Serial.println(_speedMs); - delay(1000); + // delay(1000); } int Engine::getRPM() const { diff --git a/Projekt.ino b/Projekt.ino index b940aed..b7feb51 100644 --- a/Projekt.ino +++ b/Projekt.ino @@ -30,13 +30,12 @@ void setup() { } void loop() { - if (gear.update()) { + if (gear.update()) display.updateGear(gear.getGearChar()); - } - leftBlink = digitalRead(TS_LEFT); - rightBlink = digitalRead(TS_RIGHT); - display.updateDirection(leftBlink, rightBlink); + display.updateDirection( + digitalRead(TS_LEFT), + digitalRead(TS_RIGHT)); unsigned long now = millis(); float dt = (now - prevUpdate) / 1000.0f;