diff --git a/.code_review_properties b/.code_review_properties
new file mode 100644
index 0000000..36a49b9
--- /dev/null
+++ b/.code_review_properties
@@ -0,0 +1,80 @@
+
+
+
+ property.default.description
+
+ 1970-01-01 :: 00:00:00:000 GMT-10:00
+ review
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.settings/org.eclipse.cdt.codan.core.prefs b/.settings/org.eclipse.cdt.codan.core.prefs
new file mode 100644
index 0000000..1a17117
--- /dev/null
+++ b/.settings/org.eclipse.cdt.codan.core.prefs
@@ -0,0 +1,72 @@
+eclipse.preferences.version=1
+org.eclipse.cdt.codan.checkers.errnoreturn=Warning
+org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"No return\\")",implicit\=>false}
+org.eclipse.cdt.codan.checkers.errreturnvalue=Error
+org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused return value\\")"}
+org.eclipse.cdt.codan.checkers.nocommentinside=-Error
+org.eclipse.cdt.codan.checkers.nocommentinside.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Nesting comments\\")"}
+org.eclipse.cdt.codan.checkers.nolinecomment=-Error
+org.eclipse.cdt.codan.checkers.nolinecomment.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Line comments\\")"}
+org.eclipse.cdt.codan.checkers.noreturn=Error
+org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"No return value\\")",implicit\=>false}
+org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=Error
+org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Abstract class cannot be instantiated\\")"}
+org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=Error
+org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Ambiguous problem\\")"}
+org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Assignment in condition\\")"}
+org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=Error
+org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Assignment to itself\\")"}
+org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"No break at end of case\\")",no_break_comment\=>"no break",last_case_param\=>false,empty_case_param\=>false}
+org.eclipse.cdt.codan.internal.checkers.CatchByReference=Warning
+org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Catching by reference is recommended\\")",unknown\=>false,exceptions\=>()}
+org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=Error
+org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Circular inheritance\\")"}
+org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=Warning
+org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Class members should be properly initialized\\")",skip\=>true}
+org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=Error
+org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Field cannot be resolved\\")"}
+org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=Error
+org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Function cannot be resolved\\")"}
+org.eclipse.cdt.codan.internal.checkers.InvalidArguments=Error
+org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid arguments\\")"}
+org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=Error
+org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid template argument\\")"}
+org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=Error
+org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Label statement not found\\")"}
+org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=Error
+org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Member declaration not found\\")"}
+org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=Error
+org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Method cannot be resolved\\")"}
+org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info
+org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Name convention for function\\")",pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
+org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Class has a virtual method and non-virtual destructor\\")"}
+org.eclipse.cdt.codan.internal.checkers.OverloadProblem=Error
+org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid overload\\")"}
+org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=Error
+org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid redeclaration\\")"}
+org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=Error
+org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid redefinition\\")"}
+org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning
+org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Return with parenthesis\\")"}
+org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning
+org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Format String Vulnerability\\")"}
+org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Statement has no effect\\")",macro\=>true,exceptions\=>()}
+org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Suggested parenthesis around expression\\")",paramNot\=>false}
+org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Suspicious semicolon\\")",else\=>false,afterelse\=>false}
+org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=Error
+org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Type cannot be resolved\\")"}
+org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused function declaration\\")",macro\=>true}
+org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused static function\\")",macro\=>true}
+org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused variable declaration in file scope\\")",macro\=>true,exceptions\=>("@(\#)","$Id")}
+org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=Error
+org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Symbol is not resolved\\")"}
+useParentScope=false
diff --git a/Core/Src/keys.c b/Core/Src/keys.c
index c2ea37e..da50340 100644
--- a/Core/Src/keys.c
+++ b/Core/Src/keys.c
@@ -1667,11 +1667,11 @@ uint32_t s, ikdt, ikt, iks, ikd, ike, ipt;
else if(ipt == 3) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.001f;
else if(ipt == 4) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.0001f;
- if(pardata.amplif[ACTIVE_CHANNEL].SENS <= 0.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0001f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS < 0.0010f) { //поправил
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0010f;
}
- if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 100000.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 99999.0f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 10000.0f) {
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 9999.0f;
}
VerifyGain(pardata.amplif[ACTIVE_CHANNEL].SENS);
@@ -1691,13 +1691,14 @@ uint32_t s, ikdt, ikt, iks, ikd, ike, ipt;
else if(ipt == 3) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.001f;
else if(ipt == 4) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.0001f;
- if(pardata.amplif[ACTIVE_CHANNEL].SENS <= 0.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0001f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS < 0.0010f) { //поправил
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0010f;
}
- if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 100000.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 99999.0f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 10000.0f) {
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 9999.0f;
}
+
VerifyGain(pardata.amplif[ACTIVE_CHANNEL].SENS);
}
else
@@ -1715,13 +1716,14 @@ uint32_t s, ikdt, ikt, iks, ikd, ike, ipt;
else if(ipt == 3) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.001f;
else if(ipt == 4) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.0001f;
- if(pardata.amplif[ACTIVE_CHANNEL].SENS <= 0.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0001f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS < 0.0010f) { //поправил
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0010f;
}
- if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 100000.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 99999.0f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 10000.0f) {
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 9999.0f;
}
+
VerifyGain(pardata.amplif[ACTIVE_CHANNEL].SENS);
}
else
@@ -1739,13 +1741,14 @@ uint32_t s, ikdt, ikt, iks, ikd, ike, ipt;
else if(ipt == 3) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.001f;
else if(ipt == 4) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.0001f;
- if(pardata.amplif[ACTIVE_CHANNEL].SENS <= 0.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0001f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS < 0.0010f) { //поправил
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0010f;
}
- if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 100000.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 99999.0f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 10000.0f) {
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 9999.0f;
}
+
VerifyGain(pardata.amplif[ACTIVE_CHANNEL].SENS);
}
else
@@ -1763,13 +1766,14 @@ uint32_t s, ikdt, ikt, iks, ikd, ike, ipt;
else if(ipt == 3) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.001f;
else if(ipt == 4) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.0001f;
- if(pardata.amplif[ACTIVE_CHANNEL].SENS <= 0.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0001f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS < 0.0010f) { //поправил
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0010f;
}
- if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 100000.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 99999.0f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 10000.0f) {
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 9999.0f;
}
+
VerifyGain(pardata.amplif[ACTIVE_CHANNEL].SENS);
}
else
@@ -1787,13 +1791,14 @@ uint32_t s, ikdt, ikt, iks, ikd, ike, ipt;
else if(ipt == 3) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.001f;
else if(ipt == 4) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.0001f;
- if(pardata.amplif[ACTIVE_CHANNEL].SENS <= 0.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0001f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS < 0.0010f) { //поправил
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0010f;
}
- if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 100000.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 99999.0f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 10000.0f) {
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 9999.0f;
}
+
VerifyGain(pardata.amplif[ACTIVE_CHANNEL].SENS);
}
@@ -2237,13 +2242,14 @@ uint32_t s, ikdt, ikt, iks, ikd, ike, ipt;
else if(ipt == 3) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.001f;
else if(ipt == 4) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.0001f;
- if(pardata.amplif[ACTIVE_CHANNEL].SENS <= 0.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0001f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS < 0.0010f) { //поправил
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0010f;
}
- if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 100000.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 99999.0f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 10000.0f) {
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 9999.0f;
}
+
VerifyGain(pardata.amplif[ACTIVE_CHANNEL].SENS);
}
else
@@ -2261,13 +2267,14 @@ uint32_t s, ikdt, ikt, iks, ikd, ike, ipt;
else if(ipt == 3) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.001f;
else if(ipt == 4) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.0001f;
- if(pardata.amplif[ACTIVE_CHANNEL].SENS <= 0.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0001f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS < 0.0010f) { //поправил
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0010f;
}
- if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 100000.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 99999.0f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 10000.0f) {
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 9999.0f;
}
+
VerifyGain(pardata.amplif[ACTIVE_CHANNEL].SENS);
}
else
@@ -2285,13 +2292,14 @@ uint32_t s, ikdt, ikt, iks, ikd, ike, ipt;
else if(ipt == 3) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.001f;
else if(ipt == 4) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.0001f;
- if(pardata.amplif[ACTIVE_CHANNEL].SENS <= 0.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0001f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS < 0.0010f) { //поправил
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0010f;
}
- if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 100000.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 99999.0f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 10000.0f) {
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 9999.0f;
}
+
VerifyGain(pardata.amplif[ACTIVE_CHANNEL].SENS);
}
else
@@ -2309,13 +2317,14 @@ uint32_t s, ikdt, ikt, iks, ikd, ike, ipt;
else if(ipt == 3) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.001f;
else if(ipt == 4) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.0001f;
- if(pardata.amplif[ACTIVE_CHANNEL].SENS <= 0.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0001f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS < 0.0010f) { //поправил
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0010f;
}
- if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 100000.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 99999.0f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 10000.0f) {
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 9999.0f;
}
+
VerifyGain(pardata.amplif[ACTIVE_CHANNEL].SENS);
}
else
@@ -2333,13 +2342,14 @@ uint32_t s, ikdt, ikt, iks, ikd, ike, ipt;
else if(ipt == 3) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.001f;
else if(ipt == 4) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.0001f;
- if(pardata.amplif[ACTIVE_CHANNEL].SENS <= 0.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0001f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS < 0.0010f) { //поправил
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0010f;
}
- if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 100000.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 99999.0f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 10000.0f) {
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 9999.0f;
}
+
VerifyGain(pardata.amplif[ACTIVE_CHANNEL].SENS);
}
else
@@ -2357,13 +2367,14 @@ uint32_t s, ikdt, ikt, iks, ikd, ike, ipt;
else if(ipt == 3) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.001f;
else if(ipt == 4) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.0001f;
- if(pardata.amplif[ACTIVE_CHANNEL].SENS <= 0.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0001f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS < 0.0010f) { //поправил
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0010f;
}
- if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 100000.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 99999.0f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 10000.0f) {
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 9999.0f;
}
+
VerifyGain(pardata.amplif[ACTIVE_CHANNEL].SENS);
}
@@ -2496,13 +2507,14 @@ uint32_t s, ikdt, ikt, iks, ikd, ike, ipt;
else if(ipt == 3) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.001f;
else if(ipt == 4) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.0001f;
- if(pardata.amplif[ACTIVE_CHANNEL].SENS <= 0.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0001f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS < 0.0010f) { //поправил
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0010f;
}
- if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 100000.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 99999.0f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 10000.0f) {
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 9999.0f;
}
+
VerifyGain(pardata.amplif[ACTIVE_CHANNEL].SENS);
}
else
@@ -2544,13 +2556,14 @@ uint32_t s, ikdt, ikt, iks, ikd, ike, ipt;
else if(ipt == 3) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.001f;
else if(ipt == 4) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.0001f;
- if(pardata.amplif[ACTIVE_CHANNEL].SENS <= 0.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0001f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS < 0.0010f) { //поправил
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0010f;
}
- if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 100000.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 99999.0f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 10000.0f) {
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 9999.0f;
}
+
VerifyGain(pardata.amplif[ACTIVE_CHANNEL].SENS);
}
else
@@ -2568,13 +2581,14 @@ uint32_t s, ikdt, ikt, iks, ikd, ike, ipt;
else if(ipt == 3) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.001f;
else if(ipt == 4) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.0001f;
- if(pardata.amplif[ACTIVE_CHANNEL].SENS <= 0.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0001f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS < 0.0010f) { //поправил
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0010f;
}
- if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 100000.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 99999.0f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 10000.0f) {
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 9999.0f;
}
+
VerifyGain(pardata.amplif[ACTIVE_CHANNEL].SENS);
}
else
@@ -2592,13 +2606,14 @@ uint32_t s, ikdt, ikt, iks, ikd, ike, ipt;
else if(ipt == 3) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.001f;
else if(ipt == 4) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.0001f;
- if(pardata.amplif[ACTIVE_CHANNEL].SENS <= 0.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0001f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS < 0.0010f) { //поправил
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0010f;
}
- if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 100000.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 99999.0f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 10000.0f) {
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 9999.0f;
}
+
VerifyGain(pardata.amplif[ACTIVE_CHANNEL].SENS);
}
else
@@ -2616,11 +2631,11 @@ uint32_t s, ikdt, ikt, iks, ikd, ike, ipt;
else if(ipt == 3) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.001f;
else if(ipt == 4) pardata.amplif[ACTIVE_CHANNEL].SENS *= 0.0001f;
- if(pardata.amplif[ACTIVE_CHANNEL].SENS <= 0.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0001f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS < 0.0010f) { //поправил
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 0.0010f;
}
- if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 100000.0f) {
- pardata.amplif[ACTIVE_CHANNEL].SENS = 99999.0f;
+ if(pardata.amplif[ACTIVE_CHANNEL].SENS >= 10000.0f) {
+ pardata.amplif[ACTIVE_CHANNEL].SENS = 9999.0f;
}
VerifyGain(pardata.amplif[ACTIVE_CHANNEL].SENS);
diff --git a/Core/Src/screen.c b/Core/Src/screen.c
index a0ee205..fe9d64b 100644
--- a/Core/Src/screen.c
+++ b/Core/Src/screen.c
@@ -1973,7 +1973,7 @@ uint32_t Year, Month, Day, Hour, Min, Sec;
BSP_LCD_SetFont(&Font12);
LCD_SetColors(LCD_COLOR_GRAY, LCD_COLOR_BLACK);
- BSP_LCD_DisplayStringAt(160, 5, "Sensetivity", CENTER_MODE);
+ BSP_LCD_DisplayStringAt(160, 5, "Sensitivity", CENTER_MODE);
BSP_LCD_DisplayStringAt(240, 5, "Units", CENTER_MODE);
diff --git a/Debug/F203 VER 4.list b/Debug/F203 VER 4.list
index f410559..1221e56 100644
--- a/Debug/F203 VER 4.list
+++ b/Debug/F203 VER 4.list
@@ -5,17 +5,17 @@ Sections:
Idx Name Size VMA LMA File off Algn
0 .isr_vector 000001f8 08000000 08000000 00010000 2**0
CONTENTS, ALLOC, LOAD, READONLY, DATA
- 1 .text 000162a4 080001f8 080001f8 000101f8 2**2
+ 1 .text 0001631c 080001f8 080001f8 000101f8 2**2
CONTENTS, ALLOC, LOAD, READONLY, CODE
- 2 .rodata 00019808 0801649c 0801649c 0002649c 2**2
+ 2 .rodata 00019808 08016514 08016514 00026514 2**2
CONTENTS, ALLOC, LOAD, READONLY, DATA
- 3 .ARM 00000008 0802fca4 0802fca4 0003fca4 2**2
+ 3 .ARM 00000008 0802fd1c 0802fd1c 0003fd1c 2**2
CONTENTS, ALLOC, LOAD, READONLY, DATA
- 4 .init_array 00000004 0802fcac 0802fcac 0003fcac 2**2
+ 4 .init_array 00000004 0802fd24 0802fd24 0003fd24 2**2
CONTENTS, ALLOC, LOAD, DATA
- 5 .fini_array 00000004 0802fcb0 0802fcb0 0003fcb0 2**2
+ 5 .fini_array 00000004 0802fd28 0802fd28 0003fd28 2**2
CONTENTS, ALLOC, LOAD, DATA
- 6 .data 000009a8 20020000 0802fcb4 00040000 2**2
+ 6 .data 000009a8 20020000 0802fd2c 00040000 2**2
CONTENTS, ALLOC, LOAD, DATA
7 .dtcmram 00000000 20000000 20000000 000409a8 2**0
CONTENTS
@@ -35,13 +35,13 @@ Idx Name Size VMA LMA File off Algn
CONTENTS, READONLY, DEBUGGING
15 .debug_ranges 00001480 00000000 00000000 00076b90 2**3
CONTENTS, READONLY, DEBUGGING
- 16 .debug_line 0000ef6e 00000000 00000000 00078010 2**0
+ 16 .debug_line 0000ef70 00000000 00000000 00078010 2**0
CONTENTS, READONLY, DEBUGGING
- 17 .debug_str 00009231 00000000 00000000 00086f7e 2**0
+ 17 .debug_str 00009231 00000000 00000000 00086f80 2**0
CONTENTS, READONLY, DEBUGGING
- 18 .comment 0000007c 00000000 00000000 000901af 2**0
+ 18 .comment 0000007c 00000000 00000000 000901b1 2**0
CONTENTS, READONLY
- 19 .debug_frame 00005c8c 00000000 00000000 0009022c 2**2
+ 19 .debug_frame 00005c8c 00000000 00000000 00090230 2**2
CONTENTS, READONLY, DEBUGGING
Disassembly of section .text:
@@ -60,7 +60,7 @@ Disassembly of section .text:
800020e: bd10 pop {r4, pc}
8000210: 200209a8 .word 0x200209a8
8000214: 00000000 .word 0x00000000
- 8000218: 08016484 .word 0x08016484
+ 8000218: 080164fc .word 0x080164fc
0800021c :
800021c: b508 push {r3, lr}
@@ -72,7 +72,7 @@ Disassembly of section .text:
800022a: bd08 pop {r3, pc}
800022c: 00000000 .word 0x00000000
8000230: 200209ac .word 0x200209ac
- 8000234: 08016484 .word 0x08016484
+ 8000234: 080164fc .word 0x080164fc
08000238 :
8000238: 4603 mov r3, r0
@@ -376,12 +376,12 @@ void Off(void)
BSP_LCD_DisplayOff();
- 8000562: f004 fa83 bl 8004a6c
+ 8000562: f004 fabf bl 8004ae4
HAL_GPIO_WritePin(DISP_ON_GPIO_Port, DISP_ON_Pin, GPIO_PIN_SET); // BACKLIGHT_OFF
8000566: 2201 movs r2, #1
8000568: f44f 7180 mov.w r1, #256 ; 0x100
800056c: 480f ldr r0, [pc, #60] ; (80005ac )
- 800056e: f012 fb31 bl 8012bd4
+ 800056e: f012 fb6d bl 8012c4c
wrPar();
@@ -391,7 +391,7 @@ void Off(void)
8000576: bf00 nop
8000578: 2101 movs r1, #1
800057a: 480c ldr r0, [pc, #48] ; (80005ac )
- 800057c: f012 fb12 bl 8012ba4
+ 800057c: f012 fb4e bl 8012c1c
8000580: 4603 mov r3, r0
8000582: 2b01 cmp r3, #1
8000584: d0f8 beq.n 8000578
@@ -399,15 +399,15 @@ void Off(void)
8000586: 2200 movs r2, #0
8000588: f44f 7180 mov.w r1, #256 ; 0x100
800058c: 4808 ldr r0, [pc, #32] ; (80005b0 )
- 800058e: f012 fb21 bl 8012bd4
+ 800058e: f012 fb5d bl 8012c4c
HAL_GPIO_WritePin(ON1_GPIO_Port, ON1_Pin, GPIO_PIN_RESET);
8000592: 2200 movs r2, #0
8000594: 2120 movs r1, #32
8000596: 4806 ldr r0, [pc, #24] ; (80005b0 )
- 8000598: f012 fb1c bl 8012bd4
+ 8000598: f012 fb58 bl 8012c4c
HAL_Delay(300);
800059c: f44f 7096 mov.w r0, #300 ; 0x12c
- 80005a0: f010 ffec bl 801157c
+ 80005a0: f011 f828 bl 80115f4
while(1);
80005a4: e7fe b.n 80005a4
80005a6: bf00 nop
@@ -467,25 +467,25 @@ void MX_DMA2D_Init(void)
80005f2: 64da str r2, [r3, #76] ; 0x4c
if (HAL_DMA2D_Init(&hdma2d) != HAL_OK)
80005f4: 4809 ldr r0, [pc, #36] ; (800061c )
- 80005f6: f011 fb3f bl 8011c78
+ 80005f6: f011 fb7b bl 8011cf0
80005fa: 4603 mov r3, r0
80005fc: 2b00 cmp r3, #0
80005fe: d001 beq.n 8000604
{
Error_Handler();
- 8000600: f005 fbf4 bl 8005dec
+ 8000600: f005 fc30 bl 8005e64
}
if (HAL_DMA2D_ConfigLayer(&hdma2d, 1) != HAL_OK)
8000604: 2101 movs r1, #1
8000606: 4805 ldr r0, [pc, #20] ; (800061c )
- 8000608: f011 fca4 bl 8011f54
+ 8000608: f011 fce0 bl 8011fcc
800060c: 4603 mov r3, r0
800060e: 2b00 cmp r3, #0
8000610: d001 beq.n 8000616
{
Error_Handler();
- 8000612: f005 fbeb bl 8005dec
+ 8000612: f005 fc27 bl 8005e64
}
}
@@ -563,7 +563,7 @@ void initFlash(void)
8000680: 687b ldr r3, [r7, #4]
HAL_FLASHEx_OBGetConfig(&OBInit);
8000682: 4805 ldr r0, [pc, #20] ; (8000698 )
- 8000684: f011 ffc4 bl 8012610
+ 8000684: f012 f800 bl 8012688
rdPar();
8000688: f000 f852 bl 8000730
@@ -609,7 +609,7 @@ __STATIC_FORCEINLINE void __disable_irq(void)
__disable_irq();
HAL_FLASH_Unlock();
- 80006b0: f011 fde4 bl 801227c
+ 80006b0: f011 fe20 bl 80122f4
EraseInitStruct.TypeErase = FLASH_TYPEERASE_SECTORS;
80006b4: 4b1b ldr r3, [pc, #108] ; (8000724 )
80006b6: 2200 movs r2, #0
@@ -630,7 +630,7 @@ __STATIC_FORCEINLINE void __disable_irq(void)
80006cc: 1d3b adds r3, r7, #4
80006ce: 4619 mov r1, r3
80006d0: 4814 ldr r0, [pc, #80] ; (8000724 )
- 80006d2: f011 ff2d bl 8012530
+ 80006d2: f011 ff69 bl 80125a8
80006d6: 4603 mov r3, r0
80006d8: 2b00 cmp r3, #0
80006da: d11c bne.n 8000716
@@ -656,7 +656,7 @@ __STATIC_FORCEINLINE void __disable_irq(void)
80006f8: 461a mov r2, r3
80006fa: 4623 mov r3, r4
80006fc: 2002 movs r0, #2
- 80006fe: f011 fd61 bl 80121c4
+ 80006fe: f011 fd9d bl 801223c
Address += 4;
8000702: 68bb ldr r3, [r7, #8]
8000704: 3304 adds r3, #4
@@ -672,7 +672,7 @@ __STATIC_FORCEINLINE void __disable_irq(void)
}
}
HAL_FLASH_Lock();
- 8000716: f011 fdd3 bl 80122c0
+ 8000716: f011 fe0f bl 8012338
__ASM volatile ("cpsie i" : : : "memory");
800071a: b662 cpsie i
__enable_irq();
@@ -704,7 +704,7 @@ sfloat hpf;
800073a: 2208 movs r2, #8
800073c: 4913 ldr r1, [pc, #76] ; (800078c )
800073e: 4814 ldr r0, [pc, #80] ; (8000790 )
- 8000740: f015 fe84 bl 801644c
+ 8000740: f015 fec0 bl 80164c4
if(pardata.OWN != 18)
8000744: 4b13 ldr r3, [pc, #76] ; (8000794 )
@@ -864,28 +864,28 @@ GPIO_InitTypeDef GPIO_InitStruct;
800085e: 2201 movs r2, #1
8000860: 2138 movs r1, #56 ; 0x38
8000862: 4843 ldr r0, [pc, #268] ; (8000970 )
- 8000864: f012 f9b6 bl 8012bd4
+ 8000864: f012 f9f2 bl 8012c4c
HAL_GPIO_WritePin(ON_GPIO_Port, ON_Pin, GPIO_PIN_SET);
8000868: 2201 movs r2, #1
800086a: f44f 7180 mov.w r1, #256 ; 0x100
800086e: 4841 ldr r0, [pc, #260] ; (8000974 )
- 8000870: f012 f9b0 bl 8012bd4
+ 8000870: f012 f9ec bl 8012c4c
HAL_GPIO_WritePin(RESET_GPIO_Port, RESET_Pin, GPIO_PIN_SET);
8000874: 2201 movs r2, #1
8000876: 2140 movs r1, #64 ; 0x40
8000878: 483f ldr r0, [pc, #252] ; (8000978 )
- 800087a: f012 f9ab bl 8012bd4
+ 800087a: f012 f9e7 bl 8012c4c
HAL_GPIO_WritePin(DISP_ON_GPIO_Port, DISP_ON_Pin, GPIO_PIN_SET);
800087e: 2201 movs r2, #1
8000880: f44f 7180 mov.w r1, #256 ; 0x100
8000884: 483d ldr r0, [pc, #244] ; (800097c )
- 8000886: f012 f9a5 bl 8012bd4
+ 8000886: f012 f9e1 bl 8012c4c
HAL_GPIO_WritePin(RE_GPIO_Port, RE_Pin, GPIO_PIN_RESET);
800088a: 2200 movs r2, #0
800088c: f44f 7100 mov.w r1, #512 ; 0x200
8000890: 4838 ldr r0, [pc, #224] ; (8000974 )
- 8000892: f012 f99f bl 8012bd4
+ 8000892: f012 f9db bl 8012c4c
/*Configure GPIO pins : PEPin PEPin PEPin */
GPIO_InitStruct.Pin = U1_Pin|U2_Pin|U3_Pin;
@@ -904,7 +904,7 @@ GPIO_InitTypeDef GPIO_InitStruct;
80008a6: f107 0324 add.w r3, r7, #36 ; 0x24
80008aa: 4619 mov r1, r3
80008ac: 4830 ldr r0, [pc, #192] ; (8000970 )
- 80008ae: f011 ffcf bl 8012850
+ 80008ae: f012 f80b bl 80128c8
/*Configure GPIO pins : PAPin PAPin */
GPIO_InitStruct.Pin = K1_Pin;
@@ -923,7 +923,7 @@ GPIO_InitTypeDef GPIO_InitStruct;
80008c4: f107 0324 add.w r3, r7, #36 ; 0x24
80008c8: 4619 mov r1, r3
80008ca: 482c ldr r0, [pc, #176] ; (800097c )
- 80008cc: f011 ffc0 bl 8012850
+ 80008cc: f011 fffc bl 80128c8
/*Configure GPIO pin : PtPin */
GPIO_InitStruct.Pin = ON_Pin | ON1_Pin | RE_Pin;
@@ -942,7 +942,7 @@ GPIO_InitTypeDef GPIO_InitStruct;
80008e2: f107 0324 add.w r3, r7, #36 ; 0x24
80008e6: 4619 mov r1, r3
80008e8: 4822 ldr r0, [pc, #136] ; (8000974 )
- 80008ea: f011 ffb1 bl 8012850
+ 80008ea: f011 ffed bl 80128c8
GPIO_InitStruct.Pin = DISP_ON_Pin;
80008ee: f44f 7380 mov.w r3, #256 ; 0x100
@@ -960,7 +960,7 @@ GPIO_InitTypeDef GPIO_InitStruct;
8000900: f107 0324 add.w r3, r7, #36 ; 0x24
8000904: 4619 mov r1, r3
8000906: 481d ldr r0, [pc, #116] ; (800097c )
- 8000908: f011 ffa2 bl 8012850
+ 8000908: f011 ffde bl 80128c8
/*Configure GPIO pin : PtPin */
GPIO_InitStruct.Pin = OFF_Pin;
@@ -976,7 +976,7 @@ GPIO_InitTypeDef GPIO_InitStruct;
8000918: f107 0324 add.w r3, r7, #36 ; 0x24
800091c: 4619 mov r1, r3
800091e: 4817 ldr r0, [pc, #92] ; (800097c )
- 8000920: f011 ff96 bl 8012850
+ 8000920: f011 ffd2 bl 80128c8
/*Configure GPIO pin : PtPin */
@@ -996,7 +996,7 @@ GPIO_InitTypeDef GPIO_InitStruct;
8000934: f107 0324 add.w r3, r7, #36 ; 0x24
8000938: 4619 mov r1, r3
800093a: 480f ldr r0, [pc, #60] ; (8000978 )
- 800093c: f011 ff88 bl 8012850
+ 800093c: f011 ffc4 bl 80128c8
GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
HAL_GPIO_Init(RE_GPIO_Port, &GPIO_InitStruct);*/
@@ -1006,17 +1006,17 @@ GPIO_InitTypeDef GPIO_InitStruct;
8000940: 2201 movs r2, #1
8000942: f44f 7180 mov.w r1, #256 ; 0x100
8000946: 480b ldr r0, [pc, #44] ; (8000974 )
- 8000948: f012 f944 bl 8012bd4
+ 8000948: f012 f980 bl 8012c4c
HAL_GPIO_WritePin(ON1_GPIO_Port, ON1_Pin, GPIO_PIN_SET);
800094c: 2201 movs r2, #1
800094e: 2120 movs r1, #32
8000950: 4808 ldr r0, [pc, #32] ; (8000974 )
- 8000952: f012 f93f bl 8012bd4
+ 8000952: f012 f97b bl 8012c4c
HAL_GPIO_WritePin(DISP_ON_GPIO_Port, DISP_ON_Pin, GPIO_PIN_SET); // BACKLIGHT IS OFF
8000956: 2201 movs r2, #1
8000958: f44f 7180 mov.w r1, #256 ; 0x100
800095c: 4807 ldr r0, [pc, #28] ; (800097c )
- 800095e: f012 f939 bl 8012bd4
+ 800095e: f012 f975 bl 8012c4c
}
8000962: bf00 nop
8000964: 3738 adds r7, #56 ; 0x38
@@ -1047,17 +1047,17 @@ void initKeys(void)
800098a: 2201 movs r2, #1
800098c: 2108 movs r1, #8
800098e: 4808 ldr r0, [pc, #32] ; (80009b0 )
- 8000990: f012 f920 bl 8012bd4
+ 8000990: f012 f95c bl 8012c4c
HAL_GPIO_WritePin(U2_GPIO_Port, U2_Pin, GPIO_PIN_SET);
8000994: 2201 movs r2, #1
8000996: 2110 movs r1, #16
8000998: 4805 ldr r0, [pc, #20] ; (80009b0 )
- 800099a: f012 f91b bl 8012bd4
+ 800099a: f012 f957 bl 8012c4c
HAL_GPIO_WritePin(U3_GPIO_Port, U3_Pin, GPIO_PIN_SET);
800099e: 2201 movs r2, #1
80009a0: 2120 movs r1, #32
80009a2: 4803 ldr r0, [pc, #12] ; (80009b0 )
- 80009a4: f012 f916 bl 8012bd4
+ 80009a4: f012 f952 bl 8012c4c
}
80009a8: bf00 nop
80009aa: bd80 pop {r7, pc}
@@ -1091,7 +1091,7 @@ uint32_t key = 0;
if(HAL_GPIO_ReadPin(OFF_GPIO_Port, OFF_Pin) == GPIO_PIN_SET) {
80009d2: 2101 movs r1, #1
80009d4: 482f ldr r0, [pc, #188] ; (8000a94 )
- 80009d6: f012 f8e5 bl 8012ba4
+ 80009d6: f012 f921 bl 8012c1c
80009da: 4603 mov r3, r0
80009dc: 2b01 cmp r3, #1
80009de: d101 bne.n 80009e4
@@ -1103,27 +1103,27 @@ uint32_t key = 0;
80009e4: 2201 movs r2, #1
80009e6: 2108 movs r1, #8
80009e8: 482b ldr r0, [pc, #172] ; (8000a98 )
- 80009ea: f012 f8f3 bl 8012bd4
+ 80009ea: f012 f92f bl 8012c4c
HAL_GPIO_WritePin(U2_GPIO_Port, U2_Pin, GPIO_PIN_SET);
80009ee: 2201 movs r2, #1
80009f0: 2110 movs r1, #16
80009f2: 4829 ldr r0, [pc, #164] ; (8000a98 )
- 80009f4: f012 f8ee bl 8012bd4
+ 80009f4: f012 f92a bl 8012c4c
HAL_GPIO_WritePin(U3_GPIO_Port, U3_Pin, GPIO_PIN_SET);
80009f8: 2201 movs r2, #1
80009fa: 2120 movs r1, #32
80009fc: 4826 ldr r0, [pc, #152] ; (8000a98 )
- 80009fe: f012 f8e9 bl 8012bd4
+ 80009fe: f012 f925 bl 8012c4c
HAL_GPIO_WritePin(U1_GPIO_Port, U1_Pin, GPIO_PIN_RESET);
8000a02: 2200 movs r2, #0
8000a04: 2108 movs r1, #8
8000a06: 4824 ldr r0, [pc, #144] ; (8000a98 )
- 8000a08: f012 f8e4 bl 8012bd4
+ 8000a08: f012 f920 bl 8012c4c
if(HAL_GPIO_ReadPin(K1_GPIO_Port, K1_Pin) == GPIO_PIN_RESET) {
8000a0c: f44f 7100 mov.w r1, #512 ; 0x200
8000a10: 4820 ldr r0, [pc, #128] ; (8000a94 )
- 8000a12: f012 f8c7 bl 8012ba4
+ 8000a12: f012 f903 bl 8012c1c
8000a16: 4603 mov r3, r0
8000a18: 2b00 cmp r3, #0
8000a1a: d103 bne.n 8000a24
@@ -1136,17 +1136,17 @@ uint32_t key = 0;
8000a24: 2201 movs r2, #1
8000a26: 2108 movs r1, #8
8000a28: 481b ldr r0, [pc, #108] ; (8000a98 )
- 8000a2a: f012 f8d3 bl 8012bd4
+ 8000a2a: f012 f90f bl 8012c4c
HAL_GPIO_WritePin(U2_GPIO_Port, U2_Pin, GPIO_PIN_RESET);
8000a2e: 2200 movs r2, #0
8000a30: 2110 movs r1, #16
8000a32: 4819 ldr r0, [pc, #100] ; (8000a98 )
- 8000a34: f012 f8ce bl 8012bd4
+ 8000a34: f012 f90a bl 8012c4c
if(HAL_GPIO_ReadPin(K1_GPIO_Port, K1_Pin) == GPIO_PIN_RESET) {
8000a38: f44f 7100 mov.w r1, #512 ; 0x200
8000a3c: 4815 ldr r0, [pc, #84] ; (8000a94 )
- 8000a3e: f012 f8b1 bl 8012ba4
+ 8000a3e: f012 f8ed bl 8012c1c
8000a42: 4603 mov r3, r0
8000a44: 2b00 cmp r3, #0
8000a46: d103 bne.n 8000a50
@@ -1159,17 +1159,17 @@ uint32_t key = 0;
8000a50: 2201 movs r2, #1
8000a52: 2110 movs r1, #16
8000a54: 4810 ldr r0, [pc, #64] ; (8000a98 )
- 8000a56: f012 f8bd bl 8012bd4
+ 8000a56: f012 f8f9 bl 8012c4c
HAL_GPIO_WritePin(U3_GPIO_Port, U3_Pin, GPIO_PIN_RESET);
8000a5a: 2200 movs r2, #0
8000a5c: 2120 movs r1, #32
8000a5e: 480e ldr r0, [pc, #56] ; (8000a98 )
- 8000a60: f012 f8b8 bl 8012bd4
+ 8000a60: f012 f8f4 bl 8012c4c
if(HAL_GPIO_ReadPin(K1_GPIO_Port, K1_Pin) == GPIO_PIN_RESET) {
8000a64: f44f 7100 mov.w r1, #512 ; 0x200
8000a68: 480a ldr r0, [pc, #40] ; (8000a94 )
- 8000a6a: f012 f89b bl 8012ba4
+ 8000a6a: f012 f8d7 bl 8012c1c
8000a6e: 4603 mov r3, r0
8000a70: 2b00 cmp r3, #0
8000a72: d103 bne.n 8000a7c
@@ -1182,7 +1182,7 @@ uint32_t key = 0;
8000a7c: 2201 movs r2, #1
8000a7e: 2120 movs r1, #32
8000a80: 4805 ldr r0, [pc, #20] ; (8000a98 )
- 8000a82: f012 f8a7 bl 8012bd4
+ 8000a82: f012 f8e3 bl 8012c4c
return key;
8000a86: 687b ldr r3, [r7, #4]
@@ -1634,7 +1634,7 @@ uint16_t last_val, last_iin;
8000d90: f8a3 2072 strh.w r2, [r3, #114] ; 0x72
if(WriteChannel(Ch4))
8000d94: 2003 movs r0, #3
- 8000d96: f00f fb9d bl 80104d4
+ 8000d96: f00f fbd9 bl 801054c
8000d9a: 4603 mov r3, r0
8000d9c: 2b00 cmp r3, #0
8000d9e: f001 8264 beq.w 800226a
@@ -1732,7 +1732,7 @@ uint16_t last_val, last_iin;
8000e5a: f8a3 2052 strh.w r2, [r3, #82] ; 0x52
if(WriteChannel(Ch3))
8000e5e: 2002 movs r0, #2
- 8000e60: f00f fb38 bl 80104d4
+ 8000e60: f00f fb74 bl 801054c
8000e64: 4603 mov r3, r0
8000e66: 2b00 cmp r3, #0
8000e68: f001 81ff beq.w 800226a
@@ -1838,7 +1838,7 @@ uint16_t last_val, last_iin;
8000f32: 865a strh r2, [r3, #50] ; 0x32
if(WriteChannel(Ch2))
8000f34: 2001 movs r0, #1
- 8000f36: f00f facd bl 80104d4
+ 8000f36: f00f fb09 bl 801054c
8000f3a: 4603 mov r3, r0
8000f3c: 2b00 cmp r3, #0
8000f3e: f001 8194 beq.w 800226a
@@ -1936,7 +1936,7 @@ uint16_t last_val, last_iin;
8000fe2: 825a strh r2, [r3, #18]
if(WriteChannel(Ch1))
8000fe4: 2000 movs r0, #0
- 8000fe6: f00f fa75 bl 80104d4
+ 8000fe6: f00f fab1 bl 801054c
8000fea: 4603 mov r3, r0
8000fec: 2b00 cmp r3, #0
8000fee: f001 813c beq.w 800226a
@@ -2086,7 +2086,7 @@ uint16_t last_val, last_iin;
80010fc: 681b ldr r3, [r3, #0]
80010fe: b2db uxtb r3, r3
8001100: 4618 mov r0, r3
- 8001102: f00f f9e7 bl 80104d4
+ 8001102: f00f fa23 bl 801054c
8001106: 4603 mov r3, r0
8001108: 2b00 cmp r3, #0
800110a: f001 80ae beq.w 800226a
@@ -2225,7 +2225,7 @@ uint16_t last_val, last_iin;
800120c: 681b ldr r3, [r3, #0]
800120e: b2db uxtb r3, r3
8001210: 4618 mov r0, r3
- 8001212: f00f f95f bl 80104d4
+ 8001212: f00f f99b bl 801054c
8001216: 4603 mov r3, r0
8001218: 2b00 cmp r3, #0
800121a: f001 8026 beq.w 800226a
@@ -2357,7 +2357,7 @@ uint16_t last_val, last_iin;
8001304: 681b ldr r3, [r3, #0]
8001306: b2db uxtb r3, r3
8001308: 4618 mov r0, r3
- 800130a: f00f f8e3 bl 80104d4
+ 800130a: f00f f91f bl 801054c
800130e: 4603 mov r3, r0
8001310: 2b00 cmp r3, #0
8001312: f000 87aa beq.w 800226a
@@ -2495,7 +2495,7 @@ uint16_t last_val, last_iin;
8001412: 681b ldr r3, [r3, #0]
8001414: b2db uxtb r3, r3
8001416: 4618 mov r0, r3
- 8001418: f00f f85c bl 80104d4
+ 8001418: f00f f898 bl 801054c
800141c: 4603 mov r3, r0
800141e: 2b00 cmp r3, #0
8001420: f000 8723 beq.w 800226a
@@ -2861,7 +2861,7 @@ uint16_t last_val, last_iin;
80016ac: 825a strh r2, [r3, #18]
if(WriteChannel(Ch1))
80016ae: 2000 movs r0, #0
- 80016b0: f00e ff10 bl 80104d4
+ 80016b0: f00e ff4c bl 801054c
80016b4: 4603 mov r3, r0
80016b6: 2b00 cmp r3, #0
80016b8: f000 85d9 beq.w 800226e
@@ -2959,7 +2959,7 @@ uint16_t last_val, last_iin;
800175c: 865a strh r2, [r3, #50] ; 0x32
if(WriteChannel(Ch2))
800175e: 2001 movs r0, #1
- 8001760: f00e feb8 bl 80104d4
+ 8001760: f00e fef4 bl 801054c
8001764: 4603 mov r3, r0
8001766: 2b00 cmp r3, #0
8001768: f000 8581 beq.w 800226e
@@ -3057,7 +3057,7 @@ uint16_t last_val, last_iin;
8001820: f8a3 2052 strh.w r2, [r3, #82] ; 0x52
if(WriteChannel(Ch3))
8001824: 2002 movs r0, #2
- 8001826: f00e fe55 bl 80104d4
+ 8001826: f00e fe91 bl 801054c
800182a: 4603 mov r3, r0
800182c: 2b00 cmp r3, #0
800182e: f000 851e beq.w 800226e
@@ -3155,7 +3155,7 @@ uint16_t last_val, last_iin;
80018ea: f8a3 2072 strh.w r2, [r3, #114] ; 0x72
if(WriteChannel(Ch4))
80018ee: 2003 movs r0, #3
- 80018f0: f00e fdf0 bl 80104d4
+ 80018f0: f00e fe2c bl 801054c
80018f4: 4603 mov r3, r0
80018f6: 2b00 cmp r3, #0
80018f8: f000 84b9 beq.w 800226e
@@ -3233,7 +3233,7 @@ uint16_t last_val, last_iin;
800198e: 2203 movs r2, #3
8001990: 601a str r2, [r3, #0]
DoKeyDN();
- 8001992: f002 f859 bl 8003a48
+ 8001992: f002 f877 bl 8003a84
break;
8001996: f000 bc6a b.w 800226e
if(menu == MAIN)
@@ -3890,7 +3890,7 @@ uint16_t last_val, last_iin;
8001e00: 4619 mov r1, r3
8001e02: f44f 7302 mov.w r3, #520 ; 0x208
8001e06: 461a mov r2, r3
- 8001e08: f014 fb20 bl 801644c
+ 8001e08: f014 fb5c bl 80164c4
focused = true;
8001e0c: 4b22 ldr r3, [pc, #136] ; (8001e98 )
8001e0e: 2201 movs r2, #1
@@ -3942,7 +3942,7 @@ uint16_t last_val, last_iin;
8001e58: 701a strb r2, [r3, #0]
if(WriteChannelSens(Ch1))
8001e5a: 2000 movs r0, #0
- 8001e5c: f00e fe68 bl 8010b30
+ 8001e5c: f00e fea4 bl 8010ba8
8001e60: 4603 mov r3, r0
8001e62: 2b00 cmp r3, #0
8001e64: d009 beq.n 8001e7a
@@ -3953,12 +3953,12 @@ uint16_t last_val, last_iin;
8001e6c: 4619 mov r1, r3
8001e6e: f44f 7302 mov.w r3, #520 ; 0x208
8001e72: 461a mov r2, r3
- 8001e74: f014 faea bl 801644c
+ 8001e74: f014 fb26 bl 80164c4
if(menupos < Kpt_1)
8001e78: e1ce b.n 8002218
WriteChannel(Ch1);
8001e7a: 2000 movs r0, #0
- 8001e7c: f00e fb2a bl 80104d4
+ 8001e7c: f00e fb66 bl 801054c
if(menupos < Kpt_1)
8001e80: e1ca b.n 8002218
8001e82: bf00 nop
@@ -3983,7 +3983,7 @@ uint16_t last_val, last_iin;
8001eb4: 4619 mov r1, r3
8001eb6: f44f 7302 mov.w r3, #520 ; 0x208
8001eba: 461a mov r2, r3
- 8001ebc: f014 fac6 bl 801644c
+ 8001ebc: f014 fb02 bl 80164c4
focused = true;
8001ec0: 4ba5 ldr r3, [pc, #660] ; (8002158 )
8001ec2: 2201 movs r2, #1
@@ -4035,7 +4035,7 @@ uint16_t last_val, last_iin;
8001f0c: 701a strb r2, [r3, #0]
if(WriteChannelSens(Ch2))
8001f0e: 2001 movs r0, #1
- 8001f10: f00e fe0e bl 8010b30
+ 8001f10: f00e fe4a bl 8010ba8
8001f14: 4603 mov r3, r0
8001f16: 2b00 cmp r3, #0
8001f18: d009 beq.n 8001f2e
@@ -4046,12 +4046,12 @@ uint16_t last_val, last_iin;
8001f20: 4619 mov r1, r3
8001f22: f44f 7302 mov.w r3, #520 ; 0x208
8001f26: 461a mov r2, r3
- 8001f28: f014 fa90 bl 801644c
+ 8001f28: f014 facc bl 80164c4
if(menupos < Kpt_2)
8001f2c: e174 b.n 8002218
WriteChannel(Ch2);
8001f2e: 2001 movs r0, #1
- 8001f30: f00e fad0 bl 80104d4
+ 8001f30: f00e fb0c bl 801054c
if(menupos < Kpt_2)
8001f34: e170 b.n 8002218
if(menupos == Sens_3)
@@ -4067,7 +4067,7 @@ uint16_t last_val, last_iin;
8001f46: 4619 mov r1, r3
8001f48: f44f 7302 mov.w r3, #520 ; 0x208
8001f4c: 461a mov r2, r3
- 8001f4e: f014 fa7d bl 801644c
+ 8001f4e: f014 fab9 bl 80164c4
focused = true;
8001f52: 4b81 ldr r3, [pc, #516] ; (8002158 )
8001f54: 2201 movs r2, #1
@@ -4119,7 +4119,7 @@ uint16_t last_val, last_iin;
8001f9e: 701a strb r2, [r3, #0]
if(WriteChannelSens(Ch3))
8001fa0: 2002 movs r0, #2
- 8001fa2: f00e fdc5 bl 8010b30
+ 8001fa2: f00e fe01 bl 8010ba8
8001fa6: 4603 mov r3, r0
8001fa8: 2b00 cmp r3, #0
8001faa: d009 beq.n 8001fc0
@@ -4130,12 +4130,12 @@ uint16_t last_val, last_iin;
8001fb2: 4619 mov r1, r3
8001fb4: f44f 7302 mov.w r3, #520 ; 0x208
8001fb8: 461a mov r2, r3
- 8001fba: f014 fa47 bl 801644c
+ 8001fba: f014 fa83 bl 80164c4
if(menupos < Kpt_3)
8001fbe: e12b b.n 8002218
WriteChannel(Ch3);
8001fc0: 2002 movs r0, #2
- 8001fc2: f00e fa87 bl 80104d4
+ 8001fc2: f00e fac3 bl 801054c
if(menupos < Kpt_3)
8001fc6: e127 b.n 8002218
if(menupos == Sens_4)
@@ -4151,7 +4151,7 @@ uint16_t last_val, last_iin;
8001fd8: 4619 mov r1, r3
8001fda: f44f 7302 mov.w r3, #520 ; 0x208
8001fde: 461a mov r2, r3
- 8001fe0: f014 fa34 bl 801644c
+ 8001fe0: f014 fa70 bl 80164c4
focused = true;
8001fe4: 4b5c ldr r3, [pc, #368] ; (8002158 )
8001fe6: 2201 movs r2, #1
@@ -4203,7 +4203,7 @@ uint16_t last_val, last_iin;
8002034: 701a strb r2, [r3, #0]
if(WriteChannelSens(Ch4))
8002036: 2003 movs r0, #3
- 8002038: f00e fd7a bl 8010b30
+ 8002038: f00e fdb6 bl 8010ba8
800203c: 4603 mov r3, r0
800203e: 2b00 cmp r3, #0
8002040: d009 beq.n 8002056
@@ -4214,12 +4214,12 @@ uint16_t last_val, last_iin;
8002048: 4619 mov r1, r3
800204a: f44f 7302 mov.w r3, #520 ; 0x208
800204e: 461a mov r2, r3
- 8002050: f014 f9fc bl 801644c
+ 8002050: f014 fa38 bl 80164c4
break;
8002054: e10d b.n 8002272
WriteChannel(Ch4);
8002056: 2003 movs r0, #3
- 8002058: f00e fa3c bl 80104d4
+ 8002058: f00e fa78 bl 801054c
break;
800205c: e109 b.n 8002272
if(menu == MAIN)
@@ -4276,11 +4276,11 @@ uint16_t last_val, last_iin;
80020b4: b2db uxtb r3, r3
80020b6: 2101 movs r1, #1
80020b8: 4618 mov r0, r3
- 80020ba: f00e fe7d bl 8010db8
+ 80020ba: f00e feb9 bl 8010e30
break;
80020be: e0d8 b.n 8002272
CalibrOFF();
- 80020c0: f00f f8f4 bl 80112ac
+ 80020c0: f00f f930 bl 8011324
Off();
80020c4: f7fe fa48 bl 8000558
break;
@@ -4334,7 +4334,7 @@ uint16_t last_val, last_iin;
800211a: b2db uxtb r3, r3
800211c: 2101 movs r1, #1
800211e: 4618 mov r0, r3
- 8002120: f00e fe4a bl 8010db8
+ 8002120: f00e fe86 bl 8010e30
break;
8002124: e0a5 b.n 8002272
if(menupos == Set_1)
@@ -4354,7 +4354,7 @@ uint16_t last_val, last_iin;
800213e: b2db uxtb r3, r3
8002140: 2281 movs r2, #129 ; 0x81
8002142: 4619 mov r1, r3
- 8002144: f00e ff7a bl 801103c
+ 8002144: f00e ffb6 bl 80110b4
break;
8002148: e093 b.n 8002272
800214a: bf00 nop
@@ -4381,7 +4381,7 @@ uint16_t last_val, last_iin;
800217c: b2db uxtb r3, r3
800217e: 2201 movs r2, #1
8002180: 4619 mov r1, r3
- 8002182: f00e ff5b bl 801103c
+ 8002182: f00e ff97 bl 80110b4
break;
8002186: e074 b.n 8002272
if(menupos == Set_10)
@@ -4401,7 +4401,7 @@ uint16_t last_val, last_iin;
80021a0: b2db uxtb r3, r3
80021a2: 228a movs r2, #138 ; 0x8a
80021a4: 4619 mov r1, r3
- 80021a6: f00e ff49 bl 801103c
+ 80021a6: f00e ff85 bl 80110b4
break;
80021aa: e062 b.n 8002272
if(menupos == Set10)
@@ -4421,7 +4421,7 @@ uint16_t last_val, last_iin;
80021c4: b2db uxtb r3, r3
80021c6: 220a movs r2, #10
80021c8: 4619 mov r1, r3
- 80021ca: f00e ff37 bl 801103c
+ 80021ca: f00e ff73 bl 80110b4
break;
80021ce: e050 b.n 8002272
if(menupos == Set_100)
@@ -4441,7 +4441,7 @@ uint16_t last_val, last_iin;
80021e8: b2db uxtb r3, r3
80021ea: 22e4 movs r2, #228 ; 0xe4
80021ec: 4619 mov r1, r3
- 80021ee: f00e ff25 bl 801103c