Merge branch 'master' of https://gitea.kaczor.it/sieja/Arduino
This commit is contained in:
@@ -6,7 +6,7 @@
|
|||||||
#include <Adafruit_GFX.h>
|
#include <Adafruit_GFX.h>
|
||||||
#include <Adafruit_SSD1306.h>
|
#include <Adafruit_SSD1306.h>
|
||||||
|
|
||||||
#define Version "1.15.4"
|
#define Version "1.15.6"
|
||||||
////2DO:
|
////2DO:
|
||||||
//diagnostyka i/lub przeciwdziałanie skokom predkosci
|
//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?
|
//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)) {
|
if (speed4Gear > 40 || isinf(speed4Gear)) {
|
||||||
speed4Gear = 17.00;
|
speed4Gear = speed4Gear_3;
|
||||||
}
|
}
|
||||||
calcGear();
|
calcGear();
|
||||||
displGear = 9 - currentGear;
|
displGear = 9 - currentGear;
|
||||||
@@ -325,9 +325,9 @@ void calcGear() {
|
|||||||
//speed validation
|
//speed validation
|
||||||
speedDiff_3 = speed4Gear_3-speed4Gear_2;
|
speedDiff_3 = speed4Gear_3-speed4Gear_2;
|
||||||
speedDiff_2 = speed4Gear_2-speed4Gear_1;
|
speedDiff_2 = speed4Gear_2-speed4Gear_1;
|
||||||
speed4Gear_1 = speed;
|
|
||||||
speed4Gear_2 = speed4Gear_1;
|
|
||||||
speed4Gear_3 = speed4Gear_2;
|
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;
|
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) {
|
if (speed <= 10.0 or speed <= speed4Geat_estimated) {
|
||||||
speed4Gear_2 = speed4Gear;
|
speed4Gear_2 = speed4Gear;
|
||||||
|
|||||||
Reference in New Issue
Block a user