Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-13 03:19:53 +03:00
Code Issues Wiki Activity

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

Browse source
This commit is contained in:
3djc 2021-04-04 15:10:50 +02:00
commit ba887720bf
3 changed files with 402 additions and 321 deletions
Download patch file Download diff file Expand all files Collapse all files

36
CREDITS.txt
View file

@ -2185,3 +2185,39 @@ Antoine Soulie
Tjeerd Jager Tjeerd Jager
Bertold Van den Bergh Bertold Van den Bergh
Stefanie Zerbe Stefanie Zerbe
James Mandelbaum
Javier J. Cordovez
Jess Barkley
Schneider Modell
Michael Hasselgaard
Thomas Young
Непочатов Алексей
Thomas Goebel
Joseph Macias
Paw Melin-Nielsen
Liam O'Brien
Ronald B Backman
Corvus Inspection Services Inc
Stuart Posnett
Clark Emerick
Helmut Sippel
Jhon Lennon Silva do Nascimento
Peter McCarthy
Bob Brown
Claude Lawyer
Peter Fithern
Michael Hoffman
Tim Smith
OpenSki Institute
Simon Melov
Richard Podolsky
James Wilson
John Norrbin
James Goins
Phillip Nguyen
Jeffrey M Engel
Richard Marotto
Greg Bell
Scott Geer
Thomas Abshier

685
companion/src/translations/companion_fr.ts
View file

File diff suppressed because it is too large Load diff

2
radio/src/targets/horus/board.h
View file

@ -378,7 +378,7 @@ enum Analogs {
SLIDER_LAST = SLIDER_FIRST + NUM_SLIDERS - 1, SLIDER_LAST = SLIDER_FIRST + NUM_SLIDERS - 1,
TX_VOLTAGE, TX_VOLTAGE,
#if defined(PCBX12S) #if defined(PCBX12S)
MOUSE1, // TODO why after voltage? MOUSE1, // after voltage because previous ones come from SPI on X12S
MOUSE2, MOUSE2,
#endif #endif
NUM_ANALOGS NUM_ANALOGS