Browse Source

update

master
zhaohe 2 years ago
parent
commit
ba2b27d214
  1. 4
      .settings/language.settings.xml
  2. 8
      README.md
  3. 2
      sdk
  4. 0
      usrc/board.h
  5. 24
      usrc/main.cpp
  6. 29
      usrc/project_configs.h

4
.settings/language.settings.xml

@ -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="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1070140549022839972" 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="835663160144634473" 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 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="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1008121162799773262" 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="773643773921567763" 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>

8
README.md

@ -1,2 +1,10 @@
开发板资料 开发板资料
http://47.111.11.73/docs/boards/stm32/zdyz_stm32f407_explorer.html http://47.111.11.73/docs/boards/stm32/zdyz_stm32f407_explorer.html
```
注意事项:
1.注意将CAN/USB选择跳帽,接到CAN接口那一端(否则代码会卡死在CAN初始化处)
```

2
sdk

@ -1 +1 @@
Subproject commit 4e20aacf97b379a8c1ca3b00b3b530ef8f941fc7
Subproject commit 37c29b865e6b5d2002dd78cde735681d034ba3c4

0
usrc/board.h

24
usrc/main.cpp

@ -56,32 +56,38 @@ void initmodule() {}
void umain() { void umain() {
chip_cfg_t chipcfg; chip_cfg_t chipcfg;
chipcfg.us_dleay_tim = &DELAY_US_TIMER;
chipcfg.tim_irq_scheduler_tim = &TIM_IRQ_SCHEDULER_TIMER;
chipcfg.huart = &DEBUG_UART;
chipcfg.debuglight = DEBUG_LIGHT_GPIO;
chipcfg.us_dleay_tim = &PC_SYS_DELAY_US_TIMER;
chipcfg.tim_irq_scheduler_tim = &PC_SYS_TIM_IRQ_SCHEDULER_TIMER;
chipcfg.huart = &PC_DEBUG_UART;
chipcfg.debuglight = PC_DEBUG_LIGHT_GPIO;
chip_init(&chipcfg); chip_init(&chipcfg);
zos_cfg_t zoscfg; zos_cfg_t zoscfg;
zos_init(&zoscfg); zos_init(&zoscfg);
ZLOGI(TAG, "boardId:%d", BOARD_ID);
ZLOGI(TAG, "boardId:%d", 0);
ZLOGI(TAG, "init can bus");
auto* m_zcanCommnaderMaster_cfg = m_zcanCommnaderMaster.createCFG(); // can×ÜÏßÅäÖà auto* m_zcanCommnaderMaster_cfg = m_zcanCommnaderMaster.createCFG(); // can×ÜÏßÅäÖÃ
m_zcanCommnaderMaster.init(m_zcanCommnaderMaster_cfg); // can×ÜÏß m_zcanCommnaderMaster.init(m_zcanCommnaderMaster_cfg); // can×ÜÏß
g_zModuleDeviceManager.initialize(&m_zcanCommnaderMaster); g_zModuleDeviceManager.initialize(&m_zcanCommnaderMaster);
ZLOGI(TAG, "init can bus end...");
static ZUARTDmaReceiver dmaUartReceiver; static ZUARTDmaReceiver dmaUartReceiver;
static CmdSchedulerV2 cmder; static CmdSchedulerV2 cmder;
ZUARTDmaReceiver::hardware_config_t cfg = { ZUARTDmaReceiver::hardware_config_t cfg = {
.huart = &DEBUG_UART,
.dma_rx = &DEBUG_UART_DMA,
.rxbuffersize = 1024,
.huart = &PC_DEBUG_UART,
.dma_rx = &PC_DEBUG_UART_DMA_HANDLER,
.rxbuffersize = PC_DEBUG_UART_RX_BUF_SIZE,
.rxovertime_ms = 10, .rxovertime_ms = 10,
}; };
ZLOGI(TAG, "init cmder");
dmaUartReceiver.initialize(&cfg); dmaUartReceiver.initialize(&cfg);
cmder.initialize(&dmaUartReceiver); cmder.initialize(&dmaUartReceiver);
ZLOGI(TAG, "init cmder end...");
ZLOGI(TAG, "init module");
g_zModuleDeviceManager.initialize(nullptr); g_zModuleDeviceManager.initialize(nullptr);
g_zModuleDeviceScriptCmderPaser.initialize(&cmder, &g_zModuleDeviceManager); g_zModuleDeviceScriptCmderPaser.initialize(&cmder, &g_zModuleDeviceManager);
@ -90,6 +96,8 @@ void umain() {
g_zModuleDeviceManager.registerModule(&proxy[i]); g_zModuleDeviceManager.registerModule(&proxy[i]);
} }
ZLOGI(TAG, "board init ok...");
while (true) { while (true) {
OSDefaultSchduler::getInstance()->loop(); OSDefaultSchduler::getInstance()->loop();
cmder.schedule(); cmder.schedule();

29
usrc/project_configs.h

@ -1,21 +1,20 @@
#pragma once #pragma once
#define VERSION "v1.0.0"
#define MANUFACTURER "http://www.iflytop.com/"
#define PROJECT_NAME "zcancmder_debug_board"
#define DEBUG_UART huart1
#define DEBUG_UART_DMA hdma_usart1_rx
#define DEBUG_LIGHT_GPIO PF9
#define PC_VERSION "v1.0.0"
#define PC_MANUFACTURER "http://www.iflytop.com/"
#define PC_PROJECT_NAME "zcancmder_debug_board"
#define PC_IFLYTOP_ENABLE_OS 1
#define DELAY_US_TIMER htim6 // US延时定时器
#define TIM_IRQ_SCHEDULER_TIMER htim7 // 中断定时器中断调度器
#define IFLTYOP_ZTICKET_TIMER TIM11 // 系统ticket定时器
#define PC_DEBUG_UART huart1
#define PC_DEBUG_UART_DMA_HANDLER hdma_usart1_rx
#define PC_DEBUG_UART_RX_BUF_SIZE 1024
#define PC_DEBUG_LIGHT_GPIO PF9
#define IFLYTOP_ENABLE_OS 1
#define IFLYTOP_PREEMPTPRIORITY_DEFAULT 5
#define PC_SYS_DELAY_US_TIMER htim6 // US延时定时器
#define PC_SYS_ZTICKET_TIMER TIM11 // 系统ticket定时器
#define PC_SYS_TIM_IRQ_SCHEDULER_TIMER htim7 // 中断定时器中断调度器
/****************************************FLASH***************************************/
#define IFLYTOP_NVS_CONFIG_FLASH_SECTOR 9
/*********************************************************************************/
#define BOARD_ID 0
#define PC_IRQ_PREEMPTPRIORITY_DEFAULT 5
#define PC_NVS_ENABLE 1
#define PC_NVS_CONFIG_FLASH_SECTOR 8
Loading…
Cancel
Save