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

1.fix some bug

sunlight
sunlight 11 months ago
parent
a9facce57e
commit
a1e4dc8b46
4 changed files with 12 additions and 9 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. 5
      ui/ui.h
  4. 12
      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="1290452739804114664" 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="-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">
<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="1305946972399269591" 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="-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">
<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

5
ui/ui.h
View File

@ -193,12 +193,15 @@
#define ob_muSettings_pipeLenTil 13
#define ob_muSettings_pipeLen0 14
#define ob_muSettings_addAcidVelTil 15
#define ob_muSettings_addAcidVel 16
#define ob_muSettings_addAcidVel3 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
#define ob_muSettings_addAcidVel0 22
#define ob_muSettings_addAcidVel1 23
#define ob_muSettings_addAcidVel2 24
//muDeviceInfo.objs
#define ob_muDeviceInfo_muDeviceInfo 0
#define ob_muDeviceInfo_bak 1

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

@ -71,10 +71,10 @@ void Page_muSettings::updatePage() {
UIS->setTxt(PAGE, ob_muSettings_pumpCoef3, zfmt("%.1f", getMotorMLPR(3)));
UIS->setTxt(PAGE, ob_muSettings_pipeLen0, getCfgStr(kcfg_pipeLengthML));
// TODO:改成4个输入框
UIS->setTxt(PAGE, ob_muSettings_addAcidVel, zitoa(getMxRunRPM(0)));
UIS->setTxt(PAGE, ob_muSettings_addAcidVel, zitoa(getMxRunRPM(1)));
UIS->setTxt(PAGE, ob_muSettings_addAcidVel, zitoa(getMxRunRPM(2)));
UIS->setTxt(PAGE, ob_muSettings_addAcidVel, zitoa(getMxRunRPM(3)));
UIS->setTxt(PAGE, ob_muSettings_addAcidVel0, zitoa(getMxRunRPM(0)));
UIS->setTxt(PAGE, ob_muSettings_addAcidVel1, zitoa(getMxRunRPM(1)));
UIS->setTxt(PAGE, ob_muSettings_addAcidVel2, zitoa(getMxRunRPM(2)));
UIS->setTxt(PAGE, ob_muSettings_addAcidVel3, zitoa(getMxRunRPM(3)));
}
void Page_muSettings::OnPageLoad(OnPageLoadContext* cxt) { //
@ -147,7 +147,7 @@ void Page_muSettings::OnInputFieldContentChange(uint8_t bid, const char* text) {
* addAcidVel *
***********************************************************************************************************************/
// TODO改成4个输入框
if (bid == ob_muSettings_addAcidVel) {
if (bid == ob_muSettings_addAcidVel0) {
int rpm = atoi(text);
if (rpm < 300) {
UIS->alert("转速不能小于300");
@ -160,7 +160,7 @@ void Page_muSettings::OnInputFieldContentChange(uint8_t bid, const char* text) {
}
}
if (bid == ob_muSettings_addAcidVel) {
if (bid == ob_muSettings_addAcidVel1) {
int rpm = atoi(text);
setMxRunRPM(0, rpm);
setMxRunRPM(1, rpm);

Write Preview
Loading…
Cancel
Save