Diff: main.cpp

Revision:

246:d5742551f432

Parent:

245:071785d74ad0

Child:

247:bfdf0f479a38

diff -r 071785d74ad0 -r d5742551f432 main.cpp
--- a/main.cpp	Fri Jun 17 09:28:54 2022 +0000
+++ b/main.cpp	Fri Jun 17 09:30:42 2022 +0000
@@ -576,7 +576,6 @@
 float FREQ_TMR2 = (float)FREQ_5k;
 float DT_TMR2 = (float)DT_5k;
 int cnt_trans = 0;
-float nulling_test  = 0.0f;
 extern "C" void TIM2_IRQHandler(void)
 {
     if (TIM2->SR & TIM_SR_UIF ) {
@@ -678,7 +677,6 @@
                             float FORCE_pluse_mean = FORCE_pulse_sum / 10.0f;
                             FORCE_pulse_sum = 0.0f;
                             FORCE_VREF += VREF_TuningGain * (0.0f - FORCE_pluse_mean);
-                            nulling_test = FORCE_VREF;
                             if (FORCE_VREF > 3.3f) FORCE_VREF = 3.3f;
                             if (FORCE_VREF < 0.0f) FORCE_VREF = 0.0f;
                             dac_1 = FORCE_VREF / 3.3f;
@@ -1442,8 +1440,7 @@
                 if (((OPERATING_MODE&0b110)>>1) == 0 || ((OPERATING_MODE&0b110)>>1) == 1) { //Moog Valve or KNR Valve
                     CAN_TX_PWM((int16_t)(cur.sen/mA_PER_pulse));
                 } else {
-//                    CAN_TX_PWM((int16_t)(valve_pos.sen));
-                    CAN_TX_PWM((int16_t)(nulling_test));
+                    CAN_TX_PWM((int16_t)(valve_pos.sen));
                 }
             }