From 694d7155f582476ae9c042258e98fc867eb6b1ba Mon Sep 17 00:00:00 2001 From: Martin Prudek Date: Sat, 16 May 2015 11:30:40 +0200 Subject: [PATCH] Changed naming convetions, pid modified --- pmsm-control/test_sw/main_pmsm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pmsm-control/test_sw/main_pmsm.c b/pmsm-control/test_sw/main_pmsm.c index 4991443..56b926a 100644 --- a/pmsm-control/test_sw/main_pmsm.c +++ b/pmsm-control/test_sw/main_pmsm.c @@ -24,8 +24,8 @@ #include "pmsm_state.h" #include "cmd_proc.h" -#define MAX_DUTY 128 -#define PID_P 0.1 +#define MAX_DUTY 170 +#define PID_P 0.3 #define PRIOR_KERN 50 #define PRIOR_HIGH 49 @@ -113,10 +113,10 @@ void dq2alphabeta(int32_t *alpha, int32_t *beta, int d, int q, int32_t sin, int3 *beta=-sin*d+cos*q; return; } -void alphabeta2pwm3(int32_t * pwma, int32_t * pwmb, int32_t *pwmc,int32_t alpha, int32_t beta){ - *pwma=alpha; - *pwmb=-alpha/2+beta*887/1024; - *pwmc=-alpha/2-beta*887/1024; +void alphabeta2pwm3(int32_t * ia, int32_t * ib, int32_t *ic,int32_t alpha, int32_t beta){ + *ia=alpha; + *ib=-alpha/2+beta*887/1024; + *ic=-alpha/2-beta*887/1024; } /* * \brief -- 2.39.2