yuramak/motorcontroldemo_028
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Багфикс вечных аппараток в симуляторе

Browse Source
This commit is contained in:
Dmitry Shpak 2020-06-19 15:40:54 +03:00
parent 5812e0c8c9
commit ab4a414866
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.settings/language.settings.xml
View File

@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="502850917606847431" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="244684461140073992" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>
@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="480357847621646132" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="229025836764233013" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>

12
Vinclude/SM_Protect.h
View File

@ -49,12 +49,12 @@ extern "C"
//Äëÿ ñáðîñà àïïàðàòíîé àâàðèè â äàííîì êîíòðîëëåðå èñïîëüçóååòñÿ âíåøíèé äèñêðåòíûé ïîðò ââîäà //Äëÿ ñáðîñà àïïàðàòíîé àâàðèè â äàííîì êîíòðîëëåðå èñïîëüçóååòñÿ âíåøíèé äèñêðåòíûé ïîðò ââîäà
#define RESET_FAULT_BUTTON (dio.in_bit.n2) //Äèñêðåòíûé âõîä äëÿ êíîïêè ñáðîñà àâàðèè #define RESET_FAULT_BUTTON (dio.in_bit.n2) //Äèñêðåòíûé âõîä äëÿ êíîïêè ñáðîñà àâàðèè
#elif defined (HW_MCB3_SIMULATOR) #elif defined (HW_MCB3_SIMULATOR)
#define DRV_FAULT 0 #define DRV_FAULT 1
#define DRV_FAULT1 0 #define DRV_FAULT1 1
#define DRV_FAULT2 0 #define DRV_FAULT2 1
#define DRV_FAULT3 0 #define DRV_FAULT3 1
#define DRV_FAULT4 0 #define DRV_FAULT4 1
#define RESET_FAULT_BUTTON 0 #define RESET_FAULT_BUTTON 1
#endif #endif

4
Vinclude/build.h
View File

@ -25,10 +25,10 @@
//Выбор типа аппаратной части //Выбор типа аппаратной части
//Контроллер MCB3 с референсным силовым преобразователем //Контроллер MCB3 с референсным силовым преобразователем
#define HW_MCB3 //#define HW_MCB3
//Контроллер MCB3 с имитационными моделями двигателей //Контроллер MCB3 с имитационными моделями двигателей
//#define HW_MCB3_SIMULATOR #define HW_MCB3_SIMULATOR
//Для UART, выбирается чем его занять - MODBUS или CANtoRS драйвером //Для UART, выбирается чем его занять - MODBUS или CANtoRS драйвером
//#define MODBUS_ENA //#define MODBUS_ENA