Update
Dependencies: mbed mbed-rtos X_NUCLEO_IHM02A1
Diff: SETUP.h
- Revision:
- 35:758191d5c6e1
- Parent:
- 34:0dee9a606869
- Child:
- 36:ba2e7eddbafa
diff -r 0dee9a606869 -r 758191d5c6e1 SETUP.h --- a/SETUP.h Wed Apr 24 21:08:27 2019 +0000 +++ b/SETUP.h Sun May 05 16:18:20 2019 +0000 @@ -34,12 +34,12 @@ #include "main.h" #include "ST_SOLO.h" #include "ST_DUO.h" -#include "STEPPER_INIT.h" +#include "STEPPER.h" #include "DevSPI.h" #include "XNucleoIHM02A1.h" #include "Display.h" #include "Buttons.h" -#include "PWM2.h" +#include "PWM.h" // ----------------------------------------------------------------------------- // GPIO @@ -54,7 +54,7 @@ #define STB_MOTOR PB_5 #define IRQ_FLAG_MOTOR PC_1 #define IRQ_BUSY_MOTOR PC_0 - + // Display #define DISP_RS PC_3 #define DISP_RW PC_2 @@ -69,8 +69,9 @@ #define DISP_B7 PC_5 // Cutter_Einheit - #define CUTTER_ARC PB_6 - #define SERVO PB_4 + #define CUTTER_ARC_1 PB_6 + #define CUTTER_ARC_2 PB_8 + #define SERVO_PWM PB_4 // Speiss_Einheit #define SPLEISSER_ARC_1 PC_7 @@ -82,23 +83,37 @@ #define LICHTSCHRANKE_3 PA_1 // Buttons - #define START_BUTTON PA_2 - #define STOP_BUTTON PA_3 + #define START_BUTTON PB_14 + #define ABBRUCH_BUTTON PB_15 // Kommunikation_Filamentmessung #define CUT_SIGNAL PB_2 #define COM_SIGNAL PB_12 // PC11 Reserve!!!! + // Kommunikation Aufrollen + #define STOP_SIGNAL PB_10 // ----------------------------------------------------------------------------- // Parameter // ----------------------------------------------------------------------------- // Weiche - #define SERVO_FR 240 // [Hz] - #define GOOD_FIL 60.5 // [°] (max 90) - #define BAD_FIL 0 // [°] (min 0) + #define SERVO_FR 240 // [Hz] + #define GOOD_FIL 30 // [°] (max 90) + #define BAD_FIL 60 // [°] (min 0) + + // Cutter + #define CUTTER_FRQ_1 20000 // [Hz] + #define CUTTER_FRQ_2 18000 // [Hz] + #define CUTTER_DUTY 70 // [%] + + // Spleisser + #define SPLEISSER_FRQ_1 20000 // [Hz] + #define SPLEISSER_FRQ_2 18000 // [Hz] + #define SPLEISSER_DUTY 70 // [%] + +