Merge pull request #2297 from opentx/bsongis/dangerous_module_functions

Dangerous module functions fix
2015-06-28 20:53:16 +02:00
parent cc9b222175 0c17833ab7
commit dab2267e10
1 changed files with 17 additions and 1 deletions
@@ -371,7 +371,7 @@ void evalFunctions()
          }
 #endif

-#if 0 //defined(DANGEROUS_MODULE_FUNCTIONS)
+#if defined(DANGEROUS_MODULE_FUNCTIONS)
          case FUNC_RANGECHECK:
          case FUNC_BIND:
          case FUNC_MODULE_OFF:
@@ -568,6 +568,22 @@ void evalFunctions()
      }
      else {
        functionsContext.lastFunctionTime[i] = 0;
+#if defined(DANGEROUS_MODULE_FUNCTIONS)
+        if (functionsContext.activeSwitches & switch_mask)) {
+          switch (CFN_FUNC(cfn)) {
+            case FUNC_RANGECHECK:
+            case FUNC_BIND:
+            case FUNC_MODULE_OFF:
+            {
+              unsigned int moduleIndex = CFN_PARAM(cfn);
+              if (moduleIndex < NUM_MODULES) {
+                moduleFlag[moduleIndex] = 0;
+              }
+              break;
+            }
+          }
+        }
+#endif
      }
    }
  }