diff --git a/Cargo.lock b/Cargo.lock index 04cccad..08435cc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,7 +28,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "daisy" -version = "0.2.4" +version = "0.2.5" dependencies = [ "cfg-if", "rug", diff --git a/Cargo.toml b/Cargo.toml index 7f58f81..97e3cfa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "daisy" -version = "0.2.4" +version = "0.2.5" edition = "2021" build = "buildscript/main.rs" diff --git a/buildscript/units.toml b/buildscript/units.toml index 9e59c8d..6515cfe 100644 --- a/buildscript/units.toml +++ b/buildscript/units.toml @@ -527,4 +527,161 @@ parse = ["FSW", "fsw"] base_value_type = "exact" base_value = "3064330" -base_units = [ { u = "Gram", p = 1}, { u = "Meter", p = -1}, { u = "Second", p = -2} ] \ No newline at end of file +base_units = [ { u = "Gram", p = 1}, { u = "Meter", p = -1}, { u = "Second", p = -2} ] + + + +# Electrical, Power, Etc + +[[unit]] +enum_name = "Gauss" +print = "G" +parse = ["G", "gauss"] + +base_value_type = "exact" +base_value = "0.1" +base_units = [ { u = "Gram", p = 1}, { u = "Second", p = -2}, { u = "Ampere", p = -1} ] + + + +[[unit]] +enum_name = "Tesla" +print = "T" +parse = ["tesla"] +parse_with_prefix = "T" + +base_value_type = "exact" +base_value = "1000" +base_units = [ { u = "Gram", p = 1}, { u = "Second", p = -2}, { u = "Ampere", p = -1} ] + + + +[[unit]] +enum_name = "Joule" +print = "J" +parse = ["joule", "joules"] +parse_with_prefix = "J" + +base_value_type = "exact" +base_value = "1000" +base_units = [ { u = "Gram", p = 1}, { u = "Second", p = -2}, { u = "Meter", p = 2} ] + + + +[[unit]] +enum_name = "Hertz" +print = "Hz" +parse = ["hertz"] +parse_with_prefix = "Hz" + +base_value_type = "exact" +base_value = "1" +base_units = [ { u = "Second", p = -1} ] + + + +[[unit]] +enum_name = "Ohm" +print = "Ω" +parse = ["ohms"] +parse_with_prefix = ["ohm", "Ω"] + +base_value_type = "exact" +base_value = "1000" +base_units = [ { u = "Gram", p = 1}, { u = "Meter", p = 2}, { u = "Ampere", p = -2}, { u = "Second", p = -3} ] + + + +[[unit]] +enum_name = "Siemens" +print = "S" +parse = ["℧", "mho", "mhos", "siemens"] +parse_with_prefix = "S" + +base_value_type = "exact" +base_value = "0.001" +base_units = [ { u = "Gram", p = -1}, { u = "Meter", p = -2}, { u = "Ampere", p = 2}, { u = "Second", p = 3} ] + + + +[[unit]] +enum_name = "Coulomb" +print = "C" +parse = ["coulomb", "coulombs"] +parse_with_prefix = "C" + +base_value_type = "exact" +base_value = "0.001" +base_units = [ { u = "Ampere", p = 1}, { u = "Second", p = 1} ] + + + +[[unit]] +enum_name = "Watt" +print = "W" +parse = ["watt", "Watt", "Watts", "watts"] +parse_with_prefix = "W" + +base_value_type = "exact" +base_value = "1000" +base_units = [ { u = "Gram", p = 1}, { u = "Meter", p = 2}, { u = "Second", p = -3} ] + + + +[[unit]] +enum_name = "Volt" +print = "V" +parse = ["volt", "volts"] +parse_with_prefix = "V" + +base_value_type = "exact" +base_value = "1000" +base_units = [ { u = "Gram", p = 1}, { u = "Meter", p = 2}, { u = "Second", p = -3}, { u = "Ampere", p = -1} ] + + + +[[unit]] +enum_name = "Henry" +print = "H" +parse = ["henry", "henries", "henrys", "Henry", "Henries", "Henrys"] +parse_with_prefix = "H" + +base_value_type = "exact" +base_value = "1000" +base_units = [ { u = "Gram", p = 1}, { u = "Meter", p = 2}, { u = "Second", p = -2}, { u = "Ampere", p = -2} ] + + + +[[unit]] +enum_name = "Farad" +print = "F" +parse = ["farad", "Farad", "farads", "Farads"] +parse_with_prefix = "F" + +base_value_type = "exact" +base_value = "0.001" +base_units = [ { u = "Gram", p = -1}, { u = "Meter", p = -2}, { u = "Second", p = 4}, { u = "Ampere", p = 2} ] + + + +[[unit]] +enum_name = "ElectronVolt" +print = "eV" +parse = ["electronvolt"] +parse_with_prefix = "eV" + +base_value_type = "exact" +base_value = "1.602176634e-16" +base_units = [ { u = "Gram", p = 1}, { u = "Second", p = -2}, { u = "Meter", p = 2} ] + + + +[[unit]] +enum_name = "Weber" +print = "Wb" +parse = ["weber"] +parse_with_prefix = "Wb" + +base_value_type = "exact" +base_value = "1000" +base_units = [ { u = "Gram", p = 1}, { u = "Meter", p = 2}, { u = "Second", p = -2}, { u = "Ampere", p = -1} ] \ No newline at end of file diff --git a/units.md b/units.md index 785a8d7..c1eb3f1 100644 --- a/units.md +++ b/units.md @@ -1,30 +1,34 @@ + | [Bit](https://en.wikipedia.org/wiki/Bit) | `bits`, `bit` | + | [Byte](https://en.wikipedia.org/wiki/Byte) | `Bytes`, `bytes`, `Byte`, `byte`, `B`, `Octets`, `octets`, `Octet`, `octet` | + | [Bits per second](https://en.wikipedia.org/wiki/Data_rate_units) | `bps` | + | [Frames per second](https://en.wikipedia.org/wiki/Frame_rate) | `fps` | + | [Pixel](https://en.wikipedia.org/wiki/Pixel) | `pixels`, `pixel`, `px` | + | [DPI](https://en.wikipedia.org/wiki/Dots_per_inch) | `dpi` | + | [Dot](https://en.wikipedia.org/wiki/Dots_per_inch) | `dots`, `dot` | + | [Frame](https://en.wikipedia.org/wiki/Film_frame) | `frames`, `frame` | + +flops +kWh abbreviations + + + | [Tonne](https://en.wikipedia.org/wiki/Tonne) | `tonnes`, `tonne`, `tons`, `ton`, `t` | + | [Ounce](https://en.wikipedia.org/wiki/Ounce) | `ounces`, `ounce`, `oz` | + | [Newton](https://en.wikipedia.org/wiki/Newton_(unit)) | `newton`, `N` | + | [Pound](https://en.wikipedia.org/wiki/Pound_(mass)) | `pounds`, `pound`, `lb` | + | [Pound-force](https://en.wikipedia.org/wiki/Pound_%28force%29) | `pound_force`, `lbf` | + + + | [Becquerel](https://en.wikipedia.org/wiki/Becquerel) | `becquerel`, `Bq` | | [Bel](https://en.wikipedia.org/wiki/Decibel) | `bel` | - | [Bit](https://en.wikipedia.org/wiki/Bit) | `bits`, `bit` | - | [Bits per second](https://en.wikipedia.org/wiki/Data_rate_units) | `bps` | | [British thermal unit](https://en.wikipedia.org/wiki/British_thermal_unit) | `BTU` | - | [Byte](https://en.wikipedia.org/wiki/Byte) | `Bytes`, `bytes`, `Byte`, `byte`, `B`, `Octets`, `octets`, `Octet`, `octet` | | [Calorie](https://en.wikipedia.org/wiki/Calorie) | `calories`, `calorie`, `cal` | - | [Coulomb](https://en.wikipedia.org/wiki/Coulomb) | `coulomb`, `C` | - | [DPI](https://en.wikipedia.org/wiki/Dots_per_inch) | `dpi` | | [Degree](https://en.wikipedia.org/wiki/Degree_(angle)) | `degrees`, `degree`, `deg`, `°` | - | [Dot](https://en.wikipedia.org/wiki/Dots_per_inch) | `dots`, `dot` | - | [Electronvolt](https://en.wikipedia.org/wiki/Electronvolt) | `electronvolt`, `eV` | | [Euro](https://en.wikipedia.org/wiki/Euro) | `euros`, `euro`, `EUR`, `€` | - | [Farad](https://en.wikipedia.org/wiki/Farad) | `farad`, `F` | - | [Frame](https://en.wikipedia.org/wiki/Film_frame) | `frames`, `frame` | - | [Frames per second](https://en.wikipedia.org/wiki/Frame_rate) | `fps` | - | [Gauss](https://en.wikipedia.org/wiki/Gauss_(unit)) | `gauss` | | [Gray](https://en.wikipedia.org/wiki/Gray_(unit)) | `gray`, `Gy` | - | [Henry](https://en.wikipedia.org/wiki/Henry_(unit)) | `henrys`, `henries`, `henry`, `H` | - | [Hertz](https://en.wikipedia.org/wiki/Hertz) | `hertz`, `Hz` | - | [Joule](https://en.wikipedia.org/wiki/Joule) | `joules`, `joule`, `J` | | [Katal](https://en.wikipedia.org/wiki/Katal) | `katal`, `kat` | | [Lumen](https://en.wikipedia.org/wiki/Lumen_(unit)) | `lumen`, `lm` | | [Lux](https://en.wikipedia.org/wiki/Lux) | `lux`, `lx` | - | [Newton](https://en.wikipedia.org/wiki/Newton_(unit)) | `newton`, `N` | - | [Ohm](https://en.wikipedia.org/wiki/Ohm) | `ohms`, `ohm`, `Ω` | - | [Ounce](https://en.wikipedia.org/wiki/Ounce) | `ounces`, `ounce`, `oz` | | [PPI](https://en.wikipedia.org/wiki/Pixels_per_inch) | `ppi` | | [Parts-per-million](https://en.wikipedia.org/wiki/Parts-per_notation) | `ppm` | | [Parts-per-billion](https://en.wikipedia.org/wiki/Parts-per_notation) | `ppb` | @@ -33,18 +37,6 @@ | [Percent](https://en.wikipedia.org/wiki/Parts-per_notation) | `percent`, `pct` | | [Person](https://en.wiktionary.org/wiki/person) | `persons`, `person`, `people` | | [Piece](https://en.wiktionary.org/wiki/piece) | `pieces`, `piece` | - | [Pixel](https://en.wikipedia.org/wiki/Pixel) | `pixels`, `pixel`, `px` | - | [Pound-force](https://en.wikipedia.org/wiki/Pound_%28force%29) | `pound_force`, `lbf` | - | [Pound](https://en.wikipedia.org/wiki/Pound_(mass)) | `pounds`, `pound`, `lb` | | [RPM](https://en.wikipedia.org/wiki/RPM) | `RPM`, `rpm` | | [Radian](https://en.wikipedia.org/wiki/Radian) | `radians`, `radian`, `rad` | - | [Rod](https://en.wikipedia.org/wiki/Rod_(unit)) | `rods`, `rod` | - | [Siemens](https://en.wikipedia.org/wiki/Siemens_(unit)) | `siemens`, `S` | - | [Sievert](https://en.wikipedia.org/wiki/Sievert) | `sievert`, `Sv` | - | [Tesla](https://en.wikipedia.org/wiki/Tesla_(unit)) | `tesla`, `T` | - | [Tonne](https://en.wikipedia.org/wiki/Tonne) | `tonnes`, `tonne`, `tons`, `ton`, `t` | - | [US Dollar](https://en.wikipedia.org/wiki/USD) | `dollars`, `dollar`, `USD`, `$` | - | [Volt](https://en.wikipedia.org/wiki/Volt) | `volts`, `volt`, `V` | - | [Watt-hour](https://en.wikipedia.org/wiki/Kilowatt_hour) | `Wh` | - | [Watt](https://en.wikipedia.org/wiki/Watt) | `watts`, `watt`, `W` | - | [Weber](https://en.wikipedia.org/wiki/Weber_(unit)) | `weber`, `Wb` | \ No newline at end of file + | [Rod](https://en.wikipedia.org/wiki/Rod_(unit)) | `rods`, `rod` | \ No newline at end of file