From 767448f30f33e73010ea302fd1a40172889b499a Mon Sep 17 00:00:00 2001 From: Foster Irwin Date: Sat, 17 Apr 2021 00:37:28 -0600 Subject: [PATCH 1/6] added legal section for trademark and commercial license --- website/docs/legal/licensing.md | 10 ++++++++++ website/docs/legal/trademark.md | 6 ++++++ website/sidebars.js | 4 ++++ 3 files changed, 20 insertions(+) create mode 100644 website/docs/legal/licensing.md create mode 100644 website/docs/legal/trademark.md diff --git a/website/docs/legal/licensing.md b/website/docs/legal/licensing.md new file mode 100644 index 00000000..db0b0090 --- /dev/null +++ b/website/docs/legal/licensing.md @@ -0,0 +1,10 @@ +--- +id: licensing +title: Licensing & Commercial Projects Usage +sidebar_label: Licensing +--- +You are hereby granted a two year non-exclusive license to use the Meshtastic® logo and trademark on your product/project. No fee is required for this usage, though if you wish keeping $1/unit set-aside so that it can eventually fund [meshtastic.org](https://meshtastic.org) it would be appreciated. + +We only ask that you include a line in your support text that states: + +> "Meshtastic® is a registered trademark of Geeksville Industries LLC. Meshtastic software components are released under various licenses, see github for details. No warranty is provided - use at your own risk." diff --git a/website/docs/legal/trademark.md b/website/docs/legal/trademark.md new file mode 100644 index 00000000..277d7f07 --- /dev/null +++ b/website/docs/legal/trademark.md @@ -0,0 +1,6 @@ +--- +id: trademark +title: Trademark Rules & Brand Guidelines +sidebar_label: Trademark +--- +Meshtastic® is a registered trademark of Geeksville Industries LLC. Meshtastic software components are released under various licenses, see github for details. No warranty is provided - use at your own risk. diff --git a/website/sidebars.js b/website/sidebars.js index d5decf5f..8d65ca72 100644 --- a/website/sidebars.js +++ b/website/sidebars.js @@ -84,5 +84,9 @@ module.exports = { ], }, ], + Legal: [ + "legal/licensing", + "legal/trademark", + ], }, }; From afc8e530aedc301bc2d0ac1f0cbd0eae63ca8d69 Mon Sep 17 00:00:00 2001 From: Foster Irwin Date: Sat, 17 Apr 2021 00:38:48 -0600 Subject: [PATCH 2/6] remove quotations from blockquote --- website/docs/legal/licensing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/legal/licensing.md b/website/docs/legal/licensing.md index db0b0090..6c119619 100644 --- a/website/docs/legal/licensing.md +++ b/website/docs/legal/licensing.md @@ -7,4 +7,4 @@ You are hereby granted a two year non-exclusive license to use the Meshtastic® We only ask that you include a line in your support text that states: -> "Meshtastic® is a registered trademark of Geeksville Industries LLC. Meshtastic software components are released under various licenses, see github for details. No warranty is provided - use at your own risk." +> Meshtastic® is a registered trademark of Geeksville Industries LLC. Meshtastic software components are released under various licenses, see github for details. No warranty is provided - use at your own risk. From 5e4f9cb3711ed625e3b96ed52821d246b98f9683 Mon Sep 17 00:00:00 2001 From: Foster Irwin Date: Sat, 17 Apr 2021 07:54:35 -0600 Subject: [PATCH 3/6] added legal to footer --- website/docusaurus.config.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js index bd43e184..bfcf0d94 100644 --- a/website/docusaurus.config.js +++ b/website/docusaurus.config.js @@ -101,6 +101,10 @@ module.exports = { label: "GitHub", href: "https://github.com/meshtastic/meshtastic", }, + { + label: "Legal", + to: "docs/legal", + }, ], }, ], From 5b1de67a74943766738961e857d30bfad98edb23 Mon Sep 17 00:00:00 2001 From: Foster Irwin Date: Sat, 17 Apr 2021 07:55:18 -0600 Subject: [PATCH 4/6] added legal overview placholder page --- website/docs/legal/overview.md | 6 ++++++ website/sidebars.js | 1 + 2 files changed, 7 insertions(+) create mode 100644 website/docs/legal/overview.md diff --git a/website/docs/legal/overview.md b/website/docs/legal/overview.md new file mode 100644 index 00000000..5cd7721b --- /dev/null +++ b/website/docs/legal/overview.md @@ -0,0 +1,6 @@ +--- +id: overview +title: Overview +sidebar_label: Overview +slug: /legal +--- diff --git a/website/sidebars.js b/website/sidebars.js index 8d65ca72..1ad710b9 100644 --- a/website/sidebars.js +++ b/website/sidebars.js @@ -85,6 +85,7 @@ module.exports = { }, ], Legal: [ + "legal/overview", "legal/licensing", "legal/trademark", ], From cc22e0c2341969349f094733ca36551f41010a26 Mon Sep 17 00:00:00 2001 From: Foster Irwin Date: Mon, 19 Apr 2021 08:08:30 -0600 Subject: [PATCH 5/6] removed faq to legal --- website/docs/developers/device/faq.md | 40 --------------------------- website/sidebars.js | 1 - 2 files changed, 41 deletions(-) delete mode 100644 website/docs/developers/device/faq.md diff --git a/website/docs/developers/device/faq.md b/website/docs/developers/device/faq.md deleted file mode 100644 index 26f521a9..00000000 --- a/website/docs/developers/device/faq.md +++ /dev/null @@ -1,40 +0,0 @@ ---- -id: faq -title: Frequently Asked Questions -sidebar_label: FAQ ---- - -## Disclaimers - -This project is still pretty young but moving at a pretty good pace. Not all features are fully implemented in the current alpha builds. -Most of these problems should be solved by the beta release (within three months): - -- We don't make these devices and they haven't been tested by UL or the FCC. If you use them you are experimenting and we can't promise they won't burn your house down ;-) -- The encryption implementation is good but see this list of [caveats](/software/other/crypto.md#summary-of-strengthsweaknesses-of-our-current-implementation) to determine risks you might face. -- A number of (straightforward) software work items have to be completed before battery life matches our measurements, currently battery life is about three days. Join us on chat if you want the spreadsheet of power measurements/calculations. -- The Android API needs to be documented better -- No one has written an iOS app yet. But some good souls [are talking about it](https://github.com/meshtastic/Meshtastic-esp32/issues/14) ;-) - -For more details see the [device software TODO](https://github.com/meshtastic/Meshtastic-esp32/blob/master/docs/software/TODO.md) or the [Android app TODO](https://github.com/meshtastic/Meshtastic-Android/blob/master/TODO.md). - -## FAQ - -If you have a question missing from this faq, please [ask in our discussion forum](https://meshtastic.discourse.group/). And if you are feeling extra generous send in a pull-request for this faq.md with whatever we answered ;-). - -### Q: Which of the various supported radios should I buy? - -Basically you just need the radio + (optional but recommended) battery. The TBEAM is usually better because it has gps and huge battery socket. The Heltec is basically the same hardware but without the GPS (the phone provides position data to the radio in that case, so the behavior is similar - but it does burn some battery in the phone). Also the battery for the Heltec can be smaller. - -In addition to Aliexpress, (banggood.com) usually has stock and faster shipping, or Amazon. If buying a TBEAM, make sure to buy a version that includes the OLED screen - this project doesn't absolutely require the screen, but we use it if is installed. - -@claesg has added links to various 3D printable cases, you can see them at (www.meshtastic.org). - -### Q: Do you have plans to commercialize this project - -Nope. though if some other person/group wanted to use this software and a more customized device we think that would be awesome (as long as they obey the GPL license). - -### Q: Does this project use patented algorithms? - -(Kindly borrowed from the geeks at [ffmpeg](http://ffmpeg.org/legal.html)) - -We do not know, we are not lawyers so we are not qualified to answer this. Also we have never read patents to implement any part of this, so even if we were qualified we could not answer it as we do not know what is patented. Furthermore the sheer number of software patents makes it impossible to read them all so no one (lawyer or not) could answer such a question with a definite no. We are merely geeks experimenting on a fun and free project. diff --git a/website/sidebars.js b/website/sidebars.js index 1ad710b9..8cfa65d8 100644 --- a/website/sidebars.js +++ b/website/sidebars.js @@ -78,7 +78,6 @@ module.exports = { Device: [ "developers/device/radio-settings", "developers/device/supported-hardware", - "developers/device/faq", "developers/device/http-api", "developers/device/documents", ], From b7429e6e331becb5187099ba01f4b6617c7d8fdc Mon Sep 17 00:00:00 2001 From: Foster Irwin Date: Mon, 19 Apr 2021 08:09:03 -0600 Subject: [PATCH 6/6] removed general faq details from legal section --- website/docs/legal/overview.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/website/docs/legal/overview.md b/website/docs/legal/overview.md index 5cd7721b..26142d7f 100644 --- a/website/docs/legal/overview.md +++ b/website/docs/legal/overview.md @@ -4,3 +4,21 @@ title: Overview sidebar_label: Overview slug: /legal --- +## Disclaimers + +This project is still pretty young but moving at a pretty good pace. Not all features are fully implemented in the current alpha builds. + +* We don't make these devices and they haven't been tested by UL or the FCC. If you use them you are experimenting and we can't promise they won't burn your house down ;-) +* The encryption implementation is good but see this list of [caveats](/software/other/crypto.md#summary-of-strengthsweaknesses-of-our-current-implementation) to determine risks you might face. + +## Legal FAQ + +### Q: Do you have plans to commercialize this project + +Nope. though if some other person/group wanted to use this software and a more customized device we think that would be awesome (as long as they obey the GPL license). [See more details here](licensing.md). + +### Q: Does this project use patented algorithms? + +(Kindly borrowed from the geeks at [ffmpeg](http://ffmpeg.org/legal.html)) + +We do not know, we are not lawyers so we are not qualified to answer this. Also we have never read patents to implement any part of this, so even if we were qualified we could not answer it as we do not know what is patented. Furthermore the sheer number of software patents makes it impossible to read them all so no one (lawyer or not) could answer such a question with a definite no. We are merely geeks experimenting on a fun and free project.