p_chinagoldgroup_hand_acid
/
hand_acid_mainboard_bak
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

sunlight
zhaohe 11 months ago
parent
2b8066e9f4
commit
e2dbb4d131
8 changed files with 84 additions and 20 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. 8
      uappbase/appcfg/appcfg.hpp
  3. 5
      uappbase/bean/config_index_enum.hpp
  4. 12
      uappbase/service/config_index.cpp
  5. 50
      uappbase/service/config_service_utils.cpp
  6. 5
      uappbase/service/config_service_utils.hpp
  7. 16
      usrc/service/pump_ctrl_service.cpp
  8. 4
      usrc/service/pump_ctrl_service.hpp

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="-980894174094061135" 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="1534615028576298921" 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="-975839414090046430" 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="1550109261171453848" 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>

8
uappbase/appcfg/appcfg.hpp
View File

@ -65,4 +65,10 @@
#define ACID_DEFAULT_NAME14 "一氯乙酸"
#define ACID_DEFAULT_NAME15 "氢氟酸"
#define PUMPDEFVEL "800" // 100r/min
#define PUMPDEFVEL "800" // 100r/min
// 通道每次小回流的液体长度
#define CH0APPENDML 2.5
#define CH1APPENDML 2.5
#define CH2APPENDML 1
#define CH3APPENDML 1

5
uappbase/bean/config_index_enum.hpp
View File

@ -82,7 +82,10 @@ typedef enum {
/***********************************************************************************************************************
* 回流参数配置 *
***********************************************************************************************************************/
kcfg_pipeLengthML, // 酸液管路长度
kcfg_pipeLengthML0, // 酸液管路长度
kcfg_pipeLengthML1, // 酸液管路长度
kcfg_pipeLengthML2, // 酸液管路长度
kcfg_pipeLengthML3, // 酸液管路长度
kcfg_m0irun, // 电机0 irun
kcfg_m1irun, // 电机1 irun

12
uappbase/service/config_index.cpp
View File

@ -78,9 +78,9 @@ static cfg_iterm_info_t cfg_iterm_infos[] = {
/***********************************************************************************************************************
* 其他配置 *
***********************************************************************************************************************/
CFG_ITERM(kcfg_lockAcidName, kcfgt_bool, "false"), //
CFG_ITERM(kcfg_echDitrUpLi, kcfgt_int32, "99"), // 每次分配上限设定值 each distri up-limit
CFG_ITERM(kcfg_distrInterval, kcfgt_float, "1.5"), // 每次分配间隔时间
CFG_ITERM(kcfg_lockAcidName, kcfgt_bool, "false"), //
CFG_ITERM(kcfg_echDitrUpLi, kcfgt_int32, "99"), // 每次分配上限设定值 each distri up-limit
CFG_ITERM(kcfg_distrInterval, kcfgt_float, "1.5"), // 每次分配间隔时间
// CFG_ITERM(kcfg_pumpDefVel, kcfgt_int32, PUMPDEFVEL), //
CFG_ITERM(kcfg_pumpDefVel0, kcfgt_int32, PUMPDEFVEL), //
@ -98,8 +98,10 @@ static cfg_iterm_info_t cfg_iterm_infos[] = {
/***********************************************************************************************************************
* 回流参数配置 *
***********************************************************************************************************************/
CFG_ITERM(kcfg_pipeLengthML, kcfgt_float, "100"), //
CFG_ITERM(kcfg_pipeLengthML0, kcfgt_float, "300"), //
CFG_ITERM(kcfg_pipeLengthML1, kcfgt_float, "300"), //
CFG_ITERM(kcfg_pipeLengthML2, kcfgt_float, "100"), //
CFG_ITERM(kcfg_pipeLengthML3, kcfgt_float, "100"), //
};
const char *cfgName(int32_t index) {

50
uappbase/service/config_service_utils.cpp
View File

@ -1,6 +1,56 @@
#include "config_service_utils.hpp"
namespace iflytop {
float getPumpAppendMl(int chid) {
switch (chid) {
case 0:
return CH0APPENDML; //
case 1:
return CH1APPENDML;
case 2:
return CH2APPENDML;
case 3:
return CH3APPENDML;
default:
ZASSERT(0);
return 0;
}
}
float getCfgPipeLengthML(int chid) {
switch (chid) {
case 0:
return getCfgFloat(kcfg_pipeLengthML0);
case 1:
return getCfgFloat(kcfg_pipeLengthML1);
case 2:
return getCfgFloat(kcfg_pipeLengthML2);
case 3:
return getCfgFloat(kcfg_pipeLengthML3);
default:
ZASSERT(0);
return 0;
}
}
void setCfgPipeLengthML(int chid, float ml) {
switch (chid) {
case 0:
CS->setcfgAndFlush(kcfg_pipeLengthML0, ml);
break;
case 1:
CS->setcfgAndFlush(kcfg_pipeLengthML1, ml);
break;
case 2:
CS->setcfgAndFlush(kcfg_pipeLengthML2, ml);
break;
case 3:
CS->setcfgAndFlush(kcfg_pipeLengthML3, ml);
break;
default:
ZASSERT(0);
}
}
int getMxRunRPM(int32_t mid) { //
float rpm = 0;
if (mid == 0) {

5
uappbase/service/config_service_utils.hpp
View File

@ -13,4 +13,9 @@ int32_t getMxIRun(int motorid);
const char* getPasswd(const char* usrname, CfgItermCache* cache);
const void setPasswd(const char* usrname, const char* passwd);
float getCfgPipeLengthML(int chid);
void setCfgPipeLengthML(int chid, float ml);
float getPumpAppendMl(int chid);
} // namespace iflytop

16
usrc/service/pump_ctrl_service.cpp
View File

@ -10,9 +10,7 @@ static TMC51X0* m_motors[4];
#define PUMP_NUM 4
static CfgItermCache cfgcache;
#define APPEND_ML 10
// #define APPEND_ML 2
void PumpCtrlService::initialize() {
m_motors[0] = AppHardware::ins()->getPump(0);
@ -85,12 +83,13 @@ void PumpCtrlService::reflux() {
m_thread.start(
[this]() {
ValveStateSyncService::ins()->setValveState(1);
int32_t pipeLenML = getCfgInt(kcfg_pipeLengthML);
// int32_t pipeLenML = getCfgInt(kcfg_pipeLengthML);
for (size_t i = 0; i < PUMP_NUM; i++) {
TMC51X0* cur_motor = m_motors[i];
cur_motor->stop();
cur_motor->setXACTUAL(0);
float pipeLenML = getCfgPipeLengthML(i);
ZLOGI(TAG, "pump %d move %f ml", i, -pipeLenML);
cur_motor->moveBy((int32_t)-pipeLenML * 1000, getMxRunRPM(i));
}
@ -115,12 +114,11 @@ void PumpCtrlService::acidPrefilling() {
[this]() {
ValveStateSyncService::ins()->setValveState(1);
int32_t pipeLenML = getCfgInt(kcfg_pipeLengthML);
for (size_t i = 0; i < PUMP_NUM; i++) {
TMC51X0* cur_motor = m_motors[i];
cur_motor->stop();
cur_motor->setXACTUAL(0);
float pipeLenML = getCfgPipeLengthML(i);
ZLOGI(TAG, "pump %d move %f ml", i, pipeLenML);
cur_motor->moveBy((int32_t)pipeLenML * 1000, getMxRunRPM(i));
}
@ -135,7 +133,7 @@ void PumpCtrlService::acidPrefilling() {
// śĚťŘÁ÷
for (size_t i = 0; i < PUMP_NUM; i++) {
TMC51X0* cur_motor = m_motors[i];
cur_motor->moveBy(-(int32_t)(APPEND_ML) * 1000, getMxRunRPM(i));
cur_motor->moveBy(-(int32_t)(getPumpAppendMl(i) * 1000), getMxRunRPM(i));
}
while (!isAllReachTarget()) {
@ -198,7 +196,7 @@ void PumpCtrlService::doMoveOnce() {
cur_motor->setXACTUAL(0);
if (pumpselect) {
ZLOGI(TAG, "pump %d move %f ml", i, distribut_ml);
cur_motor->moveBy((int32_t)(distribut_ml + APPEND_ML) * 1000, getMxRunRPM(i));
cur_motor->moveBy((int32_t)(distribut_ml + getPumpAppendMl(i)) * 1000, getMxRunRPM(i));
}
}
@ -216,7 +214,7 @@ void PumpCtrlService::doMoveOnce() {
cur_motor->stop();
cur_motor->setXACTUAL(0);
if (pumpselect) {
cur_motor->moveBy(-(int32_t)(APPEND_ML) * 1000, getMxRunRPM(i));
cur_motor->moveBy(-(int32_t)(getPumpAppendMl(i)* 1000) , getMxRunRPM(i));
}
}

4
usrc/service/pump_ctrl_service.hpp
View File

@ -35,8 +35,8 @@ class PumpCtrlService {
void stop();
public:
void rotate(int32_t mid, int32_t direction);
void stopRotate();
void rotate(int32_t mid, int32_t direction);
void stopRotate();
double getMotorNowPosR(int32_t mid);
private:

Write Preview
Loading…
Cancel
Save