FabInfra-Mirror/fabhardware.absaugungsklappensteuerung
1
0
Fork 0
mirror of https://gitlab.com/fabinfra/fabhardware/absaugungsklappensteuerung.git synced 2025-03-12 14:51:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

zwischenstand

Browse Source
This commit is contained in:
Toberfra 2022-02-13 12:13:42 +01:00
parent c190169d4e
commit 551f33a31a
6 changed files with 39 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Arduino/motor/src/KlappenSteuerung.cpp
View File

@ -12,9 +12,9 @@
* @param pinSense * @param pinSense
* @param id * @param id
*/ */
KlappenSteuerung::KlappenSteuerung(int pinA, int pinB, int pinSense, int id) KlappenSteuerung::KlappenSteuerung(int pinEnable, int pinSense, int id)
{ {
setMotorPins(pinA , pinB); setMotorEnablePin(pinEnable);
SetId(id); SetId(id);
this->pinSense = pinSense; this->pinSense = pinSense;

2
Arduino/motor/src/KlappenSteuerung.h
View File

@ -41,7 +41,7 @@ public:
* @param pinSense * @param pinSense
* @param id * @param id
*/ */
KlappenSteuerung(int pinA, int pinB, int pinSense, int id); KlappenSteuerung(int pinEnable, int pinSense, int id);
/** /**

4
Arduino/motor/src/main.cpp
View File

@ -7,7 +7,7 @@
void Ablauf(); void Ablauf();
void AblaufSekunde(); void AblaufSekunde();
KlappenSteuerung klappe1 (M1A , M1B , M1SENSE , 5 ); KlappenSteuerung klappe1 (M1ENABLE , M1SENSE , 5 );
@ -22,7 +22,7 @@ KlappenSteuerung klappe1 (M1A , M1B , M1SENSE , 5 );
void setup() { void setup() {
// put your setup code here, to run once: // put your setup code here, to run once:
KlappenSteuerung::setupStatic(); KlappenSteuerung::setupStatic();
KlappenSteuerung::setMotorPwmPin(TIMER1_PWM_PIN); KlappenSteuerung::setMotorPwmPins(TIMER1_PWM_PINA , TIMER1_PWM_PINB);
KlappenSteuerung::setup(); KlappenSteuerung::setup();
pinMode(LED_BUILTIN , OUTPUT); pinMode(LED_BUILTIN , OUTPUT);
} }

23
Arduino/motor/src/motor.cpp
View File

@ -3,17 +3,18 @@
uint8_t Motor::pinPwm; uint8_t Motor::pinPwmA;
uint8_t Motor::pinPwmB;
void Motor::setMotorPins(uint8_t pinA , uint8_t pinB){ void Motor::setMotorPwmPins(uint8_t a , uint8_t b){
this->pinA = pinA; Motor::pinPwmA = a;
this->pinB = pinB; Motor::pinPwmB = b;
} }
void Motor::setMotorPwmPin(uint8_t pinPwm){ void Motor::setMotorEnablePin(uint8_t enable){
Motor::pinPwm = pinPwm; this->pinEnable = enable;
} }
@ -21,18 +22,16 @@ void Motor::setup(){
ArduinoAnpassung::setup(); ArduinoAnpassung::setup();
Timer1.initialize(1000); // 10kHz Timer1.initialize(1000); // 10kHz
//Timer1.attachInterrupt(Motor::interruptEinsprung); //Timer1.attachInterrupt(Motor::interruptEinsprung);
Timer1.pwm(Motor::pinPwm, (0)); // 1023 Timer1.pwm(Motor::pinPwmA, (0)); // 1023
Timer1.pwm(Motor::pinPwmB, (0)); // 1023
//digitalWrite(LED_BUILTIN , 0 ); //digitalWrite(LED_BUILTIN , 0 );
} }
void Motor::memberSetup(){ void Motor::memberSetup(){
pinMode(pinA , OUTPUT); pinMode(pinEnable , OUTPUT);
digitalWrite( pinA , 0); digitalWrite( pinEnable , 0);
pinMode(pinB , OUTPUT);
digitalWrite(pinB , 0);
} }

10
Arduino/motor/src/motor.h
View File

@ -14,16 +14,16 @@ public:
static void setup(); static void setup();
void setMotorPins(uint8_t pinA , uint8_t pinB); static void setMotorPwmPins(uint8_t a , uint8_t b);
static void setMotorPwmPin(uint8_t pinPwm); void setMotorEnablePin(uint8_t enable);
void setSollSpeed(int16_t speed); void setSollSpeed(int16_t speed);
protected: protected:
static uint8_t pinPwm; static uint8_t pinPwmA;
static uint8_t pinPwmB;
void memberSetup(); void memberSetup();
void memberLoop(); void memberLoop();
@ -34,7 +34,7 @@ protected:
void interruptBerechnungen(); void interruptBerechnungen();
uint8_t pinA , pinB; uint8_t pinEnable;
uint16_t timer; uint16_t timer;
int16_t sollSpeed; int16_t sollSpeed;

37
Arduino/motor/src/pins.h
View File

@ -2,33 +2,32 @@
#define PINS_H #define PINS_H
#define TIMER1_PWM_PIN 9 #define TIMER1_PWM_PINA 9
#define TIMER1_PWM_PINB 10
#define M1A 2 #define M1ENABLE 2
#define M1B 3 #define M1SENSE 0
#define M1SENSE A1
#define M2A 4 #define M2ENABLE 3
#define M2B 5 #define M2SENSE 1
#define M2SENSE A2
#define M3A 6 #define M3ENABLE 4
#define M3B 7 #define M3SENSE 2
#define M3SENSE A3
#define M4A 8 #define M4ENABLE 5
#define M4B 10 #define M4SENSE 3
#define M4SENSE A4
#define M5A 11 #define M5ENABLE 6
#define M5B 12 #define M5SENSE 4
#define M5SENSE A5
#define M6A 13 #define M6ENABLE 7
#define M6B 14 #define M6SENSE 5
#define M6SENSE A6
#define M6ENABLE 8
#define M6SENSE 6
#define M6ENABLE 11
#define M6SENSE 7