Filamentstr/05_wickler
Archived
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

add active state for taenzer

Browse Source
This commit is contained in:
Eggert Jung
2022-04-06 00:08:32 +02:00
parent b2721c0123
commit 690f4b308a
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
taenzer.c
View File

@@ -21,6 +21,7 @@ taenzer_state_t taenzer_state = {
.homed = 0, .homed = 0,
.pos = 0, .pos = 0,
.force_setpoint = TAENZER_KRAFT_SETPOINT, .force_setpoint = TAENZER_KRAFT_SETPOINT,
.active = 0
}; };
double pid(PID_vars *vars, double current_err) { double pid(PID_vars *vars, double current_err) {
@@ -71,9 +72,12 @@ void do_taenzer(){
send_info(); send_info();
#endif #endif
} }
if (read_Input(BTN_TAENZER_START, RISING)) {
taenzer_state.active = 1;
}
/* Force regualtion */ /* Force regualtion */
if(kraftsensor_valid && taenzer_state.homed && taenzer_state.pos >= 0 && taenzer_state.pos < 500000){ if(kraftsensor_valid && taenzer_state.active && taenzer_state.homed && taenzer_state.pos >= 0 && taenzer_state.pos < 500000){
int16_t err = (kraftsensor_value - taenzer_state.force_setpoint); int16_t err = (kraftsensor_value - taenzer_state.force_setpoint);
double pid_out = pid(&regler, err); double pid_out = pid(&regler, err);

1
taenzer.h
View File

@@ -7,6 +7,7 @@ typedef volatile struct {
uint8_t homed; uint8_t homed;
uint32_t pos; uint32_t pos;
int16_t force_setpoint; int16_t force_setpoint;
uint8_t active;
} taenzer_state_t; } taenzer_state_t;
extern taenzer_state_t taenzer_state; extern taenzer_state_t taenzer_state;