From 27b7138fb642d1cc568764af50a70e2ce2b3267d Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Tue, 20 Oct 2020 12:28:45 -0700 Subject: [PATCH] Standardize to SI prefix on kOhm --- pcb_calculator/eserie_help.h | 4 ++-- pcb_calculator/eserie_help.md | 4 ++-- pcb_calculator/widgets/unit_selector.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pcb_calculator/eserie_help.h b/pcb_calculator/eserie_help.h index 29866e8be6..fbcab160be 100644 --- a/pcb_calculator/eserie_help.h +++ b/pcb_calculator/eserie_help.h @@ -11,7 +11,7 @@ _HKI( "E-series defined in IEC 60063 are a widely accepted system of preferred\n " E1: 1,0 - - - - - - - - - - -\n" "If your design requires any resistor value which is not readily available,\n" "this calculator will find a combination of standard E-series components to\n" -"create it. You can enter the required resistance from 0,0025 to 4000 KOhm. \n" +"create it. You can enter the required resistance from 0,0025 to 4000 kOhm. \n" "Solutions using 3 or 4 resistors are given if a better match can be found. \n" "The 4R checkbox option will take longer to process is considered for the E12\n" "series only. Optionally it is possible to exclude up to two additional\n" @@ -27,7 +27,7 @@ _HKI( "E-series defined in IEC 60063 are a widely accepted system of preferred\n "__Example:__ Voltage dividers, commonly used for 1:10 range selection\n" "require resistor ratio values 1:9. Unfortunately the \"9\" is a value, what\n" "is not even in the E192 series available. Deviation of 1% and more is yet\n" -"unacceptable for 8 bit accuracy. For a required resistor value of 9 KOhm,\n" +"unacceptable for 8 bit accuracy. For a required resistor value of 9 kOhm,\n" "the calculator suggests the E6 values 2k2 + 6k8 in series as a possible\n" "exact solution.\n" "" ); diff --git a/pcb_calculator/eserie_help.md b/pcb_calculator/eserie_help.md index a634beb1d2..884f91daeb 100644 --- a/pcb_calculator/eserie_help.md +++ b/pcb_calculator/eserie_help.md @@ -10,7 +10,7 @@ intended for resistors. E1: 1,0 - - - - - - - - - - - If your design requires any resistor value which is not readily available, this calculator will find a combination of standard E-series components to -create it. You can enter the required resistance from 0,0025 to 4000 KOhm. +create it. You can enter the required resistance from 0,0025 to 4000 kOhm. Solutions using 3 or 4 resistors are given if a better match can be found. The 4R checkbox option will take longer to process is considered for the E12 series only. Optionally it is possible to exclude up to two additional @@ -26,6 +26,6 @@ Solutions are given in the following formats: __Example:__ Voltage dividers, commonly used for 1:10 range selection require resistor ratio values 1:9. Unfortunately the "9" is a value, what is not even in the E192 series available. Deviation of 1% and more is yet -unacceptable for 8 bit accuracy. For a required resistor value of 9 KOhm, +unacceptable for 8 bit accuracy. For a required resistor value of 9 kOhm, the calculator suggests the E6 values 2k2 + 6k8 in series as a possible exact solution. diff --git a/pcb_calculator/widgets/unit_selector.cpp b/pcb_calculator/widgets/unit_selector.cpp index ce850b2561..8ee9fad16a 100644 --- a/pcb_calculator/widgets/unit_selector.cpp +++ b/pcb_calculator/widgets/unit_selector.cpp @@ -152,7 +152,7 @@ UNIT_SELECTOR_RESISTOR::UNIT_SELECTOR_RESISTOR( wxWindow *parent, wxWindowID id, : UNIT_SELECTOR( parent, id, pos, size, choices, style ) { Append( _( "Ohm" ) ); - Append( _( "KOhm" ) ); + Append( _( "kOhm" ) ); }