From 4f2e5643d97c9379cb8b6e5ecec0f4c95731c2cb Mon Sep 17 00:00:00 2001
From: Marius Stanciu <marius.adrian@gmail.com>
Date: Tue, 21 May 2019 16:13:36 +0300
Subject: [PATCH] - added the file extension .ncd to the Excellon file
 extension list - solved parsing issue for Excellon files generated by older
 Eagle versions (v6.x)

---
 FlatCAMApp.py | 4 ++--
 README.md     | 5 +++++
 camlib.py     | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/FlatCAMApp.py b/FlatCAMApp.py
index 5e7c1994..40f8feae 100644
--- a/FlatCAMApp.py
+++ b/FlatCAMApp.py
@@ -1905,7 +1905,7 @@ class App(QtCore.QObject):
                          'dim', 'mil', 'grb', 'top', 'bot', 'smt', 'smb', 'sst', 'ssb', 'spt', 'spb', 'pho', 'gdo',
                          'art', 'gbd', 'gb0', 'gb1', 'gb2', 'gb3', 'g4', 'gb5', 'gb6', 'gb7', 'gb8', 'gb9'
                          ]
-        self.exc_list = ['drl', 'txt', 'xln', 'drd', 'tap', 'exc']
+        self.exc_list = ['drl', 'txt', 'xln', 'drd', 'tap', 'exc', 'ncd']
         self.gcode_list = ['nc', 'ncc', 'tap', 'gcode', 'cnc', 'ecs', 'fnc', 'dnc', 'ncg', 'gc', 'fan', 'fgc', 'din',
                       'xpi', 'hnc', 'h', 'i', 'ncp', 'min', 'gcd', 'rol', 'mpr', 'ply', 'out', 'eia', 'plt', 'sbp',
                       'mpf']
@@ -5945,7 +5945,7 @@ class App(QtCore.QObject):
         self.report_usage("on_fileopenexcellon")
         App.log.debug("on_fileopenexcellon()")
 
-        _filter_ = "Excellon Files (*.drl *.txt *.xln *.drd *.tap *.exc);;" \
+        _filter_ = "Excellon Files (*.drl *.txt *.xln *.drd *.tap *.exc *.ncd);;" \
                    "All Files (*.*)"
 
         try:
diff --git a/README.md b/README.md
index d32668d5..e611b28c 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,11 @@ CAD program, and create G-Code for Isolation routing.
 
 =================================================
 
+21.05.2019
+
+- added the file extension .ncd to the Excellon file extension list
+- solved parsing issue for Excellon files generated by older Eagle versions (v6.x)
+
 20.05.2019
 
 - more PEP8 changes in Gerber editor
diff --git a/camlib.py b/camlib.py
index a0ee2667..052db845 100644
--- a/camlib.py
+++ b/camlib.py
@@ -3878,6 +3878,7 @@ class Excellon(Geometry):
                 # Header Begin (M48) #
                 if self.hbegin_re.search(eline):
                     in_header = True
+                    headerless = False
                     log.warning("Found start of the header: %s" % eline)
                     continue