diff --git a/LeonardoProMicro/AutomatedGearShifter/AutomatedGearShifter.ino b/LeonardoProMicro/AutomatedGearShifter/AutomatedGearShifter.ino index 8c96299..f41a082 100644 --- a/LeonardoProMicro/AutomatedGearShifter/AutomatedGearShifter.ino +++ b/LeonardoProMicro/AutomatedGearShifter/AutomatedGearShifter.ino @@ -6,7 +6,7 @@ #include #include -#define Version "1.15.4" +#define Version "1.15.6" ////2DO: //diagnostyka i/lub przeciwdziaƂanie skokom predkosci //dlaczego wskaznik odnosi sie do poprawnego biegu a w tym czasie bieg jest zly? bo czas ponizej 2s? @@ -219,8 +219,8 @@ void loop() { } } - if (speed4Gear > 99 || isinf(speed4Gear)) { - speed4Gear = 17.00; + if (speed4Gear > 40 || isinf(speed4Gear)) { + speed4Gear = speed4Gear_3; } calcGear(); displGear = 9 - currentGear; @@ -325,9 +325,9 @@ void calcGear() { //speed validation speedDiff_3 = speed4Gear_3-speed4Gear_2; speedDiff_2 = speed4Gear_2-speed4Gear_1; - speed4Gear_1 = speed; - speed4Gear_2 = speed4Gear_1; speed4Gear_3 = speed4Gear_2; + speed4Gear_2 = speed4Gear_1; + speed4Gear_1 = speed; speed4Geat_estimated = (((speedDiff_3 * avgWeight_3 + speedDiff_2 * avgWeight_2)/(avgWeight_3 + avgWeight_2))+ speed4Gear_1) + 4; if (speed <= 10.0 or speed <= speed4Geat_estimated) { speed4Gear_2 = speed4Gear;