Logging function moved to separate file.

[fpga/rpi-motor-control.git] / pmsm-control / test_sw / main_pmsm.c

diff --git a/pmsm-control/test_sw/main_pmsm.c b/pmsm-control/test_sw/main_pmsm.c
index 56b654417374c35d540dbc693c0f18d2bdb54443..25b0acc1163d1eac045a0887a37d555021cdfa84 100644 (file)
--- a/pmsm-control/test_sw/main_pmsm.c
+++ b/pmsm-control/test_sw/main_pmsm.c
@@ -26,9 +26,7 @@
 #include "controllers.h"
 #include "commutators.h"
 #include "comp.h"
 #include "controllers.h"
 #include "commutators.h"
 #include "comp.h"

-
-
-
+#include "logs.h"

 
 #define PRIOR_KERN     50
 #define PRIOR_HIGH     49
 
 #define PRIOR_KERN     50
 #define PRIOR_HIGH     49


@@ -83,66 +81,6 @@ inline void clk_disable(){
        termClock(0);
 }
 
        termClock(0);
 }
 

-
-/*
- * \brief
- * Free logs
- */
-void freeLogs(){
-       int r;
-       if (rps.log_col_count){
-               for (r=0;r<LOG_ROWS;r++){
-                       free(rps.logs[r]);
-               }
-       }
-       rps.log_col_count=0;
-       rps.doLogs=0;
-}
-
-/*
- * \brief
- * Makes log.
- */
-void makeLog(){
-       int r;
-       if (rps.log_col==MAX_LOGS-1){
-               rps.doLogs=0;
-               return;
-       }
-       rps.logs[0][rps.log_col]=(int)rps.tf_count;
-       rps.logs[1][rps.log_col]=(int)rps.spi_dat->pozice;
-
-       rps.logs[2][rps.log_col]=(int)rps.pwm1;
-       rps.logs[3][rps.log_col]=(int)rps.pwm2;
-       rps.logs[4][rps.log_col]=(int)rps.pwm3;
-       rps.logs[5][rps.log_col]=rps.duty;
-
-       rps.logs[6][rps.log_col]=rps.desired_spd;
-       rps.logs[7][rps.log_col]=rps.speed;
-
-       rps.logs[8][rps.log_col]=(int)(rps.spi_dat->ch1/rps.spi_dat->adc_m_count);
-       rps.logs[9][rps.log_col]=(int)(rps.spi_dat->ch2/rps.spi_dat->adc_m_count);
-       rps.logs[10][rps.log_col]=(int)(rps.spi_dat->ch0/rps.spi_dat->adc_m_count);
-
-       rps.log_col++;
-     /*
-        if (rps.log_col==rps.log_col_count-1){
-               rps.log_col_count*=2;
-               rps.log_col_count%=MAX_LOGS;
-               for (r=0;r<LOG_ROWS;r++){
-                       rps.logs[r]=realloc(rps.logs[r],rps.log_col_count*sizeof(int));
-                       if (rps.logs[r]==NULL){
-                               rps.doLogs=0;
-                               rps.error=1;
-                       }
-               }
-        }
-     */
-}
-
-
-
-

 /**
  * \brief Signal handler pro Ctrl+C
  */
 /**
  * \brief Signal handler pro Ctrl+C
  */


@@ -158,7 +96,7 @@ void appl_stop(){
 
        spi_disable();
        clk_disable();
 
        spi_disable();
        clk_disable();

-       freeLogs();
+       freeLogs(&rps);

        /*muzeme zavrit semafor*/
        sem_destroy(&rps.thd_par_sem);
         printf("\nprogram bezpecne ukoncen\n");
        /*muzeme zavrit semafor*/
        sem_destroy(&rps.thd_par_sem);
         printf("\nprogram bezpecne ukoncen\n");


@@ -240,7 +178,7 @@ void * read_data(void* param){
 
                        /*zalogujeme hodnoty*/
                        if (rps.doLogs && !(rps.tf_count%LOG_PERIOD)){
 
                        /*zalogujeme hodnoty*/
                        if (rps.doLogs && !(rps.tf_count%LOG_PERIOD)){

-                               makeLog();
+                               makeLog(&rps);

                        }
 
                        sem_post(&rps.thd_par_sem);             /*--post semaphore---*/
                        }
 
                        sem_post(&rps.thd_par_sem);             /*--post semaphore---*/