Browse Source

update

master
zhaohe 2 years ago
parent
commit
8a1ca11a92
  1. 4
      .settings/language.settings.xml
  2. 23
      README.md
  3. 2
      sdk
  4. 10
      usrc/main.cpp

4
.settings/language.settings.xml

@ -5,7 +5,7 @@
<provider-reference id="org.eclipse.cdt.ui.UserLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.ui.UserLanguageSettingsProvider" ref="shared-provider"/>
<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="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1807653951974078926" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="803182146675939763" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${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-reference id="org.eclipse.cdt.ui.UserLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.ui.UserLanguageSettingsProvider" ref="shared-provider"/>
<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="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1853702211882476689" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="849230406584337526" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${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>

23
README.md

@ -1,10 +1,23 @@
``` ```
1. CAN测试通过 OK
2. 测试驱动器 OK
3. 三色报警灯
4. 测试IO输入
5. 测试ADC读值 (电流)
1. 电流检测
readadc 0 空压机
readadc 1 鼓风机
readadc 2 加热片
readadc 3
readadc 8
readadc 9
2. 维萨拉传感器485
hpp272_read_c1000 1
3. 空压机,风机,加热片安全继电器控制
writeio 0 1
writeio 1 1
writeio 2 1
writeio 3 1
writeio 4 1
writeio 5 1
``` ```

2
sdk

@ -1 +1 @@
Subproject commit 0c83a0fefd7c24cc78c3c2ad43012c831b059b27
Subproject commit e78069f293807d8ed385d8acd233c60ff3248110

10
usrc/main.cpp

@ -209,8 +209,14 @@ void Main::run() {
return false; return false;
}); });
// m_m211887ModuleManager.initialize(&m_canReceiver);
// m_m211887ModuleManager.regSubmodule(1, &huart3,1);
m_m211887ModuleManager.initialize(&m_canReceiver);
m_m211887ModuleManager.regSubmodule(1, &huart3, 0xf0);
// while(true){
// uint8_t buf[10] ={1,2,3,4,5,6,7,8,9,10};
// HAL_UART_Transmit(&huart3,buf,10,1000);
// HAL_Delay(10);
// }
ZLOGI(TAG, "init done"); ZLOGI(TAG, "init done");
while (1) { while (1) {

Loading…
Cancel
Save