Fixed support for Radiomaster TX12 additional switches (SI and SJ)

[piotrva]

Two connectors are present on TX12 main board (near top of internal TX module) and are mapped as SI (2) and SJ (1), but were not read out by the firmware.

With this update they might be used for some further hacking of the radio (ex. adding additional 2-pos switches, adding detector of external module insertion etc.).

Resubmitted PR #1302

Summary of changes:

• Add readout of SI and SJ switches in switchState

[pfeerick]

Are the SI/SJ connectors two or three pin (thus two or three position?). I'm assuming two pin, since you defined them as a 2POS, and thus this is needed also to limit them as 2POS max (otherwise 3POS will appear as an option also).

diff --git a/radio/src/gui/common/stdlcd/radio_hardware.cpp b/radio/src/gui/common/stdlcd/radio_hardware.cpp
index 67de15c46..339052c65 100644
--- a/radio/src/gui/common/stdlcd/radio_hardware.cpp
+++ b/radio/src/gui/common/stdlcd/radio_hardware.cpp
@@ -210,7 +210,8 @@ enum {
 #elif defined(RADIO_ZORRO)
   #define SWITCH_TYPE_MAX(sw)            ((MIXSRC_SB - MIXSRC_FIRST_SWITCH == sw || MIXSRC_SC - MIXSRC_FIRST_SWITCH == sw) ? SWITCH_3POS : SWITCH_2POS)
 #elif defined(RADIO_TX12) || defined(RADIO_T8)
-  #define SWITCH_TYPE_MAX(sw)            ((MIXSRC_SA - MIXSRC_FIRST_SWITCH == sw || MIXSRC_SD - MIXSRC_FIRST_SWITCH == sw) ? SWITCH_2POS : SWITCH_3POS)
+  #define SWITCH_TYPE_MAX(sw)            ((MIXSRC_SA - MIXSRC_FIRST_SWITCH == sw || MIXSRC_SD - MIXSRC_FIRST_SWITCH == sw || \
+                                           MIXSRC_SI - MIXSRC_FIRST_SWITCH == sw || MIXSRC_SJ - MIXSRC_FIRST_SWITCH) ? SWITCH_2POS : SWITCH_3POS)
 #elif defined(RADIO_T12)
   #define SWITCH_TYPE_MAX(sw)            ((MIXSRC_SG - MIXSRC_FIRST_SWITCH == sw || MIXSRC_SH - MIXSRC_FIRST_SWITCH == sw) ? SWITCH_2POS : SWITCH_3POS)
 #else

[rotorman]

@piotrva would it be possible for you to edit the first post above and add an image showing the SI & SJ connectors on the TX12 mainboard (ideally circle or arrow them with a short button wiring info) in case further users wish to follow your path, test this PR and also for documentation purposes. Thanks!

[pfeerick]

Ok, so it looks like they are these two connectors, making them 2POS, but I don't know which is which, and I don't feel like pulling mine apart tonight. 😆

[piotrva]

Also noticed - in keys debug screen they display as SG and SH...
Despite being identified in other places as SI and SJ

[piotrva]

So debug screen naming is corrected now - I think I check operation of additional switches across whole firmware and everything LGTM for this small update.

[pfeerick]

I've just added a commit fixing some other issues in the diags screen on the TX12 (which are not due to your changes) since I noticed the alignment for the switches was slightly out and the rotary encoder info was overlapping the TELE button.

I've since tried this out on my TX12, and it is working perfectly - can see SI and SJ and can see them being toggled when I short out the indicated connectors. Tried them on some mixer lines and they seemed to be working fine there also.