diff --git a/.settings/ilg.gnumcueclipse.debug.gdbjtag.openocd.prefs b/.settings/ilg.gnumcueclipse.debug.gdbjtag.openocd.prefs new file mode 100644 index 0000000..7007267 --- /dev/null +++ b/.settings/ilg.gnumcueclipse.debug.gdbjtag.openocd.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +install.folder=C\:\\VectorIDEv1.3\\openocd\\bin diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index 0b7af04..2c24ef7 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/Vsrc/V_adc.c b/Vsrc/V_adc.c index 54daeab..ba03820 100644 --- a/Vsrc/V_adc.c +++ b/Vsrc/V_adc.c @@ -104,6 +104,7 @@ void AdcDrv_fast_calc(TAdcDrv *p) { p->IB_temp = ADC->SEQ[0].SFIFO; p->Udc_temp = ADC->SEQ[0].SFIFO; p->T_temp = ADC->SEQ[0].SFIFO; + Debug1 = p->T_temp; // Очистка FIFO на случай, если почему-то там оказалось больше чем надо значений (бывает после остановки житагом) while (ADC->SEQ[0].SFLOAD) trash = ADC->SEQ[0].SFIFO; diff --git a/Vsrc/V_pid_reg3.c b/Vsrc/V_pid_reg3.c index 1cd9d4f..13a9a13 100644 --- a/Vsrc/V_pid_reg3.c +++ b/Vsrc/V_pid_reg3.c @@ -106,6 +106,7 @@ void pid_reg3_reset(TPidReg3 *v) { v->pid_ref_reg3=0; v->ui_reg3=0; v->KdFilterInitFlag=1; + v->pid_out_reg3 = 0; } /*@}*/ diff --git a/Vsrc/main.c b/Vsrc/main.c index 175d0f4..d59a801 100644 --- a/Vsrc/main.c +++ b/Vsrc/main.c @@ -101,7 +101,7 @@ Uint16 LoopCounter = 0; //!< //! \memberof MAIN_C int main(void) { - co1_vars.co_productCode = 51; + co1_vars.co_productCode = 51; co1_vars.co_revisionNumber = 1; /* Настройка тактирования, включение периферии */