diff --git a/CHANGELOG.md b/CHANGELOG.md index 89759390..f2ed07fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ## 1.1.1 * Unified usage of template arugments in unit_t +* electric conductance can be built from 1/Ohm (including all ratios) +* electric resistance can be built from 1/S (including all ratios) ## 1.1.0 diff --git a/README.md b/README.md index 42f324be..71ef1bde 100644 --- a/README.md +++ b/README.md @@ -75,8 +75,8 @@ All units that can be built from other units are also decayable to the respectiv | Acceleration | a | m/s^2 | v / T | none | none | | Electric charge | Q | C | I \* T | aC to EC | `*_coulomb_t` | | Electric potential | U | V | P / I, E/Q | aV to EV | `*_volt_t` | -| Electric resistance | O* | Ohm (Ω) | U / I | aOhm to EOhm | `*_ohm_t` | -| Electric conductance | G | S | I / U | aS to ES | `*_siemens_t` | +| Electric resistance | O* | Ohm (Ω) | U / I, 1/G | aOhm to EOhm | `*_ohm_t` | +| Electric conductance | G | S | I / U, 1/R | aS to ES | `*_siemens_t` | | Electric capacity | C | F | Q / U | aF to EF | `*_farad_t` | | Force | F | N | M \* a | aN to EN | `*_newton_t` | | Pressure | p | pa | F / L^2 | apa to Epa | `*_pascal_t` | diff --git a/include/SI/detail/unit.h b/include/SI/detail/unit.h index e4361a80..9d260e30 100644 --- a/include/SI/detail/unit.h +++ b/include/SI/detail/unit.h @@ -359,7 +359,7 @@ struct unit_with_common_ratio { /// divide a value of a certain unit with another value of a possibly different /// type resulting in a new type, the resulting exponent is specified by -/// resultingunit using a variadic template to simplify usage of implentation +/// resulting unit using a variadic template to simplify usage of implentation /// the internal type of the result is the internal type of lhs template