From 0a4c2a4a8fcdfe816cacef5702fad157a8a884df Mon Sep 17 00:00:00 2001
From: Peter Feerick <peter.feerick@gmail.com>
Date: Thu, 21 Apr 2022 15:20:04 +1000
Subject: [PATCH] chore(github): Switch over to yml bug form

---
 .github/ISSUE_TEMPLATE/bug-report.yml | 33 ++++++++++++++++++---------
 .github/ISSUE_TEMPLATE/bug.md         | 27 ----------------------
 2 files changed, 22 insertions(+), 38 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/bug.md

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 9d31c0f9c..78d8d348c 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -7,6 +7,10 @@ body:
     attributes:
       value: |
         Thanks for taking the time to fill out this bug report!
+
+        Please note that this is not the place to make feature requests or
+        ask for help. For this, please use the (Discord server)[https://discord.gg/wF9wUKnZ6H]
+        and (Discussion forum)[https://github.com/EdgeTX/edgetx/discussions].
   - type: checkboxes
     attributes:
       label: Is there an existing issue for this?
@@ -17,13 +21,13 @@ body:
   - type: textarea
     attributes:
       label: Current Behavior
-      description: A concise description of what you're experiencing.
+      description: A clean and concise description of what you're experiencing.
     validations:
       required: true
   - type: textarea
     attributes:
       label: Expected Behavior
-      description: A concise description of what you expected to happen.
+      description: What is it that you expected to happen?
     validations:
       required: true
   - type: textarea
@@ -34,7 +38,7 @@ body:
         1. Push throttle up.
         2. Push throttle down.
         3. Flick SWC on and off three times.
-        4. See error...
+        4. See error.
     validations:
       required: true
   - type: dropdown
@@ -43,7 +47,7 @@ body:
       label: Version
       description: What version of EdgeTX software are you running?
       options:
-        - 2.7.0 (Default)
+        - 2.7.0
         - 2.6.0
         - 2.5.0
         - 2.4.0
@@ -57,13 +61,18 @@ body:
       description: What transmitter are you using?
       options:
         - Flysky NV14
-        - Frsky X9D
-        - Frsky X9D+
-        - Frsky X9D+2019
-        - Frsky X9E
-        - Frsky X10
-        - Frsky X10S
-        - Frsky X12
+        - FrSky QX7
+        - FrSky QX7 Access
+        - FrSky X9D
+        - FrSky X9D+
+        - FrSky X9D+2019
+        - FrSky X9E / X9E Hall
+        - FrSky X9 Lite / Lite S
+        - FrSky X10/X10S)
+        - FrSky X10 Access
+        - FrSky X12
+        - FrSky X-Lite / X-Lite S
+        - Jumper T12
         - Jumper T16
         - Jumper T18
         - Jumper T-Lite
@@ -80,6 +89,8 @@ body:
       label: Anything else?
       description: |
         Screenshots? References? Anything that will give us more context about the issue you are encountering!
+        This includes if you are running customised firmware or have made hardware modifications to the transmitter
+        which could have some bearing on the issue.
 
         Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
     validations:
diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
deleted file mode 100644
index 4940fc9a8..000000000
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-name: Bug report
-about: Create a report to help the EdgeTX team to improve EdgeTX
-
----
-*Before submitting,  search the open issue if there is already a report of the bug*
-
-Also often minor bugs are already fixed in nightly builds, often it is
-a good idea to test (in a controlled environment like a bench setup)
-with a nightly firmware to see if the bug still exists.
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**General information**
- - EdgeTX version (e.g. 2.4.0 or nightly and #commit number)
- - Hardware (e.g. Frsky X9D+ or RM TX12S)
-