X-Git-Url: https://rtime.felk.cvut.cz/gitweb/fpga/rpi-motor-control.git/blobdiff_plain/b98f70ee3eed3af0cbbc9d5869ac1e7626534ef4..5d8290ceb4f6810b3bf47d15bcbb0fc63ff4a837:/pmsm-control/test_sw/cmd_proc.c

diff --git a/pmsm-control/test_sw/cmd_proc.c b/pmsm-control/test_sw/cmd_proc.c
index cc92a0b..bb3be07 100644
--- a/pmsm-control/test_sw/cmd_proc.c
+++ b/pmsm-control/test_sw/cmd_proc.c
@@ -3,6 +3,7 @@
 #include <string.h>
 
 #include "cmd_proc.h"
+#include "logs.h"
 
 #define PRUM_PROUD 	2061
 #define PRUM_SOUC	6183
@@ -60,7 +61,7 @@ static void start(struct rpi_state* state){
  */
 static void stop(struct rpi_state* state){
 	sem_wait(&state->thd_par_sem);
-	state->commutate=0;
+	setCommutationOff(state);
 	state->pos_reg_ena=0;
 	state->spd_reg_ena=0;
 	state->duty=0;
@@ -81,7 +82,7 @@ static void dutySet(struct rpi_state* state, int duty){
 	state->duty=duty;
 	state->pos_reg_ena=0;
 	state->spd_reg_ena=0;
-	state->commutate=1;
+	setCommutationOn(state);
 	sem_post(&state->thd_par_sem);
 }
 
@@ -93,7 +94,7 @@ static void goAbsolute(struct rpi_state* state, int pos){
 	sem_wait(&state->thd_par_sem);
 	state->spd_reg_ena=0;
 	state->pos_reg_ena=1;
-	state->commutate=1;
+	setCommutationOn(state);
 	state->desired_pos=pos;
 	sem_post(&state->thd_par_sem);
 }
@@ -125,7 +126,7 @@ static void setSpeed(struct rpi_state* state, int speed){
 	sem_wait(&state->thd_par_sem);
 	state->pos_reg_ena=0;
 	state->spd_reg_ena=1;
-	state->commutate=1;
+	setCommutationOn(state);
 	state->desired_spd=speed;
 	sem_post(&state->thd_par_sem);
 }
@@ -161,33 +162,7 @@ static void logInit(struct rpi_state* state){
 	state->doLogs=1;
 }
 
-/*
- * \brief
- * Save logs
- */
-static void saveLogs(struct rpi_state* state){
-	FILE *f;
-	int r,s;
-
-	f = fopen("logs.log", "w");
-	if (f == NULL){
-		printf("Error opening file!\n");
-		return;
-	}
 
-	for (r=0;r<LOG_ROWS;r++){
-		for(s=0;s<state->log_col-1;s++){	/*posledni sloupec je vevyplneny*/
-			if (s==state->log_col-2){
-				fprintf(f,"%d ",state->logs[r][s]);
-	                }else{
-	                        fprintf(f,"%d, ",state->logs[r][s]);
-	                }
-	        }
-	        fprintf(f,"\r");
-	}
-	fclose(f);
-	freeLogs();
-}
 
 /**
  * \brief