The aperture macro rotation argument is now optional

jpt13653903 · Aug 9, 2024 · b96586a · b96586a
1 parent 29d919c
commit b96586a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/Engine/Makefile b/Engine/Makefile
@@ -27,7 +27,7 @@ Libraries  =
 LibInclude =
 #-------------------------------------------------------------------------------
 
-Version = -DMAJOR_VERSION=1 -DMINOR_VERSION=10
+Version = -DMAJOR_VERSION=1 -DMINOR_VERSION=11
 
 Objects  = $(shell find Tools       -iname "*.cpp")
 Objects += $(shell find Toolbox/Cpp -iname "*.cpp")

diff --git a/Engine/Tools/Gerber/Gerber/GerberMacro.cpp b/Engine/Tools/Gerber/Gerber/GerberMacro.cpp
@@ -1004,6 +1004,11 @@ bool GerberMacro::Float(double* Number){
   double    Scale   = 0.1;
   unsigned  i       = Index;
 
+  // This could be an optional argument
+  if(Index < Length && Buffer[Index] == '*'){
+    return true;
+  }
+
   if(Index < Length && Buffer[Index] == '-'){
     Sign = true;
     Index++;
@@ -1211,6 +1216,7 @@ GerberMacro::OPERATOR_ITEM* GerberMacro::Factor(){
   }else{
     Item = Variable();
     if(!Item){
+      d = 0.0; // Default in case the argument is optional
       if(!Float(&d)){
         printf("Error: Float expected\n");
         return 0;

diff --git a/ReadMe.md b/ReadMe.md
@@ -53,6 +53,11 @@ Git sort it out for you.
 
 ## Changes:
 
+#### 2024-08-09
+
+- Version-bump to 1.11
+- The aperture macro rotation argument is now optional
+
 #### 2024-01-13
 
 - Version-bump to 1.10