From f84f8af20afc76e0f9420f00335b6d4183f5e9d9 Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Sun, 22 Sep 2024 18:13:02 +1000 Subject: [PATCH] Rename JBC type --- Translations/translation_EN.json | 8 +- Translations/translations_definitions.json | 145 ++++++--------------- source/Core/Inc/Translation.h | 2 +- source/Core/Src/Settings.cpp | 2 +- 4 files changed, 43 insertions(+), 114 deletions(-) diff --git a/Translations/translation_EN.json b/Translations/translation_EN.json index 2953d85da0..9ef29e1ef7 100644 --- a/Translations/translation_EN.json +++ b/Translations/translation_EN.json @@ -122,16 +122,16 @@ "displayText": "TS100\nLong" }, "TipTypeT12Short": { - "displayText": "TS100\nShort" + "displayText": "Pine\nShort" }, "TipTypeT12PTS": { - "displayText": "TS100\nPTS" + "displayText": "PTS\n200" }, "TipTypeTS80": { "displayText": "TS80\n" }, - "TipTypeJBC": { - "displayText": "JBC\n" + "TipTypeJBCC210": { + "displayText": "JBC\nC210" } }, "menuOptions": { diff --git a/Translations/translations_definitions.json b/Translations/translations_definitions.json index 96ad0c50dc..e473ca346b 100644 --- a/Translations/translations_definitions.json +++ b/Translations/translations_definitions.json @@ -18,9 +18,7 @@ }, { "id": "NoPowerDeliveryMessage", - "include": [ - "POW_PD" - ], + "include": ["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." }, { @@ -58,58 +56,44 @@ { "id": "UVLOWarningString", "maxLen": 8, - "include": [ - "POW_DC" - ], + "include": ["POW_DC"], "description": "Warning text shown when the unit turns off due to undervoltage in simple mode." }, { "id": "UndervoltageString", "maxLen": 15, - "include": [ - "POW_DC" - ], + "include": ["POW_DC"], "description": "Warning text shown when the unit turns off due to undervoltage in advanced mode." }, { "id": "InputVoltageString", "maxLen": 11, "note": "Preferably end with a space", - "include": [ - "POW_DC" - ], + "include": ["POW_DC"], "description": "Prefix text for 'Input Voltage' shown before showing the input voltage reading." }, { "id": "ProfilePreheatString", "maxLen": 9, - "include": [ - "PROFILE_SUPPORT" - ], + "include": ["PROFILE_SUPPORT"], "description": "Shown in profile mode while preheating" }, { "id": "ProfileCooldownString", "maxLen": 9, - "include": [ - "PROFILE_SUPPORT" - ], + "include": ["PROFILE_SUPPORT"], "description": "Shown in profile mode while cooling down" }, { "id": "SleepingAdvancedString", "maxLen": 15, - "exclude": [ - "NO_SLEEP_MODE" - ], + "exclude": ["NO_SLEEP_MODE"], "description": "The text shown to indicate the unit is in sleep mode when the advanced view is turned on." }, { "id": "SleepingTipAdvancedString", "maxLen": 6, - "exclude": [ - "NO_SLEEP_MODE" - ], + "exclude": ["NO_SLEEP_MODE"], "description": "The prefix text shown before tip temperature when the unit is sleeping with advanced view on." }, { @@ -120,9 +104,7 @@ { "id": "TooHotToStartProfileWarning", "default": "Too hot to\nstart profile", - "include": [ - "PROFILE_SUPPORT" - ], + "include": ["PROFILE_SUPPORT"], "description": "Shown when profile mode is started while the device is too hot." } ], @@ -190,10 +172,7 @@ "id": "PowerMenu", "maxLen": 5, "maxLen2": 11, - "include": [ - "POW_DC", - "POW_QC" - ], + "include": ["POW_DC", "POW_QC"], "description": "Menu for settings related to power. Main settings to do with the input voltage." }, { @@ -255,7 +234,7 @@ "description": "Miniware TS80(P) tips" }, { - "id": "TipTypeJBC", + "id": "TipTypeJBCC210", "description": "JBC (or clone) tips" } ], @@ -264,45 +243,35 @@ "id": "DCInCutoff", "maxLen": 5, "maxLen2": 11, - "include": [ - "POW_DC" - ], + "include": ["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." }, { "id": "MinVolCell", "maxLen": 4, "maxLen2": 9, - "include": [ - "POW_DC" - ], + "include": ["POW_DC"], "description": "When powered by a battery, this adjusts the minimum voltage per cell before shutdown. (This is multiplied by the cell count.)" }, { "id": "QCMaxVoltage", "maxLen": 8, "maxLen2": 15, - "include": [ - "POW_QC" - ], + "include": ["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." }, { "id": "PDNegTimeout", "maxLen": 8, "maxLen2": 15, - "include": [ - "POW_PD" - ], + "include": ["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." }, { "id": "USBPDMode", "maxLen": 7, "maxLen2": 15, - "include": [ - "POW_PD" - ], + "include": ["POW_PD"], "description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance" }, { @@ -339,126 +308,98 @@ "id": "ProfilePhases", "maxLen": 6, "maxLen2": 13, - "include": [ - "PROFILE_SUPPORT" - ], + "include": ["PROFILE_SUPPORT"], "description": "set the number of phases for profile mode." }, { "id": "ProfilePreheatTemp", "maxLen": 4, "maxLen2": 9, - "include": [ - "PROFILE_SUPPORT" - ], + "include": ["PROFILE_SUPPORT"], "description": "Preheat to this temperature at the start of profile mode." }, { "id": "ProfilePreheatSpeed", "maxLen": 5, "maxLen2": 11, - "include": [ - "PROFILE_SUPPORT" - ], + "include": ["PROFILE_SUPPORT"], "description": "How fast the temperature is allowed to rise during the preheat phase at the start of profile mode." }, { "id": "ProfilePhase1Temp", "maxLen": 4, "maxLen2": 9, - "include": [ - "PROFILE_SUPPORT" - ], + "include": ["PROFILE_SUPPORT"], "description": "Target temperature for the end of phase 1 of profile mode." }, { "id": "ProfilePhase1Duration", "maxLen": 4, "maxLen2": 9, - "include": [ - "PROFILE_SUPPORT" - ], + "include": ["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." }, { "id": "ProfilePhase2Temp", "maxLen": 4, "maxLen2": 9, - "include": [ - "PROFILE_SUPPORT" - ], + "include": ["PROFILE_SUPPORT"], "description": "Target temperature for the end of phase 2 of profile mode." }, { "id": "ProfilePhase2Duration", "maxLen": 4, "maxLen2": 9, - "include": [ - "PROFILE_SUPPORT" - ], + "include": ["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." }, { "id": "ProfilePhase3Temp", "maxLen": 4, "maxLen2": 9, - "include": [ - "PROFILE_SUPPORT" - ], + "include": ["PROFILE_SUPPORT"], "description": "Target temperature for the end of phase 3 of profile mode." }, { "id": "ProfilePhase3Duration", "maxLen": 4, "maxLen2": 9, - "include": [ - "PROFILE_SUPPORT" - ], + "include": ["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." }, { "id": "ProfilePhase4Temp", "maxLen": 4, "maxLen2": 9, - "include": [ - "PROFILE_SUPPORT" - ], + "include": ["PROFILE_SUPPORT"], "description": "Target temperature for the end of phase 5 of profile mode." }, { "id": "ProfilePhase4Duration", "maxLen": 4, "maxLen2": 9, - "include": [ - "PROFILE_SUPPORT" - ], + "include": ["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." }, { "id": "ProfilePhase5Temp", "maxLen": 4, "maxLen2": 9, - "include": [ - "PROFILE_SUPPORT" - ], + "include": ["PROFILE_SUPPORT"], "description": "Target temperature for the end of phase 5 of profile mode." }, { "id": "ProfilePhase5Duration", "maxLen": 4, "maxLen2": 9, - "include": [ - "PROFILE_SUPPORT" - ], + "include": ["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." }, { "id": "ProfileCooldownSpeed", "maxLen": 5, "maxLen2": 11, - "include": [ - "PROFILE_SUPPORT" - ], + "include": ["PROFILE_SUPPORT"], "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", "maxLen": 4, "maxLen2": 9, - "exclude": [ - "NO_SLEEP_MODE" - ], + "exclude": ["NO_SLEEP_MODE"], "description": "Temperature the device will drop down to while asleep. Typically around halfway between off and soldering temperature." }, { "id": "SleepTimeout", "maxLen": 4, "maxLen2": 9, - "exclude": [ - "NO_SLEEP_MODE" - ], + "exclude": ["NO_SLEEP_MODE"], "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", "maxLen": 6, "maxLen2": 13, - "include": [ - "HALL_SENSOR" - ], + "include": ["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." }, { "id": "HallEffSleepTimeout", "maxLen": 10, "maxLen2": 10, - "include": [ - "HALL_SENSOR" - ], + "include": ["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." }, { @@ -519,9 +452,7 @@ "id": "DisplayRotation", "maxLen": 6, "maxLen2": 13, - "exclude": [ - "NO_DISPLAY_ROTATE" - ], + "exclude": ["NO_DISPLAY_ROTATE"], "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", "maxLen": 7, "maxLen2": 15, - "include": [ - "BLE_ENABLED" - ], + "include": ["BLE_ENABLED"], "description": "Should BLE be enabled at boot time." }, { @@ -648,4 +577,4 @@ "description": "For manually selecting the type of tip fitted" } ] -} \ No newline at end of file +} diff --git a/source/Core/Inc/Translation.h b/source/Core/Inc/Translation.h index 843a2776b2..c8ad90198c 100644 --- a/source/Core/Inc/Translation.h +++ b/source/Core/Inc/Translation.h @@ -155,7 +155,7 @@ struct TranslationIndexTable { uint16_t TipTypeT12Short; uint16_t TipTypeT12PTS; uint16_t TipTypeTS80; - uint16_t TipTypeJBC; + uint16_t TipTypeJBCC210; uint16_t SettingsDescriptions[static_cast(SettingsItemIndex::NUM_ITEMS)]; uint16_t SettingsShortNames[static_cast(SettingsItemIndex::NUM_ITEMS)]; diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp index 5d10bc7deb..1169399234 100644 --- a/source/Core/Src/Settings.cpp +++ b/source/Core/Src/Settings.cpp @@ -326,7 +326,7 @@ const char *lookupTipName() { #endif #ifdef TIPTYPE_JBC case tipType_t::JBC_210_2_5_OHM: - return translatedString(Tr->TipTypeJBC); + return translatedString(Tr->TipTypeJBCC210); break; #endif default: