Merge branch '2.3' into 3djc/2.3-synced

This commit is contained in:
3djc
2021-04-04 15:10:50 +02:00
3 changed files with 402 additions and 321 deletions
+1 -1
View File
@@ -378,7 +378,7 @@ enum Analogs {
SLIDER_LAST = SLIDER_FIRST + NUM_SLIDERS - 1,
TX_VOLTAGE,
#if defined(PCBX12S)
MOUSE1, // TODO why after voltage?
MOUSE1, // after voltage because previous ones come from SPI on X12S
MOUSE2,
#endif
NUM_ANALOGS