Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jumper T20 #3726

Merged
merged 12 commits into from
Jul 7, 2023
Merged

Jumper T20 #3726

merged 12 commits into from
Jul 7, 2023

Conversation

3djc
Copy link
Collaborator

@3djc 3djc commented Jun 28, 2023

This brings support for Jumper T20

6 function switches
6 pot/sliders
10 switches
8 trim channels

This radio does not feature an SD Card reader, but uses a sd chip (not card) on motherboard itself (no more crap, fake sd)

T20英文详情页切片_01

@pfeerick pfeerick added this to the 2.10 milestone Jun 30, 2023
@pfeerick
Copy link
Member

pfeerick commented Jul 2, 2023

Can I get a translation for the following please... nice simple one this time. 😃 It is literally just that phrase - the TPro and T20 have the concept of "function switches" rather than the traditional 6POS switch.

edit: Last minute change... we're going to call them "Customizable switches" instead to better reflect what they are.

#define TR_FUNCTION_SWITCHES "Customizable switches"
#define TR_MENU_FSWITCH "CUSTOMIZABLE SWITCHES"
#define TR_FS_BTN BUTTON(TR("Custom sw", "Customizable switches"))

@Pat6874
Copy link
Contributor

Pat6874 commented Jul 2, 2023 via email

@HThuren
Copy link
Contributor

HThuren commented Jul 2, 2023

DA
#define TR_FUNCTION_SWITCHES "Funktion kontakter"

@3djc
Copy link
Collaborator Author

3djc commented Jul 2, 2023

@pfeerick beware that similar string with different twist (casing and BTN) exist and where untranslated before : TR_MENU_FSWITCH and TR_FS_BTN

@pfeerick
Copy link
Member

pfeerick commented Jul 2, 2023

@Pat6874 @HThuren Sorry, there was a last minute change, it's now going to be "Customizable switches", so please see the changes to #3726 (comment)

@Eldenroot
Copy link
Contributor

CZ:

#define TR_FUNCTION_SWITCHES "Nastavitelné přepínače"
#define TR_MENU_FSWITCH "NASTAVITELNÉ PŘEPÍNAČE"
#define TR_FS_BTN BUTTON(TR("Vlastní Sw", "Nastavitelné přepínače"))

@Pat6874
Copy link
Contributor

Pat6874 commented Jul 2, 2023 via email

@offer-shmuely
Copy link
Contributor

HE
#define TR_FUNCTION_SWITCHES "מפסקי פונקציות"

@HThuren
Copy link
Contributor

HThuren commented Jul 2, 2023

DA (all together)
#define TR_FUNCTION_SWITCHES "Funktion kontakter"
#define TR_MENU_FSWITCH "Tilpassede kontakter"
#define TR_FS_BTN BUTTON(TR("Tilpas. kon.", TR_MENU_FSWITCH))

ok ?

@ParkerEde
Copy link
Contributor

DE
#define TR_FUNCTION_SWITCHES "Anpassbare Schalter"
#define TR_MENU_FSWITCH "Anpassbare Schalter"
#define TR_FS_BTN BUTTON(TR("AnpSchalt", "Anpassbare Schalter"))

@zyren
Copy link
Contributor

zyren commented Jul 3, 2023

CN

#define TR_FUNCTION_SWITCHES    "可自定义开关"
#define TR_MENU_FSWITCH         "可自定义开关"
#define TR_FS_BTN BUTTON        (TR("自定义开关", "可自定义开关"))

TW

#define TR_FUNCTION_SWITCHES    "可自定義開關"
#define TR_MENU_FSWITCH         "可自定義開關"
#define TR_FS_BTN BUTTON        (TR("自定義開關", "可自定義開關"))

@pfeerick
Copy link
Member

pfeerick commented Jul 3, 2023

@HThuren This was the edit I mentioned earlier ;)

edit: Last minute change... we're going to call them "Customizable switches" instead to better reflect what they are.

@offer-shmuely
Copy link
Contributor

HE
#define TR_FUNCTION_SWITCHES "מפסקים בהתאמה אישית"

@ajjjjjjjj
Copy link
Contributor

PL

#define TR_FUNCTION_SWITCHES "Ustawiane przełączniki"
#define TR_MENU_FSWITCH "USTAWIANE PRZEŁĄCZNIKI"
#define TR_FS_BTN BUTTON(TR("Ust. łącz.", "Ustawiane przełączniki"))

@pfeerick
Copy link
Member

pfeerick commented Jul 4, 2023

@offer-shmuely Can I also get a more abbreviated form for "Custom sw"

@ulfhedlund Does this work for SE? (from "Custom sw", "Customizable switches")

#define TR_FS_BTN                       BUTTON(TR("Anpassad sw", "Anpassningsbara brytare"))

@HThuren What about this for DA? (from "Custom sw", "Customizable switches")

#define TR_FS_BTN                       BUTTON(TR("Tilpasset sw", "Kontakter der kan tilpasses"))

@robustini
Copy link
Contributor

IT
#define TR_FUNCTION_SWITCHES "Interruttori personalizzabili"
#define TR_MENU_FSWITCH "INTERRUTTORI PERSONALIZZABILI"
#define TR_FS_BTN BUTTON(TR("Int. pers.", "Interruttori personalizzabili"))

@zandorsp
Copy link
Contributor

zandorsp commented Jul 4, 2023

PT

#define TR_FUNCTION_SWITCHES "Botão customizável"
#define TR_MENU_FSWITCH "BOTÃO CUSTOMIZÁVEL"
#define TR_FS_BTN BUTTON(TR("Bt Custom", "Botão customizável"))

@ulfhedlund
Copy link
Contributor

SE
#define TR_FUNCTION_SWITCHES "Anpassningsbara brytare"
#define TR_MENU_FSWITCH "ANPASSNINGSBARA BRYTARE"
#define TR_FS_BTN BUTTON(TR("Anp. bryt.", "Anpassningsbara brytare"))

Too long?

@pfeerick
Copy link
Member

pfeerick commented Jul 6, 2023

@ulfhedlund Shorter than what I had, so hopefully short enough ;)

@zandorsp Do you mind being pinged for Portuguese translations in the future?

@HThuren
Copy link
Contributor

HThuren commented Jul 6, 2023

@ulfhedlund Shorter than what I had, so hopefully short enough ;)

10 or 11 char for the short / BW form ?

@pfeerick
Copy link
Member

pfeerick commented Jul 6, 2023

It gets shown here

image

so probably 10 for no clipping, 11 will possibly push the trailing ] offscreen depending on the letters used.

@zandorsp
Copy link
Contributor

zandorsp commented Jul 6, 2023

@zandorsp Do you mind being pinged for Portuguese translations in the future?

No... You can add me

@pfeerick pfeerick merged commit 7f669f1 into main Jul 7, 2023
@pfeerick pfeerick deleted the 3djc/Jumper-T20 branch July 7, 2023 00:44
@ToshihiroMakuuchi
Copy link
Contributor

JP
#define TR_FUNCTION_SWITCHES "スイッチ カスタマイズ"
#define TR_MENU_FSWITCH "スイッチ カスタマイズ"
#define TR_FS_BTN BUTTON(TR("Custom sw", "スイッチ カスタマイズ"))

ulfhedlund added a commit to ulfhedlund/edgetx that referenced this pull request Jul 8, 2023
ulfhedlund added a commit to ulfhedlund/edgetx that referenced this pull request Jul 8, 2023
@derFrickler
Copy link

is there already a Companion build that supports the T20?

@3djc
Copy link
Collaborator Author

3djc commented Jul 29, 2023

Not yet

@derFrickler
Copy link

Hi, i tried to connect my old 4in1 Multimodule to the external Port of the T20. I am able to bind and stear models, but i do not get any feedback (telemetry, module version etc..) from the module.

Am i doing something wrong or is this an issue with the T20/EdgeTX? Normally i only need one pin/cable to the module for TX and TX right?

@pfeerick
Copy link
Member

pfeerick commented Aug 3, 2023

You should only need the one five-pin cable, yes. I've just tried with my T20, and RM 4IN1 module, and it worked fine. What make/model is your MPM?

@derFrickler
Copy link

Thanks, for the fast answer!
Well, my goal is to have a spare internal 4in1 from the T-Lite inside the T20.
I tested with that module and my fullsize Jumper 4in1.
Guess i found the problem now, i was assuming that RX and TX go over one Cable as on the ELRS modules, but the 4in1 seems to use a separate wire for the telemetry.....makes sense as the T-Lite board has two solder pads....

do you have the pinout of the five-pin cable on hand? cant find it anywhere...

@pfeerick
Copy link
Member

pfeerick commented Aug 3, 2023

I don't know what it connects to internally, but it is literally a 1 to 1 mapping for the rightmost five pins (leftmost if looking at the module from the back) of the nano module bay... IIRC it's the same as the TPro nano module adapter (not the T-Lite).

The only pinouts I've come across for the nano bay so far are these (I did have one more at one point, for the two UART pins used by ACCESS modules, but neglected to keep that filed away properly)... but in the case of the external MPM, it needs both the top (PPM) and bottom (SPort) pins for normal JR micro bay (and obviously two more for power).

Pasted image 20230323160033
Pasted image 20230323160043

@pfeerick
Copy link
Member

pfeerick commented Aug 3, 2023

A quick continuity check of the BetaFPV JR micro adapter suggests (when at the module bay)

1 2 3 4 5 6 7 8
--- --- --- PPM HB VBAT GND SPort

@derFrickler
Copy link

YES, got it working!
I a was confused as the "top" PPM Pin is the TX to the multimodule and the "bottom" CRFS S-Port is the RX from the multimodule. I will do some pics when putting everything together. Shall i post them here or in a different "Ticked"

@pfeerick
Copy link
Member

pfeerick commented Aug 3, 2023

Excellent. Maybe throw it up on the discussions area under "Show and Tell" ?
https://github.com/EdgeTX/edgetx/discussions/categories/show-and-tell

@derFrickler
Copy link

As its more related to the Jumper T20, i think it does not fit in the EdgeTX dev.
I posted some pics in the T20 Thread on rcgroups:
https://www.rcgroups.com/forums/showpost.php?p=51314271&postcount=30

@derFrickler
Copy link

Is there a way to use the 6-pos Switch on the T20 to set one channel to 6 different positions?
I saw that there is a 6P Input source on the Jumper T18 that does that, but i can't find it on the T20.

@3djc
Copy link
Collaborator Author

3djc commented Aug 11, 2023

There is no 6pos on t20, those are 6 distinct switches, that you can group to your liking. You can achieve what you want using mixer line with 6 entries for example

@derFrickler
Copy link

Thanks, did that.

pfeerick pushed a commit that referenced this pull request Aug 16, 2023
* Translation for PR #1425

* Minor update

* Updates - including theme text translations

* Update se.h

* Proper translations for CZ,DA,DE,FR,HE,IT,JP,PL

Added translations from translators for 8 languages

* Updated translations for new PRs

Updates for new commits c805940, 2b100e0, a2d845d and c4e221f

* New translations added

* Possible minor changes

* First update for 2.10

* One minor change

* One error fixed

* Additional translations up until PR #3726

* Translations up until PR #3726

* Minute change for one string

* Updates for recent PRs

* Updates for new strings

* Minor changes

* Update companion_sv.ts

Minor change in About EdgeTX
@chakflying
Copy link

That seems overly-complicated and I have no idea how to do so. It would be much better if an N-position virtual switch is automatically created when you assign N switches to a group.

@pfeerick
Copy link
Member

pfeerick commented Nov 4, 2023

Have a look at #4189 (comment)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.