From 6bc2ed4ca7fead1596d1e0d4f102ff38f8aec71d Mon Sep 17 00:00:00 2001
From: Edward Shin <contact@edwardsh.in>
Date: Sat, 16 Nov 2019 21:54:42 -0500
Subject: [PATCH] Add JLCPCB fab config and fix DirtyPCB config

Adds a configuration for JLCPCB gerber extension conventions. Also, fix
generation of DirtyPCB files due to typo.
---
 CONTRIBUTE.md               |   2 +-
 pcbmode/pcbmode_config.json | 111 ++++++++++++++++++++++++------------
 2 files changed, 77 insertions(+), 36 deletions(-)

diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md
index ae5cd060..8d62c611 100644
--- a/CONTRIBUTE.md
+++ b/CONTRIBUTE.md
@@ -10,4 +10,4 @@ If you agree add your full name and email address that you'd use for your contri
 
 ## Those who agreed:
 full name, email address
-
+Edward Shin, contact@edwardsh.in
diff --git a/pcbmode/pcbmode_config.json b/pcbmode/pcbmode_config.json
index 610ddecd..83a1c74b 100644
--- a/pcbmode/pcbmode_config.json
+++ b/pcbmode/pcbmode_config.json
@@ -126,7 +126,7 @@
             "solderpaste": {"ext": "ger"}
           },
           "other":
-   	  {
+          {
             "documentation": {"ext": "ger"},
             "outline": {"ext": "ger"}
           }
@@ -137,7 +137,7 @@
           "non-plated": {"ext": "txt"}
         },
         "text":
-	{
+        {
           "readme": {"ext": "txt"}
         }
       }
@@ -167,7 +167,7 @@
             "solderpaste": {"ext": "GBP"}  
           },
           "other":
-   	  {
+          {
             "documentation": {"ext": "GBR"},
             "outline": {"ext": "GKO"}
           }
@@ -178,7 +178,7 @@
           "non-plated": {"end": "_NPTH", "ext": "drl"}
         },
         "text":
-	{
+        {
           "readme": {"ext": "txt"}
         }
       }
@@ -187,41 +187,82 @@
     {
       "filenames":
       {
-	"gerbers":
-	{
-	  "top":
-	  {
-	    "copper": {"ext": "gtl"},
-	    "soldermask": {"ext": "gts"},
-	    "silkscreen": {"ext": "gto"},
-	    "solderpaste": {"ext": "gtp"}
-	  },
+        "gerbers":
+        {
+          "top":
+          {
+            "conductor": {"ext": "gtl"},
+            "soldermask": {"ext": "gts"},
+            "silkscreen": {"ext": "gto"},
+            "solderpaste": {"ext": "gtp"}
+          },
           "internal":
           {
             "conductor": {"ext": "ger"}
           },
-	  "bottom":
-	  {
-	    "copper": {"ext": "gbl"},
-	    "soldermask": {"ext": "gbs"},
-	    "silkscreen": {"ext": "gbo"},
-	    "solderpaste": {"ext": "gbp"}
-	  },
-	  "other":
-	  {
-	    "documentation": {"ext": "ger"},
-	    "outline": {"ext": "gbr"}
-	  }
-	},
-	"drills":
-	{
-	  "plated": {"ext": "txt"},
-	  "non-plated": {"ext": "txt"}
-	},
-	"text":
-	{
-	  "readme": {"ext": "txt"}
-	}
+          "bottom":
+          {
+            "conductor": {"ext": "gbl"},
+            "soldermask": {"ext": "gbs"},
+            "silkscreen": {"ext": "gbo"},
+            "solderpaste": {"ext": "gbp"}
+          },
+          "other":
+          {
+            "documentation": {"ext": "ger"},
+            "outline": {"ext": "gbr"}
+          }
+        },
+        "drills":
+        {
+          "plated": {"ext": "txt"},
+          "non-plated": {"ext": "txt"}
+        },
+        "text":
+        {
+          "readme": {"ext": "txt"}
+        }
+      }
+    },
+    "jlcpcb":
+    {
+      "filenames":
+      {
+        "gerbers":
+        {
+          "top":
+          {
+            "conductor": {"ext": "GTL"},
+            "soldermask": {"ext": "GTS"},
+            "silkscreen": {"ext": "GTO"},
+            "solderpaste": {"ext": "GTP"}
+          },
+          "internal":
+          {
+            "conductor": {"ext": "GER"}
+          },
+          "bottom":
+          {
+            "conductor": {"ext": "GBL"},
+            "soldermask": {"ext": "GBS"},
+            "silkscreen": {"ext": "GBO"},
+            "solderpaste": {"ext": "GBP"}
+          },
+          "other":
+          {
+            "documentation": {"ext": "GER"},
+            "outline": {"ext": "GML"}
+          }
+        },
+        "drills":
+        {
+          "plated": {"ext": "TXT"},
+          "non-plated": {"ext": "TXT"}
+        },
+        "text":
+        {
+          "readme": {"ext": "TXT"}
+        }
       }
     }
   }