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

uncomment homing and send position

Browse Source
master
Eggert Jung 4 years ago
parent 28942ab232
commit 30f1ec733d
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File

8
main.c
Unescape Escape View File

@ -244,6 +244,14 @@ int main()
if(millis() - timer_modbus_poll > 1000){ if(millis() - timer_modbus_poll > 1000){
timer_modbus_poll += 1000; timer_modbus_poll += 1000;
do_kraftsensor(); do_kraftsensor();
#if PLC_MQTT_ENABLED
send_abzug_speed();
char msg[10];
ltoa(kraftsensor_value, msg, 10);
mqtt_pub(&mqtt_client, "/Filamentanlage/05_Abzug/state/kraft", msg, strlen(msg));
ltoa(taenzer_state.pos, msg, 10);
mqtt_pub(&mqtt_client, "/Filamentanlage/05_Abzug/state/speicher/pos", msg, strlen(msg));
#endif
} }
do_notaus(); do_notaus();

25
taenzer.c
Unescape Escape View File

@ -8,19 +8,20 @@ taenzer_state_t taenzer_state;
void do_taenzer(){ void do_taenzer(){
///* Homing */ /* Homing */
//if(!taenzer_state.homed){ if(!taenzer_state.homed){
// set_Output(MOTOR_TAENZER_DIR, 1); // direction: up set_Output(MOTOR_TAENZER_DIR, 1); // direction: up
// TCCR4B |= _BV(CS41); //TURN ON TCCR4B |= _BV(CS41); //TURN ON
//} }
//if(read_Input(IN_TAENZER_HOME, LEVEL)){ if(read_Input(IN_TAENZER_HOME, LEVEL)){
// TCCR4B &= ~_BV(CS41); //TURN OFF TCCR4B &= ~_BV(CS41); //TURN OFF
// taenzer_state.homed = 1; taenzer_state.homed = 1;
//} taenzer_state.pos = 0;
}
/* Force regualtion */ /* Force regualtion */
if(kraftsensor_valid /* && taenzer_state.homed */){ if(kraftsensor_valid && taenzer_state.homed){
if(kraftsensor_value < 0){ if(kraftsensor_value < 9000){
set_Output(MOTOR_TAENZER_DIR, 0); // direction: down set_Output(MOTOR_TAENZER_DIR, 0); // direction: down
TCCR4B |= _BV(CS41); //TURN ON TCCR4B |= _BV(CS41); //TURN ON
} }
@ -38,7 +39,7 @@ void timer4_init()
TCCR4A |= (1<<COM4A1); TCCR4A |= (1<<COM4A1);
TCCR4B |= _BV(WGM43); TCCR4B |= _BV(WGM43);
// TIMSK4 |= 1<<TOIE4; TIMSK4 |= 1<<TOIE4;
// TIMSK4 |= 1<<OCIE4A; // TIMSK4 |= 1<<OCIE4A;
ICR4 = 100; ICR4 = 100;