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

1.Ìí¼ÓÁËui½çÃæ²˵¥µÄÁõº£ 

2.¸üи߼¶ÅäÖýçÃæ¿ؼþid
sunlight
sunlight 11 months ago
parent
9732847ad5
commit
6e555a300e
4 changed files with 43 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. 4
      .settings/language.settings.xml
  2. BIN
      ui/hand_acid_mainboard_ui.HMI
  3. 28
      ui/ui.h
  4. 53
      usrc/service/page/submenu/Page_muSettings.cpp

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="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">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1099095697460367224" 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="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">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1104150457464381929" 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>

BIN
ui/hand_acid_mainboard_ui.HMI
View File

28
ui/ui.h
View File

@ -192,16 +192,13 @@
#define ob_muSettings_pumpCoef3 12
#define ob_muSettings_pipeLenTil 13
#define ob_muSettings_pipeLen0 14
#define ob_muSettings_pipeLen1 15
#define ob_muSettings_pipeLen2 16
#define ob_muSettings_pipeLen3 17
#define ob_muSettings_addAcidVelTil 18
#define ob_muSettings_addAcidVel 19
#define ob_muSettings_bleCliTil 20
#define ob_muSettings_bleCliName 21
#define ob_muSettings_bleScan 22
#define ob_muSettings_pumpTest 23
#define ob_muSettings_pumpTestTil 24
#define ob_muSettings_addAcidVelTil 15
#define ob_muSettings_addAcidVel 16
#define ob_muSettings_bleCliTil 17
#define ob_muSettings_bleCliName 18
#define ob_muSettings_bleScan 19
#define ob_muSettings_pumpTest 20
#define ob_muSettings_pumpTestTil 21
//muDeviceInfo.objs
#define ob_muDeviceInfo_muDeviceInfo 0
#define ob_muDeviceInfo_bak 1
@ -242,13 +239,15 @@
#define ob_alert_confirmkey 2
#define ob_alert_info 3
#define ob_alert_frompage 4
#define ob_alert_t1 5
//confirm.objs
#define ob_confirm_confirm 0
#define ob_confirm_t0 1
#define ob_confirm_confirmkey 2
#define ob_confirm_canclekey 2
#define ob_confirm_info 3
#define ob_confirm_canclekey 4
#define ob_confirm_confirmkey 4
#define ob_confirm_frompage 5
#define ob_confirm_t1 6
//keybAcidCh.objs
#define ob_keybAcidCh_keybAcidCh 0
#define ob_keybAcidCh_bak 1
@ -300,6 +299,7 @@
#define ob_keybdB_b10 24
#define ob_keybdB_b11 25
#define ob_keybdB_loadcmname 26
#define ob_keybdB_b249 27
//keybdAP.objs
#define ob_keybdAP_keybdAP 0
#define ob_keybdAP_loadpageid 1
@ -377,8 +377,8 @@
#define ob_keybdAP_bp18 73
#define ob_keybdAP_b10 74
#define ob_keybdAP_b11 75
#define ob_keybdAP_temp2 76
#define ob_keybdAP_tempstr 77
#define ob_keybdAP_tempstr 76
#define ob_keybdAP_temp2 77
#define ob_keybdAP_loadcmname 78
//keybdA.objs
#define ob_keybdA_keybdA 0

53
usrc/service/page/submenu/Page_muSettings.cpp
View File

@ -6,7 +6,7 @@ using namespace iflytop;
/**
* @brief
* 酸类修改页面
* 锟斤拷锟斤拷锟睫革拷页锟斤拷
*/
#define PAGE pg_muSettings
@ -42,16 +42,16 @@ void Page_muSettings::initialize() { //
if (packet->cmd == kzble_app_report_key_event) {
int32_t keyEvent = *(int32_t*)packet->data;
if (keyEvent == hand_acid_remoter_kevent_add_liquid) {
UIS->setTxt(PAGE, ob_muSettings_bleCliName, "加液");
UIS->setTxt(PAGE, ob_muSettings_bleCliName, "锟斤拷液");
}
if (keyEvent == hand_acid_remoter_kevent_change_next_mode) {
UIS->setTxt(PAGE, ob_muSettings_bleCliName, "模式切换");
UIS->setTxt(PAGE, ob_muSettings_bleCliName, "模式锟叫伙拷");
}
if (keyEvent == hand_acid_remoter_kevent_reflux) {
UIS->setTxt(PAGE, ob_muSettings_bleCliName, "液路回流");
UIS->setTxt(PAGE, ob_muSettings_bleCliName, "液路锟斤拷锟斤拷");
}
if (keyEvent == hand_acid_remoter_kevent_preFilling) {
UIS->setTxt(PAGE, ob_muSettings_bleCliName, "液路预充");
UIS->setTxt(PAGE, ob_muSettings_bleCliName, "液路预锟斤拷");
}
return;
}
@ -70,9 +70,9 @@ void Page_muSettings::updatePage() {
UIS->setTxt(PAGE, ob_muSettings_pumpCoef2, zfmt("%.1f", getMotorMLPR(2)));
UIS->setTxt(PAGE, ob_muSettings_pumpCoef3, zfmt("%.1f", getMotorMLPR(3)));
UIS->setTxt(PAGE, ob_muSettings_pipeLen0, getCfgStr(kcfg_pipeLengthML));
UIS->setTxt(PAGE, ob_muSettings_pipeLen1, getCfgStr(kcfg_pipeLengthML));
UIS->setTxt(PAGE, ob_muSettings_pipeLen2, getCfgStr(kcfg_pipeLengthML));
UIS->setTxt(PAGE, ob_muSettings_pipeLen3, getCfgStr(kcfg_pipeLengthML));
// UIS->setTxt(PAGE, ob_muSettings_pipeLen1, getCfgStr(kcfg_pipeLengthML));
// UIS->setTxt(PAGE, ob_muSettings_pipeLen2, getCfgStr(kcfg_pipeLengthML));
// UIS->setTxt(PAGE, ob_muSettings_pipeLen3, getCfgStr(kcfg_pipeLengthML));
UIS->setTxt(PAGE, ob_muSettings_addAcidVel, getCfgStr(kcfg_pumpDefVel));
}
@ -82,7 +82,7 @@ void Page_muSettings::OnPageLoad(OnPageLoadContext* cxt) { //
void Page_muSettings::OnAppEvent(AppEvent_t* event) {
if (event->type == kAppEvent_BleConnectEvent) {
ZLOGI(TAG, "ble connect success");
UIS->setTxt(PAGE, ob_muSettings_bleCliName, "绑定成功");
UIS->setTxt(PAGE, ob_muSettings_bleCliName, "锟襟定成癸拷");
CS->setcfgAndFlush(kcfg_bleClientName, event->d.bleName);
m_scaning = false;
}
@ -133,20 +133,21 @@ void Page_muSettings::OnInputFieldContentChange(uint8_t bid, const char* text) {
UIS->setTxt(bid, getCfgStr(kcfg_pipeLengthML));
}
else if (bid == ob_muSettings_pipeLen1) {
CS->setcfg(kcfg_pipeLengthML, text);
UIS->setTxt(bid, getCfgStr(kcfg_pipeLengthML));
}
else if (bid == ob_muSettings_pipeLen2) {
CS->setcfg(kcfg_pipeLengthML, text);
UIS->setTxt(bid, getCfgStr(kcfg_pipeLengthML));
}
else if (bid == ob_muSettings_pipeLen3) {
CS->setcfg(kcfg_pipeLengthML, text);
UIS->setTxt(bid, getCfgStr(kcfg_pipeLengthML));
}
// else if (bid == ob_muSettings_pipeLen1) {
// CS->setcfg(kcfg_pipeLengthML, text);
// UIS->setTxt(b
id, getCfgStr(kcfg_pipeLengthML));
// }
//
// else if (bid == ob_muSettings_pipeLen2) {
// CS->setcfg(kcfg_pipeLengthML, text);
// UIS->setTxt(bid, getCfgStr(kcfg_pipeLengthML));
// }
//
// else if (bid == ob_muSettings_pipeLen3) {
// CS->setcfg(kcfg_pipeLengthML, text);
// UIS->setTxt(bid, getCfgStr(kcfg_pipeLengthML));
// }
/***********************************************************************************************************************
* addAcidVel *
@ -165,15 +166,15 @@ void Page_muSettings::OnButton(uint8_t bid, uint8_t val) {
if (bid == ob_muSettings_bak) {
UIS->chpage(GSM->getMenuPage());
if (m_scaning) {
RCTRL->startScan("XXXXXXXXX", false); // 相当于停止扫描
RCTRL->startScan("XXXXXXXXX", false); // 锟洁当锟斤拷停止扫锟斤拷
}
} else if (bid == ob_muSettings_bleScan) {
ZLOGI(TAG, "bleScan");
bool suc = RCTRL->startScan(BLENAME, true);
if (suc) UIS->setTxt(PAGE, ob_muSettings_bleCliName, "扫描中...");
if (suc) UIS->setTxt(PAGE, ob_muSettings_bleCliName, "扫锟斤拷锟斤拷...");
m_scaning = true;
}
};
// muAcidType
// muAcidType
Write Preview
Loading…
Cancel
Save