From 23175f85000ec58aab95c5e8e090a827f1959dc7 Mon Sep 17 00:00:00 2001
From: "Salvador E. Tropea" <salvador@inti.gob.ar>
Date: Thu, 9 Feb 2023 09:02:37 -0300
Subject: [PATCH] [KiCad 7] Solved drill marks constants rename

---
 kibot/drill_marks.py | 18 +++++++++---------
 kibot/gs.py          |  8 ++++++++
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/kibot/drill_marks.py b/kibot/drill_marks.py
index ff0cd0cc..1a98c183 100644
--- a/kibot/drill_marks.py
+++ b/kibot/drill_marks.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2020-2022 Salvador E. Tropea
-# Copyright (c) 2020-2022 Instituto Nacional de Tecnología Industrial
+# Copyright (c) 2020-2023 Salvador E. Tropea
+# Copyright (c) 2020-2023 Instituto Nacional de Tecnología Industrial
 # License: GPL-3.0
 # Project: KiBot (formerly KiPlot)
-from pcbnew import PCB_PLOT_PARAMS
+from .gs import NO_DRILL_SHAPE, SMALL_DRILL_SHAPE, FULL_DRILL_SHAPE
 from .out_any_layer import AnyLayerOptions
 from . import log
 
@@ -11,15 +11,15 @@ logger = log.get_logger()
 
 # Mappings to KiCad values
 DRILL_MARKS_MAP = {
-                   'none': PCB_PLOT_PARAMS.NO_DRILL_SHAPE,
-                   'small': PCB_PLOT_PARAMS.SMALL_DRILL_SHAPE,
-                   'full': PCB_PLOT_PARAMS.FULL_DRILL_SHAPE,
+                   'none': NO_DRILL_SHAPE,
+                   'small': SMALL_DRILL_SHAPE,
+                   'full': FULL_DRILL_SHAPE,
                   }
 # Mappings from KiCad values
 DRILL_MARKS_REV_MAP = {
-                       PCB_PLOT_PARAMS.NO_DRILL_SHAPE: 'none',
-                       PCB_PLOT_PARAMS.SMALL_DRILL_SHAPE: 'small',
-                       PCB_PLOT_PARAMS.FULL_DRILL_SHAPE: 'full',
+                       NO_DRILL_SHAPE: 'none',
+                       SMALL_DRILL_SHAPE: 'small',
+                       FULL_DRILL_SHAPE: 'full',
                       }
 
 
diff --git a/kibot/gs.py b/kibot/gs.py
index aca8448e..c9f76a52 100644
--- a/kibot/gs.py
+++ b/kibot/gs.py
@@ -26,6 +26,14 @@ if hasattr(pcbnew, 'IU_PER_MM'):
 else:
     IU_PER_MM = pcbnew.pcbIUScale.IU_PER_MM
     IU_PER_MILS = pcbnew.pcbIUScale.IU_PER_MILS
+if hasattr(pcbnew, 'DRILL_MARKS_NO_DRILL_SHAPE'):
+    NO_DRILL_SHAPE = pcbnew.DRILL_MARKS_NO_DRILL_SHAPE
+    SMALL_DRILL_SHAPE = pcbnew.DRILL_MARKS_SMALL_DRILL_SHAPE
+    FULL_DRILL_SHAPE = pcbnew.DRILL_MARKS_FULL_DRILL_SHAPE
+else:
+    NO_DRILL_SHAPE = pcbnew.PCB_PLOT_PARAMS.NO_DRILL_SHAPE
+    SMALL_DRILL_SHAPE = pcbnew.PCB_PLOT_PARAMS.SMALL_DRILL_SHAPE
+    FULL_DRILL_SHAPE = pcbnew.PCB_PLOT_PARAMS.FULL_DRILL_SHAPE
 
 
 class GS(object):