me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Collapse power limiter into one menu option

Browse Source 
Work for #642
This commit is contained in:
Ben V. Brown
2020-09-06 15:31:23 +10:00
parent 5459d437e4
commit feec35be7a
33 changed files with 37 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Translation Editor/make_translation.py
View File

@@ -125,27 +125,6 @@ def getConstants():
return consants
def getTipModelEnumTS80():
constants = []
constants.append("B02")
constants.append("D25")
constants.append("TS80") # end of miniware
constants.append("User") # User
return constants
def getTipModelEnumTS100():
constants = []
constants.append("B02")
constants.append("D24")
constants.append("BC2")
constants.append(" C1")
constants.append("TS100") # end of miniware
constants.append("BC2")
constants.append("Hakko") # end of hakko
constants.append("User")
return constants
def getDebugMenu():
constants = []
@@ -207,8 +186,6 @@ def getLetterCounts(defs, lang):
constants = getConstants()
for x in constants:
textList.append(x[1])
textList.extend(getTipModelEnumTS100())
textList.extend(getTipModelEnumTS80())
textList.extend(getDebugMenu())
# collapse all strings down into the composite letters and store totals for these
@@ -329,17 +306,19 @@ def writeLanguage(languageCode, defs, f):
f.write(to_unicode("const char* SettingsDescriptions[] = {\n"))
maxLen = 25
index =0
for mod in defs['menuOptions']:
eid = mod['id']
if 'feature' in mod:
f.write(to_unicode("#ifdef " + mod['feature'] + "\n"))
f.write(to_unicode(" /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
f.write(to_unicode(" /* ["+"{:02d}".format(index)+"] " + eid.ljust(maxLen)[:maxLen] + " */ "))
f.write(
to_unicode("\"" +
convStr(symbolConversionTable, (obj[eid]['desc'])) +
"\"," + "//{} \n".format(obj[eid]['desc'])))
if 'feature' in mod:
f.write(to_unicode("#endif\n"))
index=index+1
f.write(to_unicode("};\n\n"))
@@ -381,20 +360,6 @@ def writeLanguage(languageCode, defs, f):
convStr(symbolConversionTable, x[1]) + "\";" + "//{} \n".format(x[1])))
f.write(to_unicode("\n"))
# Write out tip model strings
f.write(to_unicode("const char* TipModelStrings[] = {\n"))
f.write(to_unicode("#ifdef MODEL_TS100\n"))
for c in getTipModelEnumTS100():
f.write(to_unicode("\t \"" + convStr(symbolConversionTable,
c) + "\"," + "//{} \n".format(c)))
f.write(to_unicode("#else\n"))
for c in getTipModelEnumTS80():
f.write(to_unicode("\t \"" + convStr(symbolConversionTable,
c) + "\"," + "//{} \n".format(c)))
f.write(to_unicode("#endif\n"))
f.write(to_unicode("};\n\n"))
# Debug Menu
f.write(to_unicode("const char* DebugMenu[] = {\n"))
@@ -417,11 +382,12 @@ def writeLanguage(languageCode, defs, f):
f.write(to_unicode("const char* SettingsShortNames[][2] = {\n"))
maxLen = 25
index = 0
for mod in defs['menuOptions']:
eid = mod['id']
if 'feature' in mod:
f.write(to_unicode("#ifdef " + mod['feature'] + "\n"))
f.write(to_unicode(" /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
f.write(to_unicode(" /* ["+"{:02d}".format(index)+"] " + eid.ljust(maxLen)[:maxLen] + " */ "))
if lang['menuDouble']:
f.write(
to_unicode(
@@ -437,6 +403,7 @@ def writeLanguage(languageCode, defs, f):
"\" }," + "//{} \n".format(obj[eid]['text'])))
if 'feature' in mod:
f.write(to_unicode("#endif\n"))
index = index + 1
f.write(to_unicode("};\n\n"))

8
Translation Editor/translation_bg.json
View File

@@ -236,14 +236,6 @@
],
"desc": "Мощност на избраното захранване"
},
"PowerLimitEnable": {
"text": "",
"text2": [
"Вкл. лимит",
"на мощност?"
],
"desc": "Включване на лимит на мощност"
},
"PowerLimit": {
"text": "",
"text2": [

8
Translation Editor/translation_cs.json
View File

@@ -236,14 +236,6 @@
],
"desc": "Výkon použítého napájecího adaptéru ve wattech."
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"Omez. výk.",
"Aktivovat"
],
"desc": "Aktivovat omezení výkonu"
},
"PowerLimit": {
"text": "PLIM",
"text2": [

8
Translation Editor/translation_da.json
View File

@@ -234,14 +234,6 @@
],
"desc": "Power Wattage of the power adapter used"
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"P Limit",
"Enable"
],
"desc": "Enable power limit"
},
"PowerLimit": {
"text": "PLIM",
"text2": [

8
Translation Editor/translation_de.json
View File

@@ -237,14 +237,6 @@
],
"desc": "Leistungsaufnahme der verwendeten Spannungsversorgung"
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"Leistungs-",
"Limit An"
],
"desc": "Leistungslimit aktivieren"
},
"PowerLimit": {
"text": "PLIM",
"text2": [

8
Translation Editor/translation_en.json
View File

@@ -237,14 +237,6 @@
],
"desc": "Power wattage of the power adapter used"
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"Enable power",
"limit"
],
"desc": "Enable power limit"
},
"PowerLimit": {
"text": "PLIM",
"text2": [

8
Translation Editor/translation_es.json
View File

@@ -236,14 +236,6 @@
],
"desc": "Potencia en vatios del adaptador de corriente utilizado."
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"Limitar la",
"potenc. máx."
],
"desc": "Activa el límite de potencia máxima."
},
"PowerLimit": {
"text": "PLIM",
"text2": [

8
Translation Editor/translation_fi.json
View File

@@ -234,14 +234,6 @@
],
"desc": "Power Wattage of the power adapter used"
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"P Limit",
"Enable"
],
"desc": "Enable power limit"
},
"PowerLimit": {
"text": "PLIM",
"text2": [

8
Translation Editor/translation_fr.json
View File

@@ -234,14 +234,6 @@
],
"desc": "Puissance de l'alimentation utilisée"
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"P Limit",
"Activer?"
],
"desc": "Activer la limite de puissance"
},
"PowerLimit": {
"text": "PLIM",
"text2": [

8
Translation Editor/translation_hr.json
View File

@@ -234,14 +234,6 @@
],
"desc": "Snaga modula za napajanje"
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"P Limit",
"Enable"
],
"desc": "Enable power limit"
},
"PowerLimit": {
"text": "PLIM",
"text2": [

8
Translation Editor/translation_hu.json
View File

@@ -234,14 +234,6 @@
],
"desc": "A tápegység által leadott teljesítmény"
},
"PowerLimitEnable": {
"text": "TELJH",
"text2": [
"Telj H",
"Bekapcsolva"
],
"desc": "Bemeneti teljesitmény korlátozása"
},
"PowerLimit": {
"text": "TELJM",
"text2": [

8
Translation Editor/translation_it.json
View File

@@ -236,14 +236,6 @@
],
"desc": "Imposta la potenza massima erogabile dall'alimentatore in uso"
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"Limitatore",
"di potenza"
],
"desc": "Abilita un limitatore per la potenza massima erogabile al saldatore"
},
"PowerLimit": {
"text": "PLIM",
"text2": [

8
Translation Editor/translation_lt.json
View File

@@ -234,14 +234,6 @@
],
"desc": "Maitinimo bloko galia vatais"
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"P Limit",
"Enable"
],
"desc": "Enable power limit"
},
"PowerLimit": {
"text": "PLIM",
"text2": [

8
Translation Editor/translation_nl.json
View File

@@ -234,14 +234,6 @@
],
"desc": "Power Wattage of the power adapter used"
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"P Limit",
"Enable"
],
"desc": "Enable power limit"
},
"PowerLimit": {
"text": "PLIM",
"text2": [

8
Translation Editor/translation_nl_be.json
View File

@@ -234,14 +234,6 @@
],
"desc": "Vermogen van de adapter"
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"P Limit",
"Enable"
],
"desc": "Enable power limit"
},
"PowerLimit": {
"text": "PLIM",
"text2": [

8
Translation Editor/translation_no.json
View File

@@ -234,14 +234,6 @@
],
"desc": "Power Wattage of the power adapter used"
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"P Limit",
"Enable"
],
"desc": "Enable power limit"
},
"PowerLimit": {
"text": "PLIM",
"text2": [

8
Translation Editor/translation_pl.json
View File

@@ -237,14 +237,6 @@
],
"desc": "Moc używanego zasilacza w Wattach"
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"Włącz limit",
"mocy"
],
"desc": "Włącza limit mocy"
},
"PowerLimit": {
"text": "PLIM",
"text2": [

8
Translation Editor/translation_pt.json
View File

@@ -234,14 +234,6 @@
],
"desc": "Potência da fonte usada (Watt)"
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"P Limit",
"Enable"
],
"desc": "Enable power limit"
},
"PowerLimit": {
"text": "PLIM",
"text2": [

8
Translation Editor/translation_ru.json
View File

@@ -236,14 +236,6 @@
],
"desc": "Мощность используемого источника питания"
},
"PowerLimitEnable": {
"text": "ВклЛимW",
"text2": [
"Ограничение",
"мощности"
],
"desc": "Включить лимит потребляемой мощности"
},
"PowerLimit": {
"text": "ЗначЛимW",
"text2": [

8
Translation Editor/translation_sk.json
View File

@@ -234,14 +234,6 @@
],
"desc": "Power Wattage of the power adapter used"
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"P Limit",
"Enable"
],
"desc": "Enable power limit"
},
"PowerLimit": {
"text": "PLIM",
"text2": [

8
Translation Editor/translation_sl.json
View File

@@ -235,14 +235,6 @@
],
"desc": "Moč v W napajalnega vira"
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"P Limit",
"Enable"
],
"desc": "Enable power limit"
},
"PowerLimit": {
"text": "PLIM",
"text2": [

8
Translation Editor/translation_sr_cyrl.json
View File

@@ -234,14 +234,6 @@
],
"desc": "Снага напајања у ватима."
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"P Limit",
"Enable"
],
"desc": "Enable power limit"
},
"PowerLimit": {
"text": "PLIM",
"text2": [

8
Translation Editor/translation_sr_latn.json
View File

@@ -234,14 +234,6 @@
],
"desc": "Snaga napajanja u vatima."
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"P Limit",
"Enable"
],
"desc": "Enable power limit"
},
"PowerLimit": {
"text": "PLIM",
"text2": [

8
Translation Editor/translation_sv.json
View File

@@ -234,14 +234,6 @@
],
"desc": "Power Wattage of the power adapter used"
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"P Limit",
"Enable"
],
"desc": "Enable power limit"
},
"PowerLimit": {
"text": "PLIM",
"text2": [

8
Translation Editor/translation_tr.json
View File

@@ -234,14 +234,6 @@
],
"desc": "Kullanılan adaptörün güç miktarı"
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"P Limit",
"Enable"
],
"desc": "Enable power limit"
},
"PowerLimit": {
"text": "PLIM",
"text2": [

8
Translation Editor/translation_uk.json
View File

@@ -236,14 +236,6 @@
],
"desc": "Потужність джерела живлення в Ватах"
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"Ліміт",
"потужності"
],
"desc": "Вмикає обмеження потужності споживання"
},
"PowerLimit": {
"text": "PLIM",
"text2": [

5
Translation Editor/translations_def.js
View File

@@ -258,11 +258,6 @@ var def =
"maxLen": 8,
"maxLen2": 16
},
{
"id": "PowerLimitEnable",
"maxLen": 6,
"maxLen2": 13
},
{
"id": "PowerLimit",
"maxLen": 5,