X-Git-Url: https://rtime.felk.cvut.cz/gitweb/fpga/rpi-motor-control.git/blobdiff_plain/e25e3c141a062914c72263faec10ffbbad2328e2..8f3fb13ef9c8da9ac312b3b3b0ea4239306b986f:/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 a0b0592..8f49e91 100644
--- a/pmsm-control/test_sw/cmd_proc.c
+++ b/pmsm-control/test_sw/cmd_proc.c
@@ -3,11 +3,13 @@
 #include <string.h>
 
 #include "cmd_proc.h"
+#include "logs.h"
 
 #define PRUM_PROUD 	2061
 #define PRUM_SOUC	6183
 
 static char doPrint = 1;
+static char error = 0;
 
 /*
  * \brief
@@ -22,6 +24,7 @@ static void printHelp(){
 	puts("duty:[hodnota] - Nastavi pevnou sirku plneni.");
 	puts("spd:[hodnota] - Zapne rizeni na danou rychlost.");
 	puts("log - Spusti nebo ulozi logovani.");
+	puts("ao:[hodnota] - Prenastavi alpha offset.");
 
 	puts("print - Zapne nebo vypne pravidelne vypisovani hodnot.");
 	puts("help - Vypne vypisovani hodnot a zobrazi tuto napovedu.");
@@ -59,6 +62,9 @@ static void start(struct rpi_state* state){
 static void stop(struct rpi_state* state){
 	sem_wait(&state->thd_par_sem);
 	state->commutate=0;
+	state->pos_reg_ena=0;
+	state->spd_reg_ena=0;
+	state->duty=0;
 	state->pwm1=0;
 	state->pwm2=0;
 	state->pwm3=0;
@@ -125,6 +131,18 @@ static void setSpeed(struct rpi_state* state, int speed){
 	sem_post(&state->thd_par_sem);
 }
 
+/*
+ * \brief
+ * Set alpha offset.
+ */
+static void setAlphaOff(struct rpi_state* state, int offset){
+	if (offset<0) offset*=-1;
+	offset%=1000;
+	sem_wait(&state->thd_par_sem);
+	state->alpha_offset=(unsigned short)offset;
+	sem_post(&state->thd_par_sem);
+}
+
 /*
  * \brief
  * Initialize logs
@@ -135,36 +153,16 @@ static void logInit(struct rpi_state* state){
 	state->log_col_count=LOG_DEF_COL;
 	for (r=0;r<LOG_ROWS;r++){
 		state->logs[r]=malloc(state->log_col_count*sizeof(int));
+		if (state->logs[r]==NULL){
+			error=1;
+			state->log_col_count=-1;
+			return;
+		}
 	}
+	state->doLogs=1;
 }
 
-/*
- * \brief
- * Save logs
- */
-static void saveLogs(struct rpi_state* state){
-	FILE *f;
-	int r,s;
 
-	f = fopen("logs.txt", "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
@@ -182,7 +180,6 @@ static void setLogSEM(struct rpi_state* state){
 	/* spustim zachytavani logu */
 	}else{
 		logInit(state);
-		state->doLogs=1;
 		sem_post(&state->thd_par_sem);
 	}
 }
@@ -223,6 +220,8 @@ void poll_cmd(struct rpi_state* state){
                         setSpeed(state, val);
                 }else if (!strcmp(cmd,"log")){
                         setLogSEM(state);
+                }else if (!strcmp(cmd,"ao")){
+                	setAlphaOff(state,val);
                 }
         }
 
@@ -272,6 +271,7 @@ void printData(struct rpi_state* state){
 	printf("rychlost=%d\n",s.speed);
 	printf("chtena pozice=%d\n",s.desired_pos);
 	printf("chtena rychlost=%d\n",s.desired_spd);
+	printf("alpha offset=%hu\n",s.alpha_offset);
 	printf("transfer count=%u\n",s.tf_count);
 	printf("raw_pozice=%u\n",data_p.pozice_raw);
 	printf("raw_pozice last12=%u\n",(data_p.pozice_raw&0x0FFF));
@@ -290,4 +290,7 @@ void printData(struct rpi_state* state){
 	printf("duty=%d\n",s.duty);
 	if (s.index_ok) printf("index ok\n");
 	if (s.commutate) printf("commutation in progress\n");
+	if (s.doLogs) printf("logujeme\n");
+	if (error) printf("error pri maloc logs!! \n");
+
 }