Browse Source

update

storage-in-realtime
zhaohe 1 year ago
parent
commit
59323dbf92
  1. 4
      src/configs/project_setting.hpp
  2. 5
      src/utils/volume_convertor.cpp
  3. 2
      transmit_disinfection_public_code

4
src/configs/project_setting.hpp

@ -10,8 +10,8 @@
#define REG_EXCEPTION_FLAG 0x0100 // 异常标志位
// #define PROJECT_TYPE_LARGE_SPACE_DISINFECTION 1 // 大空间
#define PROJECT_TYPE_SMALL_SPACE_DISINFECTION 1 // 小空间
// #define PROJECT_TYPE_PIPE_DISINFECTION 1 // 管道消毒机
// #define PROJECT_TYPE_SMALL_SPACE_DISINFECTION 1 // 小空间
#define PROJECT_TYPE_PIPE_DISINFECTION 1 // 管道消毒机
#ifdef PROJECT_TYPE_SMALL_SPACE_DISINFECTION
#define DISINFECTANT_BUCKET_CAPACITY 2500

5
src/utils/volume_convertor.cpp

@ -66,16 +66,17 @@ float VolumeConvertor::pressurePa2VolumeG(float _pa) {
h3_dm = h3_dm > container_h3 ? container_h3 : h3_dm;
h4_dm = h4_dm > container_h4 ? container_h4 : h4_dm;
// printf("h_dm:%f h1_dm:%f, h2_dm:%f, h3_dm:%f, h4_dm:%f\n",h_dm, h1_dm, h2_dm, h3_dm, h4_dm);
// printf("h_dm:%f h1_dm:%f, h2_dm:%f, h3_dm:%f, h4_dm:%f\n",h_dm, h1_dm, h2_dm, h3_dm, h4_dm);
float v1 = computeConeVolume(container_rb1, container_ru1, container_h1, h1_dm);
float v2 = computeConeVolume(container_rb2, container_ru2, container_h2, h2_dm);
float v3 = computeConeVolume(container_rb3, container_ru3, container_h3, h3_dm);
float v4 = computeConeVolume(container_rb4, container_ru4, container_h4, h4_dm);
// printf("v1:%f, v2:%f, v3:%f, v4:%f\n", v1, v2, v3, v4);
// printf("v1:%f, v2:%f, v3:%f, v4:%f\n", v1, v2, v3, v4);
// h4_dm * (double)(2.1124069002737764)
float V_L = v1 + v2 + v3 + v4; // 0.001m^3
float g = V_L * density; // 1m^3 = 1000L
if (g < 25) g = 0;
return g;
}

2
transmit_disinfection_public_code

@ -1 +1 @@
Subproject commit cb7ab17a76850384fb3d0b1872197a198754f49d
Subproject commit 0f588e38efc9ca857d77b9e9bd7fb149b225237b
Loading…
Cancel
Save