Function Init_logs moved to right place.

diff --git a/pmsm-control/test_sw/cmd_proc.c b/pmsm-control/test_sw/cmd_proc.c
index bb3be078ba6978eee202e7c7fa8bc01328b1974d..6846df594e5a57eb4ed02931d4565dcb72e8b2cb 100644 (file)
--- a/pmsm-control/test_sw/cmd_proc.c
+++ b/pmsm-control/test_sw/cmd_proc.c
@@ -9,7 +9,7 @@
 #define PRUM_SOUC      6183
 
 static char doPrint = 1;
-static char error = 0;
+
 
 /*
  * \brief
@@ -143,27 +143,6 @@ static void setAlphaOff(struct rpi_state* state, int offset){
        sem_post(&state->thd_par_sem);
 }
 
-/*
- * \brief
- * Initialize logs
- */
-static void logInit(struct rpi_state* state){
-       int r;
-       state->log_col=0;
-       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
  * SetLog
@@ -291,6 +270,6 @@ void printData(struct rpi_state* state){
        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");
+       if (s.error) printf("error pri maloc logs!! \n");
 
 }

diff --git a/pmsm-control/test_sw/logs.c b/pmsm-control/test_sw/logs.c
index f6c2a5f5aeb96a7dd34e1e8b5bf3af9fc61c3de0..3a3e9cc0e01d2ebb16fa04b17eeb7724b5c44527 100644 (file)
--- a/pmsm-control/test_sw/logs.c
+++ b/pmsm-control/test_sw/logs.c
@@ -21,6 +21,25 @@ void freeLogs(struct rpi_state* this){
        this->doLogs=0;
 }
 
+/*
+ * \brief
+ * Initialize logs
+ */
+void logInit(struct rpi_state* state){
+       int r;
+       state->log_col=0;
+       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){
+                       state->error=1;
+                       state->log_col_count=-1;
+                       return;
+               }
+       }
+       state->doLogs=1;
+}
+
 /*
  * \brief
  * Makes log.

diff --git a/pmsm-control/test_sw/logs.h b/pmsm-control/test_sw/logs.h
index c0d1996df674434199567f60c1f7c22a9657775e..d3f245586c940691fda72279d52c66db371b8660 100644 (file)
--- a/pmsm-control/test_sw/logs.h
+++ b/pmsm-control/test_sw/logs.h
@@ -14,6 +14,12 @@ struct rpi_state;
  */
 void makeLog(struct rpi_state*);
 
+/*
+ * \brief
+ * Initialize logs
+ */
+void logInit(struct rpi_state*);
+
 /*
  * \brief
  * Free logs memory.

diff --git a/pmsm-control/test_sw/pmsm_state.h b/pmsm-control/test_sw/pmsm_state.h
index b1946a653b2a0bfd07aa797cef97be942089bb23..583eb73cdc253a1ded565a4ba9a7667d19e83380 100644 (file)
--- a/pmsm-control/test_sw/pmsm_state.h
+++ b/pmsm-control/test_sw/pmsm_state.h
@@ -49,6 +49,8 @@ struct rpi_state{
 
        void (*main_commutator)(struct rpi_state*);     /* primarni komutator */
        void (*main_controller)(struct rpi_state*);     /* primarni regulator */
+
+       char error;                     /* detekce chyboveho stavu */
 };
 
 /**