]> rtime.felk.cvut.cz Git - fpga/lx-cpu1/lx-rocon.git/commitdiff
Correct PXMCC firmware variant which uses conditional instructions.
authorPavel Pisa <ppisa@pikron.com>
Sat, 3 Jan 2015 20:48:44 +0000 (21:48 +0100)
committerPavel Pisa <ppisa@pikron.com>
Sat, 3 Jan 2015 20:48:44 +0000 (21:48 +0100)
Signed-off-by: Pavel Pisa <ppisa@pikron.com>
hw/lx-rocon_firmware/firmware.c

index 9fae1adb99c2dbb948ae4073a703e02d3919b477..3312bcfac1c3c1264241fa412b0076f03a55f441 100644 (file)
@@ -413,11 +413,10 @@ void main(void)
             phs = 1;
         #endif /*COMPUTE_PHASE_SECTOR*/
 
-        curmult_idx = (0x00102102 >> (4 * phs)) & 3;
+        curmult_idx = (0x00201201 >> (4 * phs)) & 3;
         pwm_reci = pxmcc_data.common.pwm_cycle - pxmcc->pwm_prew[curmult_idx];
         pwm_reci = (pxmcc_data.common.pwm_cycle << 16) / pwm_reci;
-        cur[curmult_idx] = (int32_t)(pwm_reci *
-                         pxmcc_data.curadc[curmult_idx].cur_val) >> 16;
+        cur[curmult_idx] = (int32_t)(pwm_reci * cur[curmult_idx]) >> 16;
 
         cur1 = cur[0];
         cur2 = cur[1];