From: Martin Prudek <prudemar@fel.cvut.cz>
Date: Sun, 10 May 2015 20:02:47 +0000 (+0200)
Subject: Correction of position of subroutines.
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/fpga/rpi-motor-control.git/commitdiff_plain/cc9c3ee873b6560091e62e58b51a1507030e0d60

Correction of position of subroutines.
---

diff --git a/pmsm-control/test_sw/cmd_proc.c b/pmsm-control/test_sw/cmd_proc.c
index 936ec7b..70304d6 100644
--- a/pmsm-control/test_sw/cmd_proc.c
+++ b/pmsm-control/test_sw/cmd_proc.c
@@ -3,6 +3,8 @@
 
 #include "cmd_proc.h"
 
+#define PRUM_PROUD 	2061
+#define PRUM_SOUC	6183
 
 /**
  * \brief
@@ -72,6 +74,18 @@ void poll_cmd(struct rpi_state* state){
 	}
 	return ;
 }
+/*
+ * pocita procentualni odchylku od prumerneho proudu
+ */
+float diff_p(float value){
+	return ((float)value-PRUM_PROUD)*100/PRUM_PROUD;
+}
+/*
+ * pocita procentualni odchylku od prumerneho souctu proudu
+ */
+float diff_s(float value){
+	return ((float)value-PRUM_SOUC)*100/PRUM_SOUC;
+}
 
 /*
  * tiskne potrebna data
diff --git a/pmsm-control/test_sw/main_pmsm.c b/pmsm-control/test_sw/main_pmsm.c
index 50e32e1..da278cc 100644
--- a/pmsm-control/test_sw/main_pmsm.c
+++ b/pmsm-control/test_sw/main_pmsm.c
@@ -24,8 +24,6 @@
 #include "pmsm_state.h"
 #include "cmd_proc.h"
 
-#define PRUM_PROUD 	2061
-#define PRUM_SOUC	6183
 #define MAX_DUTY	128
 #define PID_P		0.1
 
@@ -89,18 +87,7 @@ void substractOffset(struct rpi_in* data, struct rpi_in* offset){
 	data->pozice-=offset->pozice;
 	return;
 }
-/*
- * pocita procentualni odchylku od prumerneho proudu
- */
-float diff_p(float value){
-	return ((float)value-PRUM_PROUD)*100/PRUM_PROUD;
-}
-/*
- * pocita procentualni odchylku od prumerneho souctu proudu
- */
-float diff_s(float value){
-	return ((float)value-PRUM_SOUC)*100/PRUM_SOUC;
-}
+
 
 void prepare_tx(uint8_t * tx){