sieja/Arduino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://gitea.kaczor.it:2222/sieja/Arduino

Browse Source
This commit is contained in:
Kamil Siejka
2025-06-19 09:37:08 +02:00
parent 4e1c4ff2f1 b56c1a143c
commit 536b203cb7
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ESP32/ESP_AutomatedGearShifter/ESP_AutomatedGearShifter.ino
View File

@@ -5,7 +5,7 @@
#include <Adafruit_GFX.h> #include <Adafruit_GFX.h>
#include <Adafruit_SSD1306.h> #include <Adafruit_SSD1306.h>
#define Version "2.2.3" #define Version "2.2.4"
////2DO: ////2DO:
// menu do zmiany zakresu predkosci biegów // menu do zmiany zakresu predkosci biegów
// menu do zmiany zakresu kątów biegów, obwodu koła, ilosci magnesow // menu do zmiany zakresu kątów biegów, obwodu koła, ilosci magnesow
@@ -74,7 +74,7 @@ float spdRange6and7 = 29.9;
float spdRange7and8 = 36.5; float spdRange7and8 = 36.5;
double calcTimeDiff = 0.0; double calcTimeDiff = 0.0;
double lastGearCalc = millis(); double lastGearCalc = millis();
double speedDiff = 1.0; double speedDiff = 0.65;
double accelerationShift = 1.0; double accelerationShift = 1.0;
int displGear = 9 - currentGear; int displGear = 9 - currentGear;
float currentGearRangeLower = 0; float currentGearRangeLower = 0;
@@ -264,6 +264,10 @@ void calcSpeed(){
if(abs(raw_speed - calcSpeed2) >= speedDiff) { if(abs(raw_speed - calcSpeed2) >= speedDiff) {
if ((raw_speed - calcSpeed2) < 0) { if ((raw_speed - calcSpeed2) < 0) {
speedTrend = -1; speedTrend = -1;
readSignalTime_1 = -1;
readSignalTime_2 = -1;
readSignalTime_3 = -1;
readSignalTimeAvg = -1;
} else { } else {
speedTrend = 1; speedTrend = 1;
@@ -312,14 +316,10 @@ void calcGear() {
}; };
calcTimeDiff = millis() - lastGearCalc; calcTimeDiff = millis() - lastGearCalc;
if (calcTimeDiff < 2000 && abs((calculatedGear-currentGear)) <= 1){ if (calcTimeDiff < 1500 && (calculatedGear - currentGear) == 1){
currentGear = currentGear; currentGear = calculatedGear;
if (abs((calculatedGear-currentGear)) > 0){
pointerVisibility = 0; pointerVisibility = 0;
}else {
pointerVisibility = 1;
}
} else { } else {
currentGear = calculatedGear; currentGear = calculatedGear;
lastGearCalc = millis(); lastGearCalc = millis();
@@ -353,7 +353,7 @@ void loop() {
//################################################ //################################################
//SPEED //SPEED
sleepSpd = millis() - millissSpd; sleepSpd = millis() - millissSpd;
if (sleepSpd >= 1000.0) { //podaj zerową prędkość jeśli nie było odcztu od 1,5 s if (sleepSpd >= 1000.0) { //podaj zerową prędkość jeśli nie było odcztu od 1,1 s
raw_speed = 0.0; raw_speed = 0.0;
} }
//przejście w tryb uśpienia za przuycisku lub czasu //przejście w tryb uśpienia za przuycisku lub czasu