Sources add inverted and exclude gyro

Author: elecpower

companion/src/datamodels/compounditemmodels.cpp

@@ -678,6 +678,11 @@ BacklightSourceItemModel::BacklightSourceItemModel(const GeneralSettings * const
   setId(IMID_BacklightSource);
   setUpdateMask(IMUE_SystemRefresh);
 
+  // Descending source direction: inverted (!) sources
+  addItems(SOURCE_TYPE_SWITCH, -board->getCapability(Board::Switches));
+  addItems(SOURCE_TYPE_INPUT,  -board->getCapability(Board::Inputs), -board->getCapability(Board::Sticks));
+
+  // Ascending source direction (including zero)
   addItems(SOURCE_TYPE_NONE,   1);
   addItems(SOURCE_TYPE_INPUT,  board->getCapability(Board::Inputs), board->getCapability(Board::Sticks));
   addItems(SOURCE_TYPE_SWITCH, board->getCapability(Board::Switches));
@@ -686,14 +691,17 @@ BacklightSourceItemModel::BacklightSourceItemModel(const GeneralSettings * const
 void BacklightSourceItemModel::setDynamicItemData(QStandardItem * item, const RawSource & src) const
 {
   item->setText(src.toString(modelData, generalSettings, boardType));
-  item->setData(src.isAvailable(modelData, generalSettings, boardType), IMDR_Available);
+  item->setData(src.isAvailable(modelData, generalSettings, boardType, RawSource::AVAILABLE_BACKLIGHTSRC), IMDR_Available);
 }
 
 void BacklightSourceItemModel::addItems(const RawSourceType & type, int count, const int start)
 {
   const int idxAdj = (type == SOURCE_TYPE_NONE ? -1 : 0);
 
-  for (int i = 1 + start; i <= count; ++i) {
+  int first = start + count < 0 ? start + count : start + 1;
+  int last = start + count < 0 ? start : start + count + 1;
+
+  for (int i = first; i < last; ++i) {
     const RawSource src = RawSource(type, i + idxAdj);
     QStandardItem * modelItem = new QStandardItem();
     modelItem->setData(src.toValue(), IMDR_Id);

companion/src/firmwares/boardjson.cpp

@@ -752,6 +752,11 @@ bool BoardJson::isInputFlex(const InputDefn & defn)
   return defn.type == Board::AIT_FLEX;
 }
 
+const bool BoardJson::isInputFlexGyroAxis(int index) const
+{
+  return (index >=0 && index < (int)m_inputs->size()) ? isInputFlexGyroAxis(m_inputs->at(index)) : false;
+}
+
 // static
 bool BoardJson::isInputFlexGyroAxis(const InputDefn & defn)
 {
@@ -761,6 +766,11 @@ bool BoardJson::isInputFlexGyroAxis(const InputDefn & defn)
           val[0] == 'T' && val[1] == 'I'  && val[2] == 'L' && val[3] == 'T' && val[4] == '_' && (val[5] == 'X' || val[5] == 'Y'));
 }
 
+const bool BoardJson::isInputFlexJoystickAxis(int index) const
+{
+  return (index >=0 && index < (int)m_inputs->size()) ? isInputFlexJoystickAxis(m_inputs->at(index)) : false;
+}
+
 // static
 bool BoardJson::isInputFlexJoystickAxis(const InputDefn & defn)
 {

companion/src/firmwares/boardjson.h

@@ -130,6 +130,8 @@ class BoardJson
     const bool isInputCalibrated(int index) const;
     const bool isInputConfigurable(int index) const;
     const bool isInputIgnored(int index) const;
+    const bool isInputFlexGyroAxis(int index) const;
+    const bool isInputFlexJoystickAxis(int index) const;
     const bool isInputFlexPot(int index) const;
     const bool isInputFlexSwitch(int index) const;
     const bool isInputStick(int index) const;

companion/src/firmwares/boards.cpp

@@ -1159,6 +1159,11 @@ bool Boards::isInputConfigurable(int index, Board::Type board)
   return getBoardJson(board)->isInputConfigurable(index);
 }
 
+bool Boards::isInputGyroAxis(int index, Board::Type board)
+{
+  return getBoardJson(board)->isInputFlexGyroAxis(index);
+}
+
 bool Boards::isInputIgnored(int index, Board::Type board)
 {
   return getBoardJson(board)->isInputIgnored(index);

companion/src/firmwares/boards.h

@@ -454,6 +454,7 @@ class Boards
     static bool isInputAvailable(int index, Board::Type board = Board::BOARD_UNKNOWN);
     static bool isInputCalibrated(int index, Board::Type board = Board::BOARD_UNKNOWN);
     static bool isInputConfigurable(int index, Board::Type board = Board::BOARD_UNKNOWN);
+    static bool isInputGyroAxis(int index, Board::Type board = Board::BOARD_UNKNOWN);
     static bool isInputIgnored(int index, Board::Type board = Board::BOARD_UNKNOWN);
     static bool isInputPot(int index, Board::Type board = Board::BOARD_UNKNOWN);
     static bool isInputStick(int index, Board::Type board = Board::BOARD_UNKNOWN);

companion/src/firmwares/rawsource.cpp

@@ -280,7 +280,10 @@ bool RawSource::isStick(Board::Type board) const
   return false;
 }
 
-bool RawSource::isAvailable(const ModelData * const model, const GeneralSettings * const gs, Board::Type board) const
+bool RawSource::isAvailable(const ModelData * const model,
+                            const GeneralSettings * const gs,
+                            Board::Type board,
+                            const int flags) const
 {
   if (type == SOURCE_TYPE_NONE && index == 0)
     return true;
@@ -392,6 +395,10 @@ bool RawSource::isAvailable(const ModelData * const model, const GeneralSettings
         gs->serialPort[GeneralSettings::SP_AUX2] == GeneralSettings::AUX_SERIAL_SPACEMOUSE))))
     return false;
 
+  if (type == SOURCE_TYPE_INPUT && (flags & AVAILABLE_BACKLIGHTSRC) &&
+      Boards::isInputGyroAxis(abs(index) - 1, board))
+    return false;
+
   return true;
 }
 

companion/src/firmwares/rawsource.h

@@ -248,6 +248,12 @@ class RawSource {
       AllSourceGroups   = InputSourceGroups | GVarsGroup | TelemGroup | ScriptsGroup
     };
 
+    // flags to refine isAvailable
+    enum AvailableFlags {
+      AVAILABLE_ALL,
+      AVAILABLE_BACKLIGHTSRC = 0x001
+    };
+
     RawSource() { clear(); }
 
     explicit RawSource(int value):
@@ -272,7 +278,10 @@ class RawSource {
     RawSourceRange getRange(const ModelData * model, const GeneralSettings & settings, unsigned int flags=0) const;
     bool isStick(Board::Type board = Board::BOARD_UNKNOWN) const;
     bool isTimeBased(Board::Type board = Board::BOARD_UNKNOWN) const;
-    bool isAvailable(const ModelData * const model = nullptr, const GeneralSettings * const gs = nullptr, Board::Type board = Board::BOARD_UNKNOWN) const;
+    bool isAvailable(const ModelData * const model = nullptr,
+                     const GeneralSettings * const gs = nullptr,
+                     Board::Type board = Board::BOARD_UNKNOWN,
+                     const int flags = 0) const;
     bool isSet() const { return type != SOURCE_TYPE_NONE || index != 0; }
     void clear() { type = SOURCE_TYPE_NONE; index = 0; }
     static StringTagMappingTable getSpecialTypesLookupTable();

radio/src/datastructs_private.h

@@ -1118,7 +1118,7 @@ PACK(struct RadioData {
 
 #if defined(COLORLCD)
   NOBACKUP(uint8_t spare:3 SKIP);
-#elif LCD_W == 123
+#elif LCD_W == 128
   uint8_t invertLCD:1;          // Invert B&W LCD display
 #else
   NOBACKUP(uint8_t spare:1 SKIP);

radio/src/storage/yaml/yaml_datastructs_128x64.cpp

@@ -367,6 +367,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "rotEncMode", 3 ),
   YAML_SIGNED( "uartSampleMode", 2 ),
   YAML_PADDING( 3 ),
+  YAML_SIGNED_CUST( "backlightSrc", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
   YAML_UNSIGNED( "radioGFDisabled", 1 ),
   YAML_UNSIGNED( "radioTrainerDisabled", 1 ),
   YAML_UNSIGNED( "modelHeliDisabled", 1 ),
@@ -381,7 +382,6 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
   YAML_UNSIGNED( "modelQuickSelect", 1 ),
   YAML_UNSIGNED( "invertLCD", 1 ),
-  YAML_PADDING( 2 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
   YAML_END
 };

radio/src/storage/yaml/yaml_datastructs_f16.cpp

@@ -388,6 +388,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_SIGNED( "imuMax", 8 ),
   YAML_SIGNED( "imuOffset", 8 ),
   YAML_STRING("selectedTheme", 26),
+  YAML_SIGNED_CUST( "backlightSrc", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
   YAML_UNSIGNED( "labelSingleSelect", 1 ),
   YAML_UNSIGNED( "labelMultiMode", 1 ),
   YAML_UNSIGNED( "favMultiMode", 1 ),
@@ -406,7 +407,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
   YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
   YAML_UNSIGNED( "modelQuickSelect", 1 ),
-  YAML_PADDING( 5 ),
+  YAML_PADDING( 3 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
   YAML_END
 };