Skip to content

Commit ffc6f41

Browse files
authored
Merge pull request #102 from EdgeTX/development-team
EdgeTX Development team
2 parents fa35888 + 2a98d73 commit ffc6f41

File tree

3 files changed

+21
-13
lines changed

3 files changed

+21
-13
lines changed

docs/about.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ The current committee members (and their discord usernames) are:
3333

3434
For more information about how the EdgeTX project is managed, see our [project bylaws page.](bylaws.md)
3535

36+
### Development Team
37+
38+
The EdgeTX Development Team is a group of active developers participating in the EdgeTX project.
39+
3640
### Donations
3741

3842
If you would like to support the project financially, we have a donation system set up at Open Collective. So if you want to help out to run the planned future online-build system and help devs purchase hardware (e.g. radio systems & development equipment), you can set-up a regular donation, or send an one-time donation via the following link: [https://opencollective.com/edgetx/donate](https://opencollective.com/edgetx/donate)

docs/bylaws.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@ The chair is responsible for closing votes and summarizing PSC member votes or a
8989

9090
The chair may appoint one member of the PSC committee as secretary to take minutes during the meetings or any other administrative tasks as agreed.
9191

92+
### EdgeTX Development Team
93+
94+
The EdgeTX Development Team consists of most active developers participating in the project. PSC members, who are also active developers themselves, are automatically seen as members of the EdgeTX Development Team. For the addition and removal of EdgeTX Development Team members a majority PSC vote is required.
95+
The affiliation as an EdgeTX Development Team member can be presented only to users abiding to the [NDA](https://edgetx.org/nda/).
96+
9297
### Code of Conduct
9398

9499
All members of the community are expected to adhere to the [Community Guildlines](https://github.com/EdgeTX/edgetx.github.io/wiki/Community-Guidlines) in all activities related to EdgeTX. PSC members help maintain user adherence to the community guidelines and can recommend the "time out" or removal of offenders, to be decided by the PSC.

docs/nda.md

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11

22
**1. Introduction**
33

4-
- This Non-Disclosure Policy ("Policy") outlines the commitment of the EdgeTX Project Steering Committee ("PSC") to maintain the confidentiality of any information provided to it.
4+
- This Non-Disclosure Policy ("Policy") outlines the commitment of the EdgeTX Project Steering Committee ("PSC") and the EdgeTX Development Team to maintain the confidentiality of any information provided to it.
55

66
**2. Definitions**
77

8-
- **Confidential Information**: Any data or information, oral or written, disclosed to the PSC, which is designated as confidential or should reasonably be understood to be confidential given the nature of the information and the circumstances surrounding disclosure.
9-
- **PSC**: Refers to the EdgeTX Project Steering Committee.
8+
- **EdgeTX Team**: Refers to the EdgeTX Project Steering Committee and the EdgeTX Development Team.
9+
- **Confidential Information**: Any data or information, oral or written, disclosed to the EdgeTX Team, which is designated as confidential or should reasonably be understood to be confidential given the nature of the information and the circumstances surrounding disclosure.
1010

1111
**3. Purpose**
1212

13-
- The purpose of this Policy is to ensure the protection of sensitive and proprietary information shared with the PSC in relation to the EdgeTX Project.
13+
- The purpose of this Policy is to ensure the protection of sensitive and proprietary information shared with the EdgeTX Team in relation to the EdgeTX Project.
1414

1515
**4. Scope**
1616

17-
- This Policy applies to all past, present and future members of the PSC.
17+
- This Policy applies to all past, present and future members of the EdgeTX Team.
1818

1919
**5. Confidentiality Obligations**
2020

21-
- The PSC commits to:
21+
- The EdgeTX Team commits to:
2222

2323
- Not disclose, reproduce, or use for any purpose other than the EdgeTX Project, any Confidential Information received from any party without express written consent from the disclosing party.
2424
- Take all reasonable precautions to prevent unauthorized disclosure or use of Confidential Information.
25-
- Only share Confidential Information within the PSC on a "need-to-know" basis, with members bound by the same confidentiality obligations.
25+
- Only share Confidential Information within the EdgeTX Team on a "need-to-know" basis, with members bound by the same confidentiality obligations.
2626

2727
**6. Exclusions**
2828

2929
- This Policy does not cover information that is:
30-
- Already known to the PSC at the time of disclosure.
30+
- Already known to the EdgeTX Team at the time of disclosure.
3131
- Publicly available or becomes publicly available other than through a breach of this Policy.
32-
- Independently developed by the PSC without reference to the Confidential Information.
32+
- Independently developed by the EdgeTX Team without reference to the Confidential Information.
3333

3434
**7. Handling of Confidential Information**
3535

36-
- The PSC shall:
36+
- The EdgeTX Team shall:
3737
- Store all physical copies of Confidential Information in secure locations with restricted access.
3838
- Store electronic Confidential Information only on secure and encrypted devices/networks.
3939
- Dispose of Confidential Information in a secure and responsible manner when it is no longer required for the EdgeTX Project.
4040

4141
**8. Reporting and Remedies**
4242

43-
- Any suspected or actual breach of this Policy must be reported immediately to the Committee Chairman.
43+
- Any suspected or actual breach of this Policy must be reported immediately to the Project Steering Committee Chairman.
4444
- Upon confirmation of a breach, appropriate corrective action will be taken, which may include disciplinary action, termination, or legal action.
4545

4646
**9. Duration of Confidentiality Obligations**
@@ -53,6 +53,5 @@
5353

5454
**13. Acknowledgement**
5555

56-
- By participating in the EdgeTX Project Steering Committee, PSC members acknowledge that they have read, understood, and agree to be bound by this Policy.
57-
56+
- By participating in the EdgeTX Team, team members acknowledge that they have read, understood, and agree to be bound by this Policy.
5857

0 commit comments

Comments
 (0)