p_transmit_disinfection
/
dbdb_liquid_path_control_protocol_v1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

master
zhaohe 1 year ago
parent
f92536db87
commit
f05f68f1fc
4 changed files with 24 additions and 10 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. 4
      .settings/language.settings.xml
  2. 2
      transmit_disinfection_protocol_v1
  3. 26
      usrc/protocol_impl/protocol_impl_service.cpp
  4. 2
      zsdk

4
.settings/language.settings.xml
View File

@ -5,7 +5,7 @@
<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.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="860587862030231004" 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="-859640089190887575" 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.g++"/>
</provider>
@ -16,7 +16,7 @@
<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.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="876077967161814475" 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="-897080592784661030" 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.g++"/>
</provider>

2
transmit_disinfection_protocol_v1

@ -1 +1 @@
Subproject commit 47b9b112fcc233aca5982b70a4a8bd7defb25b27
Subproject commit 67fd26a1a81f0afe4e653f2c40151571f846028e

26
usrc/protocol_impl/protocol_impl_service.cpp
View File

@ -26,7 +26,7 @@ static void onDeviceStateMonitorThreadStart(void const* argument) {
}
static uint8_t txdatabuf[1024] = {0};
static void zcanbus_on_rx(CanPacketRxBuffer* rxbuf, uint8_t* packet, size_t len) { //
static void _zcanbus_on_rx(CanPacketRxBuffer* rxbuf, uint8_t* packet, size_t len) { //
transmit_disinfection_protocol_header_t* header = (transmit_disinfection_protocol_header_t*)packet;
memset(txdatabuf, 0, sizeof(txdatabuf));
@ -77,19 +77,35 @@ static void zcanbus_on_rx(CanPacketRxBuffer* rxbuf, uint8_t* packet, size_t l
}
}
if (cmdheader->cmdid == kcmd_spray_air_compressor_power_ctrl) {
if (cmdheader->cmdid == kcmd_dbdb_spray_air_compressor_power_ctrl) {
int32_t val = *(int32_t*)(&cmdheader->data[0]);
Hardware::ins().sl_mini_ac_ctrl()->write(val);
Hardware::ins().atta_mini_air_compressor_ctrl()->write(val);
ZCanReceiver::ins()->sendAck(cmdheader, NULL, 0);
}
if (cmdheader->cmdid == kcmd_air_tightness_test_air_compressor_power_ctrl) {
if (cmdheader->cmdid == kcmd_dbdb_air_tightness_test_air_compressor_power_ctrl) {
int32_t val = *(int32_t*)(&cmdheader->data[0]);
Hardware::ins().sl_mini_ac_ctrl()->write(val);
ZCanReceiver::ins()->sendAck(cmdheader, NULL, 0);
}
}
static const char* hex2str(uint8_t* data, size_t len) {
static char buf[1024] = {0};
memset(buf, 0, sizeof(buf));
for (size_t i = 0; i < len; i++) {
sprintf(buf + i * 2, "%02X", data[i]);
}
return buf;
}
static void zcanbus_on_rx(CanPacketRxBuffer* rxbuf, uint8_t* packet, size_t len) { //
ZLOGI(TAG, "zcanbus_on_rx %s", hex2str(packet, len));
_zcanbus_on_rx(rxbuf, packet, len);
ZLOGI(TAG, "end");
}
void protocol_impl_service_init() { //
Hardware::ins().init();
ForceReportFlagMgr::ins()->init();
@ -98,8 +114,6 @@ void protocol_impl_service_init() { //
ZCanReceiver::ins()->init(cfg);
ZCanReceiver::ins()->registerListener(zcanbus_on_rx);
osThreadDef(PacketRxThread, onPacketRxThreadStart, osPriorityNormal, 0, 1024);
PacketRxThreadId = osThreadCreate(osThread(PacketRxThread), NULL);

2
zsdk

@ -1 +1 @@
Subproject commit 2d0aea4bda82668626ba11d42658eb2f36f48119
Subproject commit cfc9142c9578dbea728bfb93a07d8a85b5cc89eb
Write Preview
Loading…
Cancel
Save