Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/iNavFlight/inav-configurator.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPawel Spychalski (DzikuVx) <pspychalski@gmail.com>2019-04-01 20:05:03 +0300
committerPawel Spychalski (DzikuVx) <pspychalski@gmail.com>2019-04-01 20:05:03 +0300
commitcddbbc19fb7309ea6e361b1114157e2b5d98bf1a (patch)
treee7f7a0d178cba38a83b09c79296f56debbceed89
parent233f3c560e5936d3267711daa5c92c92afed3574 (diff)
catchup FC changes
-rw-r--r--js/fc.js32
-rw-r--r--src/css/logic.css1
2 files changed, 32 insertions, 1 deletions
diff --git a/js/fc.js b/js/fc.js
index ee6cd1f8..f65a9c7c 100644
--- a/js/fc.js
+++ b/js/fc.js
@@ -1163,6 +1163,30 @@ var FC = {
6: {
name: "High",
hasOperand: [true, false]
+ },
+ 7: {
+ name: "AND",
+ hasOperand: [true, true]
+ },
+ 8: {
+ name: "OR",
+ hasOperand: [true, true]
+ },
+ 9: {
+ name: "XOR",
+ hasOperand: [true, true]
+ },
+ 10: {
+ name: "NAND",
+ hasOperand: [true, true]
+ },
+ 11: {
+ name: "NOR",
+ hasOperand: [true, true]
+ },
+ 12: {
+ name: "NOT",
+ hasOperand: [true, false]
}
}
},
@@ -1205,7 +1229,13 @@ var FC = {
15: "Roll [deg]",
16: "Pitch [deg]"
}
- }
+ },
+ 3: {
+ name: "Logic Condition",
+ type: "range",
+ range: [0, 15],
+ default: 0
+ },
}
}
};
diff --git a/src/css/logic.css b/src/css/logic.css
index d6a9eec9..4f4683e5 100644
--- a/src/css/logic.css
+++ b/src/css/logic.css
@@ -19,6 +19,7 @@
border-radius: 2px;
z-index: 2001;
padding: 2em;
+ overflow-y: auto;
}
input.logic_element__operand--value {