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

Rename JBC type

Browse Source
This commit is contained in:
Ben V. Brown
2024-09-22 18:13:02 +10:00
parent cbebbea10b
commit 64144e3fe0
4 changed files with 43 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Translations/translation_EN.json
View File

@@ -122,16 +122,16 @@
"displayText": "TS100\nLong" "displayText": "TS100\nLong"
}, },
"TipTypeT12Short": { "TipTypeT12Short": {
"displayText": "TS100\nShort" "displayText": "Pine\nShort"
}, },
"TipTypeT12PTS": { "TipTypeT12PTS": {
"displayText": "TS100\nPTS" "displayText": "PTS\n200"
}, },
"TipTypeTS80": { "TipTypeTS80": {
"displayText": "TS80\n" "displayText": "TS80\n"
}, },
"TipTypeJBC": { "TipTypeJBCC210": {
"displayText": "JBC\n" "displayText": "JBC\nC210"
} }
}, },
"menuOptions": { "menuOptions": {

145
Translations/translations_definitions.json
View File

@@ -18,9 +18,7 @@
}, },
{ {
"id": "NoPowerDeliveryMessage", "id": "NoPowerDeliveryMessage",
"include": [ "include": ["POW_PD"],
"POW_PD"
],
"description": "The IC required for USB-PD could not be communicated with. This is an error warning that USB-PD WILL NOT FUNCTION. Generally indicative of either a hardware or software issues." "description": "The IC required for USB-PD could not be communicated with. This is an error warning that USB-PD WILL NOT FUNCTION. Generally indicative of either a hardware or software issues."
}, },
{ {
@@ -58,58 +56,44 @@
{ {
"id": "UVLOWarningString", "id": "UVLOWarningString",
"maxLen": 8, "maxLen": 8,
"include": [ "include": ["POW_DC"],
"POW_DC"
],
"description": "Warning text shown when the unit turns off due to undervoltage in simple mode." "description": "Warning text shown when the unit turns off due to undervoltage in simple mode."
}, },
{ {
"id": "UndervoltageString", "id": "UndervoltageString",
"maxLen": 15, "maxLen": 15,
"include": [ "include": ["POW_DC"],
"POW_DC"
],
"description": "Warning text shown when the unit turns off due to undervoltage in advanced mode." "description": "Warning text shown when the unit turns off due to undervoltage in advanced mode."
}, },
{ {
"id": "InputVoltageString", "id": "InputVoltageString",
"maxLen": 11, "maxLen": 11,
"note": "Preferably end with a space", "note": "Preferably end with a space",
"include": [ "include": ["POW_DC"],
"POW_DC"
],
"description": "Prefix text for 'Input Voltage' shown before showing the input voltage reading." "description": "Prefix text for 'Input Voltage' shown before showing the input voltage reading."
}, },
{ {
"id": "ProfilePreheatString", "id": "ProfilePreheatString",
"maxLen": 9, "maxLen": 9,
"include": [ "include": ["PROFILE_SUPPORT"],
"PROFILE_SUPPORT"
],
"description": "Shown in profile mode while preheating" "description": "Shown in profile mode while preheating"
}, },
{ {
"id": "ProfileCooldownString", "id": "ProfileCooldownString",
"maxLen": 9, "maxLen": 9,
"include": [ "include": ["PROFILE_SUPPORT"],
"PROFILE_SUPPORT"
],
"description": "Shown in profile mode while cooling down" "description": "Shown in profile mode while cooling down"
}, },
{ {
"id": "SleepingAdvancedString", "id": "SleepingAdvancedString",
"maxLen": 15, "maxLen": 15,
"exclude": [ "exclude": ["NO_SLEEP_MODE"],
"NO_SLEEP_MODE"
],
"description": "The text shown to indicate the unit is in sleep mode when the advanced view is turned on." "description": "The text shown to indicate the unit is in sleep mode when the advanced view is turned on."
}, },
{ {
"id": "SleepingTipAdvancedString", "id": "SleepingTipAdvancedString",
"maxLen": 6, "maxLen": 6,
"exclude": [ "exclude": ["NO_SLEEP_MODE"],
"NO_SLEEP_MODE"
],
"description": "The prefix text shown before tip temperature when the unit is sleeping with advanced view on." "description": "The prefix text shown before tip temperature when the unit is sleeping with advanced view on."
}, },
{ {
@@ -120,9 +104,7 @@
{ {
"id": "TooHotToStartProfileWarning", "id": "TooHotToStartProfileWarning",
"default": "Too hot to\nstart profile", "default": "Too hot to\nstart profile",
"include": [ "include": ["PROFILE_SUPPORT"],
"PROFILE_SUPPORT"
],
"description": "Shown when profile mode is started while the device is too hot." "description": "Shown when profile mode is started while the device is too hot."
} }
], ],
@@ -190,10 +172,7 @@
"id": "PowerMenu", "id": "PowerMenu",
"maxLen": 5, "maxLen": 5,
"maxLen2": 11, "maxLen2": 11,
"include": [ "include": ["POW_DC", "POW_QC"],
"POW_DC",
"POW_QC"
],
"description": "Menu for settings related to power. Main settings to do with the input voltage." "description": "Menu for settings related to power. Main settings to do with the input voltage."
}, },
{ {
@@ -255,7 +234,7 @@
"description": "Miniware TS80(P) tips" "description": "Miniware TS80(P) tips"
}, },
{ {
"id": "TipTypeJBC", "id": "TipTypeJBCC210",
"description": "JBC (or clone) tips" "description": "JBC (or clone) tips"
} }
], ],
@@ -264,45 +243,35 @@
"id": "DCInCutoff", "id": "DCInCutoff",
"maxLen": 5, "maxLen": 5,
"maxLen2": 11, "maxLen2": 11,
"include": [ "include": ["POW_DC"],
"POW_DC"
],
"description": "When the device is powered by a battery, this adjusts the low voltage threshold for when the unit should turn off the heater to protect the battery." "description": "When the device is powered by a battery, this adjusts the low voltage threshold for when the unit should turn off the heater to protect the battery."
}, },
{ {
"id": "MinVolCell", "id": "MinVolCell",
"maxLen": 4, "maxLen": 4,
"maxLen2": 9, "maxLen2": 9,
"include": [ "include": ["POW_DC"],
"POW_DC"
],
"description": "When powered by a battery, this adjusts the minimum voltage per cell before shutdown. (This is multiplied by the cell count.)" "description": "When powered by a battery, this adjusts the minimum voltage per cell before shutdown. (This is multiplied by the cell count.)"
}, },
{ {
"id": "QCMaxVoltage", "id": "QCMaxVoltage",
"maxLen": 8, "maxLen": 8,
"maxLen2": 15, "maxLen2": 15,
"include": [ "include": ["POW_QC"],
"POW_QC"
],
"description": "This adjusts the maximum voltage the QC negotiation will adjust to. Does NOT affect USB-PD. Should be set safely based on the current rating of your power supply." "description": "This adjusts the maximum voltage the QC negotiation will adjust to. Does NOT affect USB-PD. Should be set safely based on the current rating of your power supply."
}, },
{ {
"id": "PDNegTimeout", "id": "PDNegTimeout",
"maxLen": 8, "maxLen": 8,
"maxLen2": 15, "maxLen2": 15,
"include": [ "include": ["POW_PD"],
"POW_PD"
],
"description": "How long until firmware stops trying to negotiate for USB-PD and tries QC instead. Longer times may help dodgy / old PD adapters, faster times move onto PD quickly. Units of 100ms. Recommended to keep small values." "description": "How long until firmware stops trying to negotiate for USB-PD and tries QC instead. Longer times may help dodgy / old PD adapters, faster times move onto PD quickly. Units of 100ms. Recommended to keep small values."
}, },
{ {
"id": "USBPDMode", "id": "USBPDMode",
"maxLen": 7, "maxLen": 7,
"maxLen2": 15, "maxLen2": 15,
"include": [ "include": ["POW_PD"],
"POW_PD"
],
"description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance" "description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance"
}, },
{ {
@@ -339,126 +308,98 @@
"id": "ProfilePhases", "id": "ProfilePhases",
"maxLen": 6, "maxLen": 6,
"maxLen2": 13, "maxLen2": 13,
"include": [ "include": ["PROFILE_SUPPORT"],
"PROFILE_SUPPORT"
],
"description": "set the number of phases for profile mode." "description": "set the number of phases for profile mode."
}, },
{ {
"id": "ProfilePreheatTemp", "id": "ProfilePreheatTemp",
"maxLen": 4, "maxLen": 4,
"maxLen2": 9, "maxLen2": 9,
"include": [ "include": ["PROFILE_SUPPORT"],
"PROFILE_SUPPORT"
],
"description": "Preheat to this temperature at the start of profile mode." "description": "Preheat to this temperature at the start of profile mode."
}, },
{ {
"id": "ProfilePreheatSpeed", "id": "ProfilePreheatSpeed",
"maxLen": 5, "maxLen": 5,
"maxLen2": 11, "maxLen2": 11,
"include": [ "include": ["PROFILE_SUPPORT"],
"PROFILE_SUPPORT"
],
"description": "How fast the temperature is allowed to rise during the preheat phase at the start of profile mode." "description": "How fast the temperature is allowed to rise during the preheat phase at the start of profile mode."
}, },
{ {
"id": "ProfilePhase1Temp", "id": "ProfilePhase1Temp",
"maxLen": 4, "maxLen": 4,
"maxLen2": 9, "maxLen2": 9,
"include": [ "include": ["PROFILE_SUPPORT"],
"PROFILE_SUPPORT"
],
"description": "Target temperature for the end of phase 1 of profile mode." "description": "Target temperature for the end of phase 1 of profile mode."
}, },
{ {
"id": "ProfilePhase1Duration", "id": "ProfilePhase1Duration",
"maxLen": 4, "maxLen": 4,
"maxLen2": 9, "maxLen2": 9,
"include": [ "include": ["PROFILE_SUPPORT"],
"PROFILE_SUPPORT"
],
"description": "Duration of phase 1 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature." "description": "Duration of phase 1 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature."
}, },
{ {
"id": "ProfilePhase2Temp", "id": "ProfilePhase2Temp",
"maxLen": 4, "maxLen": 4,
"maxLen2": 9, "maxLen2": 9,
"include": [ "include": ["PROFILE_SUPPORT"],
"PROFILE_SUPPORT"
],
"description": "Target temperature for the end of phase 2 of profile mode." "description": "Target temperature for the end of phase 2 of profile mode."
}, },
{ {
"id": "ProfilePhase2Duration", "id": "ProfilePhase2Duration",
"maxLen": 4, "maxLen": 4,
"maxLen2": 9, "maxLen2": 9,
"include": [ "include": ["PROFILE_SUPPORT"],
"PROFILE_SUPPORT"
],
"description": "Duration of phase 2 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature." "description": "Duration of phase 2 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature."
}, },
{ {
"id": "ProfilePhase3Temp", "id": "ProfilePhase3Temp",
"maxLen": 4, "maxLen": 4,
"maxLen2": 9, "maxLen2": 9,
"include": [ "include": ["PROFILE_SUPPORT"],
"PROFILE_SUPPORT"
],
"description": "Target temperature for the end of phase 3 of profile mode." "description": "Target temperature for the end of phase 3 of profile mode."
}, },
{ {
"id": "ProfilePhase3Duration", "id": "ProfilePhase3Duration",
"maxLen": 4, "maxLen": 4,
"maxLen2": 9, "maxLen2": 9,
"include": [ "include": ["PROFILE_SUPPORT"],
"PROFILE_SUPPORT"
],
"description": "Duration of phase 3 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature." "description": "Duration of phase 3 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature."
}, },
{ {
"id": "ProfilePhase4Temp", "id": "ProfilePhase4Temp",
"maxLen": 4, "maxLen": 4,
"maxLen2": 9, "maxLen2": 9,
"include": [ "include": ["PROFILE_SUPPORT"],
"PROFILE_SUPPORT"
],
"description": "Target temperature for the end of phase 5 of profile mode." "description": "Target temperature for the end of phase 5 of profile mode."
}, },
{ {
"id": "ProfilePhase4Duration", "id": "ProfilePhase4Duration",
"maxLen": 4, "maxLen": 4,
"maxLen2": 9, "maxLen2": 9,
"include": [ "include": ["PROFILE_SUPPORT"],
"PROFILE_SUPPORT"
],
"description": "Duration of phase 5 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature." "description": "Duration of phase 5 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature."
}, },
{ {
"id": "ProfilePhase5Temp", "id": "ProfilePhase5Temp",
"maxLen": 4, "maxLen": 4,
"maxLen2": 9, "maxLen2": 9,
"include": [ "include": ["PROFILE_SUPPORT"],
"PROFILE_SUPPORT"
],
"description": "Target temperature for the end of phase 5 of profile mode." "description": "Target temperature for the end of phase 5 of profile mode."
}, },
{ {
"id": "ProfilePhase5Duration", "id": "ProfilePhase5Duration",
"maxLen": 4, "maxLen": 4,
"maxLen2": 9, "maxLen2": 9,
"include": [ "include": ["PROFILE_SUPPORT"],
"PROFILE_SUPPORT"
],
"description": "Duration of phase 5 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature." "description": "Duration of phase 5 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature."
}, },
{ {
"id": "ProfileCooldownSpeed", "id": "ProfileCooldownSpeed",
"maxLen": 5, "maxLen": 5,
"maxLen2": 11, "maxLen2": 11,
"include": [ "include": ["PROFILE_SUPPORT"],
"PROFILE_SUPPORT"
],
"description": "How fast the temperature is allowed to drop during the cooldown phase at the end of profile mode." "description": "How fast the temperature is allowed to drop during the cooldown phase at the end of profile mode."
}, },
{ {
@@ -471,18 +412,14 @@
"id": "SleepTemperature", "id": "SleepTemperature",
"maxLen": 4, "maxLen": 4,
"maxLen2": 9, "maxLen2": 9,
"exclude": [ "exclude": ["NO_SLEEP_MODE"],
"NO_SLEEP_MODE"
],
"description": "Temperature the device will drop down to while asleep. Typically around halfway between off and soldering temperature." "description": "Temperature the device will drop down to while asleep. Typically around halfway between off and soldering temperature."
}, },
{ {
"id": "SleepTimeout", "id": "SleepTimeout",
"maxLen": 4, "maxLen": 4,
"maxLen2": 9, "maxLen2": 9,
"exclude": [ "exclude": ["NO_SLEEP_MODE"],
"NO_SLEEP_MODE"
],
"description": "How long of a period without movement / button-pressing is required before the device drops down to the sleep temperature." "description": "How long of a period without movement / button-pressing is required before the device drops down to the sleep temperature."
}, },
{ {
@@ -495,18 +432,14 @@
"id": "HallEffSensitivity", "id": "HallEffSensitivity",
"maxLen": 6, "maxLen": 6,
"maxLen2": 13, "maxLen2": 13,
"include": [ "include": ["HALL_SENSOR"],
"HALL_SENSOR"
],
"description": "If the unit has a hall effect sensor (Pinecil), this adjusts how sensitive it is at detecting a magnet to put the device into sleep mode." "description": "If the unit has a hall effect sensor (Pinecil), this adjusts how sensitive it is at detecting a magnet to put the device into sleep mode."
}, },
{ {
"id": "HallEffSleepTimeout", "id": "HallEffSleepTimeout",
"maxLen": 10, "maxLen": 10,
"maxLen2": 10, "maxLen2": 10,
"include": [ "include": ["HALL_SENSOR"],
"HALL_SENSOR"
],
"description": "If the unit has a hall effect sensor (Pinecil), this adjusts how long the device takes before it drops down to the sleep temperature when hall sensor is over threshold." "description": "If the unit has a hall effect sensor (Pinecil), this adjusts how long the device takes before it drops down to the sleep temperature when hall sensor is over threshold."
}, },
{ {
@@ -519,9 +452,7 @@
"id": "DisplayRotation", "id": "DisplayRotation",
"maxLen": 6, "maxLen": 6,
"maxLen2": 13, "maxLen2": 13,
"exclude": [ "exclude": ["NO_DISPLAY_ROTATE"],
"NO_DISPLAY_ROTATE"
],
"description": "If the display should rotate automatically or if it should be fixed for left- or right-handed mode." "description": "If the display should rotate automatically or if it should be fixed for left- or right-handed mode."
}, },
{ {
@@ -588,9 +519,7 @@
"id": "BluetoothLE", "id": "BluetoothLE",
"maxLen": 7, "maxLen": 7,
"maxLen2": 15, "maxLen2": 15,
"include": [ "include": ["BLE_ENABLED"],
"BLE_ENABLED"
],
"description": "Should BLE be enabled at boot time." "description": "Should BLE be enabled at boot time."
}, },
{ {
@@ -648,4 +577,4 @@
"description": "For manually selecting the type of tip fitted" "description": "For manually selecting the type of tip fitted"
} }
] ]
} }

2
source/Core/Inc/Translation.h
View File

@@ -155,7 +155,7 @@ struct TranslationIndexTable {
uint16_t TipTypeT12Short; uint16_t TipTypeT12Short;
uint16_t TipTypeT12PTS; uint16_t TipTypeT12PTS;
uint16_t TipTypeTS80; uint16_t TipTypeTS80;
uint16_t TipTypeJBC; uint16_t TipTypeJBCC210;
uint16_t SettingsDescriptions[static_cast<uint32_t>(SettingsItemIndex::NUM_ITEMS)]; uint16_t SettingsDescriptions[static_cast<uint32_t>(SettingsItemIndex::NUM_ITEMS)];
uint16_t SettingsShortNames[static_cast<uint32_t>(SettingsItemIndex::NUM_ITEMS)]; uint16_t SettingsShortNames[static_cast<uint32_t>(SettingsItemIndex::NUM_ITEMS)];

2
source/Core/Src/Settings.cpp
View File

@@ -326,7 +326,7 @@ const char *lookupTipName() {
#endif #endif
#ifdef TIPTYPE_JBC #ifdef TIPTYPE_JBC
case tipType_t::JBC_210_2_5_OHM: case tipType_t::JBC_210_2_5_OHM:
return translatedString(Tr->TipTypeJBC); return translatedString(Tr->TipTypeJBCC210);
break; break;
#endif #endif
default: default: