p_transmit_disinfection_v3
/
transmit_disinfection_micro_bak
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

master
zhaohe 1 year ago
parent
27c3b57664
commit
b2cb32984f
17 changed files with 29 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      .cproject
  2. 9
      .gitmodules
  3. 1
      .vscode/c_cpp_properties.json
  4. 3
      .vscode/settings.json
  5. 1
      app_protocols/transmit_disfection_protocol
  6. 1
      app_protocols/zscanprotocol
  7. 1
      iflytop_canbus_protocol
  8. 2
      usrc/base/device_info.cpp
  9. 2
      usrc/board/public_board.cpp
  10. 2
      usrc/board/public_board.hpp
  11. 2
      usrc/project_configs.h
  12. 1
      usrc/protocol_processer_impl/processer.hpp
  13. 2
      usrc/protocol_processer_impl/public_cmd_processer.cpp
  14. 3
      usrc/protocol_processer_impl/public_cmd_processer.hpp
  15. 4
      usrc/protocol_processer_mgr/i_protocol_processer.hpp
  16. 2
      usrc/protocol_processer_mgr/protocol_processer_mgr.cpp
  17. 2
      zsdk

33
.cproject
View File

@ -50,6 +50,7 @@
</option>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.550404719" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="../Core/Inc"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/app_protocols}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
<listOptionValue builtIn="false" value="../Drivers/STM32F4xx_HAL_Driver/Inc"/>
<listOptionValue builtIn="false" value="../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy"/>
@ -76,6 +77,7 @@
</option>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.includepaths.638645730" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="../Core/Inc"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/app_protocols}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/sdk}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/usrc}&quot;"/>
@ -118,41 +120,10 @@
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.319958895" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
</toolChain>
</folderInfo>
<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1853947771.158051727" name="/" resourcePath="zstm32">
<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.2144668302" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug" unusedChildren="">
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.801178797.2013605552" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.801178797"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.777915677.880800453" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.777915677"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1126839807.92520028" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1126839807"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.fpu.2045742466.1750582012" name="Floating-point unit" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.fpu.2045742466"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.2108401733.1402246041" name="Floating-point ABI" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.2108401733"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1574925555.1446792426" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1574925555"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.244221814.514030383" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.244221814"/>
<option id="com.st.stm32cube.ide.mcu.debug.option.cpuclock.764397174.2055090326" name="Cpu clock frequence" superClass="com.st.stm32cube.ide.mcu.debug.option.cpuclock.764397174"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.convertbinary.992660821.817957701" name="Convert to binary file (-O binary)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.convertbinary.992660821"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex.494792904.446795777" name="Convert to Intel Hex file (-O ihex)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex.494792904"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.nanoscanffloat.176411214.889817232" name="Use float with scanf from newlib-nano (-u _scanf_float)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.nanoscanffloat.176411214"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.nanoprintffloat.164943344.446798472" name="Use float with printf from newlib-nano (-u _printf_float)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.nanoprintffloat.164943344"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.386899990.1392846014" name="Toolchain" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.386899990"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.525271592" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1243726437"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.913856419" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.782799112"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1422843115" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.344817877"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1118138633" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.163881313"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1551848324" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.13625971"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.70791421" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.251758949"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.226412199" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1663377731"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1396454213" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1054983767"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.652474257" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.959331179"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.195629694" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.673967072"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.2122540003" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.468761296"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.496759985" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1968696221"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.51053260" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.319958895"/>
</toolChain>
</folderInfo>
<sourceEntries>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="iflytop_canbus_protocol"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="usrc"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="zsdk"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="zstm32"/>

9
.gitmodules
View File

@ -1,6 +1,9 @@
[submodule "zsdk"]
path = zsdk
url = zwsd@192.168.1.3:p_transmit_disinfection_v2/disinfection_stm32_sdk.git
[submodule "iflytop_canbus_protocol"]
path = iflytop_canbus_protocol
url = zwsd@192.168.1.3:p_transmit_disinfection_v2/disinfection_iflytop_can_protocol.git
[submodule "transmit_disfection_protocol"]
path = app_protocols/transmit_disfection_protocol
url = zwsd@192.168.1.3:p_transmit_disinfection_v3/transmit_disfection_protocol.git
[submodule "app_protocols/zscanprotocol"]
path = app_protocols/zscanprotocol
url = zwsd@192.168.1.3:zprotocols/zscanprotocol.git

1
.vscode/c_cpp_properties.json
View File

@ -4,6 +4,7 @@
"name": "app",
"includePath": [
"./Core/Inc",
"./app_protocols",
"./Drivers/STM32F4xx_HAL_Driver/Inc",
"./Drivers/STM32F4xx_HAL_Driver/Inc/Legacy",
"./Middlewares/Third_Party/FreeRTOS/Source/include",

3
.vscode/settings.json
View File

@ -80,7 +80,8 @@
"gins.h": "c",
"common_hardware_init.h": "c",
"public_service.h": "c",
"stm32irq.h": "c"
"stm32irq.h": "c",
"project_configs.h": "c"
},
"files.autoGuessEncoding": false,
"files.encoding": "utf8"

1
app_protocols/transmit_disfection_protocol

@ -0,0 +1 @@
Subproject commit 7ec8b89424ab02856d3c48a77dfb11e790db4693

1
app_protocols/zscanprotocol

@ -0,0 +1 @@
Subproject commit 94c49f650f508e64b9e30e733dbb161c72ae2559

1
iflytop_canbus_protocol

@ -1 +0,0 @@
Subproject commit d343d187f3beb80852bae6f2d3322f85ee8c8bd9

2
usrc/base/device_info.cpp
View File

@ -1,6 +1,6 @@
#include "device_info.hpp"
#include "iflytop_canbus_protocol/iflytop_canbus_protocol.hpp"
#include "transmit_disfection_protocol/transmit_disfection_protocol.hpp"
uint16_t deviceInfo_init() { return 0; }
uint16_t deviceInfo_getProtocolVersion() { return PROTOCOL_VERSION; }

2
usrc/board/public_board.cpp
View File

@ -2,6 +2,7 @@
#include "idtable/IdMgr.hpp"
using namespace iflytop;
using namespace transmit_disfection_protocol;
void PublicBoard::debugUartInit(void) {
GPIO_InitTypeDef GPIO_InitStruct = {0};
@ -69,7 +70,6 @@ void PublicBoard::canInit() {
HAL_NVIC_EnableIRQ(CAN1_SCE_IRQn);
}
void PublicBoard::initialize() {
debugUartInit();
canInit();

2
usrc/board/public_board.hpp
View File

@ -4,7 +4,7 @@
#include "zsdk/zsdk.hpp"
#include "zstm32/zstm32.hpp"
#include "transmit_disfection_protocol/transmit_disfection_protocol.hpp"
namespace iflytop {
class PublicBoard {
ZGPIO m_debugled;

2
usrc/project_configs.h
View File

@ -1,5 +1,5 @@
#pragma once
#include "iflytop_canbus_protocol/iflytop_canbus_protocol.hpp"
/***********************************************************************************************************************
* SDK_CONFIG *
***********************************************************************************************************************/

1
usrc/protocol_processer_impl/processer.hpp
View File

@ -1,2 +1,3 @@
#pragma once
#include "public_cmd_processer.hpp"
#include "liquid_ctrl_board_cmd_processer.hpp"

2
usrc/protocol_processer_impl/public_cmd_processer.cpp
View File

@ -1,6 +1,8 @@
#include "public_cmd_processer.hpp"
using namespace iflytop;
using namespace zscanprotocol;
using namespace transmit_disfection_protocol;
void PublicCmdProcesser::initialize() {
REG_FN(read_board_info);

3
usrc/protocol_processer_impl/public_cmd_processer.hpp
View File

@ -4,6 +4,9 @@
namespace iflytop {
using namespace std;
using namespace zscanprotocol;
using namespace transmit_disfection_protocol;
class PublicCmdProcesser : public IProtocolProcesser {
list<CmdProcesser> cmdprocesser;

4
usrc/protocol_processer_mgr/i_protocol_processer.hpp
View File

@ -5,14 +5,16 @@
#include "zsdk/zsdk.hpp"
#include "zstm32/zstm32.hpp"
//
#include "transmit_disfection_protocol/transmit_disfection_protocol.hpp"
#include "base/device_info.hpp"
#include "board/board.hpp"
#include "gflag/gflag.h"
#include "iflytop_canbus_protocol/iflytop_canbus_protocol.hpp"
#include "zsdk/zcanreceiver/zcanreceiver.hpp"
namespace iflytop {
using namespace std;
using namespace zscanprotocol;
using namespace transmit_disfection_protocol;
#define REG_FN(fn) cmdprocesser.push_back(CmdProcesser(kfn_##fn, bind(&PublicCmdProcesser::fn, this, placeholders::_1)))
#define GET_PARAM(buff, off) ((((int32_t*)(buff))[off]))

2
usrc/protocol_processer_mgr/protocol_processer_mgr.cpp
View File

@ -1,5 +1,7 @@
#include "protocol_processer_mgr.hpp"
using namespace iflytop;
using namespace zscanprotocol;
using namespace transmit_disfection_protocol;
#define TAG "ProtocolProcesserMgr"

2
zsdk

@ -1 +1 @@
Subproject commit 18f5f3e7ee74542a2f6d313a5a82acb5489bf114
Subproject commit c7d515f2180f0ce961f7b61794544d8ea01ec586
Write Preview
Loading…
Cancel
Save