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

ZMIANA PIN"u INPUT SPEED NA POPRAWNY

Browse Source
This commit is contained in:
Kamil Siejka
2024-10-12 21:29:02 +02:00
parent d5e3929a12
commit 8d6c4fae44
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
LeonardoProMicro/AutomatedGearShifter/AutomatedGearShifter.ino
View File

@@ -15,7 +15,7 @@
#define OLED_RESET -1 // Reset pin # (or -1 if sharing Arduino reset pin) #define OLED_RESET -1 // Reset pin # (or -1 if sharing Arduino reset pin)
#define SCREEN_ADDRESS 0x3C ///< See datasheet for Address; 0x3D for 128x64, 0x3C for 128x32 #define SCREEN_ADDRESS 0x3C ///< See datasheet for Address; 0x3D for 128x64, 0x3C for 128x32
Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RESET); Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RESET);
#define PinInSpeed 0 //on board: RXI #define PinInSpeed 1 //on board: RXI
#define ServoSwitch 4 //on board: 4 #define ServoSwitch 4 //on board: 4
#define ServoPin 8 //on board: 8 #define ServoPin 8 //on board: 8
#define BrakingLight 9 //on board: 9 BrakingLight #define BrakingLight 9 //on board: 9 BrakingLight
@@ -113,7 +113,7 @@ void setup() {
display.display(); display.display();
delay(500); delay(500);
//INPUT //INPUT
pinMode(PinInSpeed, INPUT); pinMode(PinInSpeed, INPUT_PULLUP);
pinMode(Btn1, INPUT); pinMode(Btn1, INPUT);
//OUTPUT //OUTPUT
pinMode(PinLED, OUTPUT); pinMode(PinLED, OUTPUT);
@@ -177,10 +177,10 @@ void loop() {
prepareTurnOff(); prepareTurnOff();
} }
} }
//DIAG //DIAG
// if (speed > 99 || isinf(speed)) { if (speed > 99 || isinf(speed)) {
// speed = 0; speed = 21.37;
// } }
calcGear(); calcGear();
displGear = 9 - currentGear; displGear = 9 - currentGear;
setPosition(currentGear); setPosition(currentGear);
@@ -265,10 +265,10 @@ void calcSpeed() {
speed_last_2 = speed_last; speed_last_2 = speed_last;
speed_last = speed; speed_last = speed;
speed = (((2 * Pi) / sigleTimeSpd * ((WheelCircumference) / (Pi)) * ms2kmh)) / MagnetsCnt; speed = (((2 * Pi) / sigleTimeSpd * ((WheelCircumference) / (Pi)) * ms2kmh)) / MagnetsCnt;
if (((speed_last_3 * 1.5) > speed) && speed > 10.0 && speedTrend > 0) { //zabezpieczenie przed losowymi sygnałami magesu // diag
speed = speed_last_3; // if (((speed_last_3 * 1.5) > speed) && speed > 10.0 && speedTrend > 0) { //zabezpieczenie przed losowymi sygnałami magesu
// speed = speed_last_3;
} // }
// speed = (speed + speed_last)/2; // speed = (speed + speed_last)/2;
// totalDist = totalDist + 1; // totalDist = totalDist + 1;
} }