Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support additional messages & Dual licensing with MIT #50

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ authors = [
"AeroRust <aerospace.rust@gmail.com>"
]
description = "Simple NMEA 0183 parser"
license = "Apache-2.0"
license = "MIT OR Apache-2.0"
keywords = ["NMEA", "gps", "glonass", "coordinate", "position"]
categories = ["parser-implementations", "no-std", "embedded"]
repository = "https://github.com/AeroRust/nmea"
Expand Down Expand Up @@ -38,6 +38,7 @@ quickcheck = { version = "1.0.3", default-features = false }
approx = "0.5.1"
pretty_assertions = "1"
doc-comment = "0.3"
once_cell = "1"

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt → LICENSE-APACHE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Copyright 2016 Felix Obenhuber
Copyright 2020 ÄroRust
Copyright 2020 ÄroRust

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
26 changes: 26 additions & 0 deletions LICENSE-MIT
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
Copyright 2016 Felix Obenhuber
Copyright 2020 ÄroRust

Permission is hereby granted, free of charge, to any
person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the
Software without restriction, including without
limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software
is furnished to do so, subject to the following
conditions:

The above copyright notice and this permission notice
shall be included in all copies or substantial portions
of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
16 changes: 10 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@
[![Version](https://img.shields.io/crates/v/nmea.svg)](https://crates.io/crates/nmea)
[![Build Status](https://github.com/AeroRust/nmea/workflows/CI/badge.svg)](https://github.com/AeroRust/nmea/actions?query=workflow%3ACI+branch%3Amaster)
[![codecov](https://codecov.io/gh/AeroRust/nmea/branch/master/graph/badge.svg)](https://codecov.io/gh/AeroRust/nmea)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/AeroRust/nmea/blob/master/LICENSE.txt)
[![License MIT/Apache-2](https://img.shields.io/crates/l/nmea.svg)](./LICENSE-APACHE)

[Complete documentation can be found on www.docs.rs/nmea][doc]

NMEA 0183 sentence parser for Rust.
NMEA 0183 sentence parser for Rust.

Supported sentences:
- BWC
- BOD (untested)
- BWC (supported by `parse()`, but not by `Nmea::parse()`)
- GBS (untested)
- GGA
- GLL
- GNS
Expand Down Expand Up @@ -68,12 +70,14 @@ The Minimum supported Rust version (or MSRV) is **1.56**.

We use `#![deny(unsafe_code)]` for a fully `unsafe`-free crate.


## License

This project is licensed under the [Apache-2.0](./LICENSE.txt).
Licensed under either of [Apache License, Version 2.0](./LICENSE-APACHE)
or [MIT license](./LICENSE-MIT) at your option.

### Contribution

Unless you explicitly state otherwise, any contribution intentionally submitted
for inclusion in the project by you, shall be licensed as Apache-2.0,
without any additional terms or conditions.
for inclusion in this project by you, as defined in the Apache-2.0 license,
shall be dual licensed as above, without any additional terms or conditions.
Loading