Merge pull request #18 from 10mi2/p-10-bt-settings-configs

Updated Othermill settings, added OthermillPro and bt_cncmm, fixes #10
synthetos · Oct 28, 2019 · 47c844e · 47c844e
2 parents 34e6cf0 + bbe778b
commit 47c844e
Show file tree

Hide file tree

Showing 6 changed files with 328 additions and 43 deletions.
diff --git a/g2core.atsln b/g2core.atsln
@@ -1,19 +1,21 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Atmel Studio Solution File, Format Version 11.00
-VisualStudioVersion = 14.0.25420.1
+VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{E66E83B9-2572-4076-B26E-6BE79FF3018A}") = "g2core", "g2core\g2core.cppproj", "{44EA8FEC-55D7-4149-8A78-A574FC26BF51}"
 EndProject
 Project("{E66E83B9-2572-4076-B26E-6BE79FF3018A}") = "Motate", "Motate\Motate.cppproj", "{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		bt_cncmm|ARM = bt_cncmm|ARM
 		G2v9k|ARM = G2v9k|ARM
 		gQuadratic on AxiDraw v3|ARM = gQuadratic on AxiDraw v3|ARM
 		gQuintic on AxiDraw v3|ARM = gQuintic on AxiDraw v3|ARM
 		gShield|ARM = gShield|ARM
 		Makeblock-v9|ARM = Makeblock-v9|ARM
 		Othermill|ARM = Othermill|ARM
+		OthermillPro|ARM = OthermillPro|ARM
 		PrintrbotSimple1403-printrboardG2v3|ARM = PrintrbotSimple1403-printrboardG2v3|ARM
 		PrintrbotSimple1608-printrboardG2v3|ARM = PrintrbotSimple1608-printrboardG2v3|ARM
 		ProbotixV90|ARM = ProbotixV90|ARM
@@ -31,6 +33,8 @@ Global
 		Zen7x12|ARM = Zen7x12|ARM
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.bt_cncmm|ARM.ActiveCfg = bt_cncmm|ARM
+		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.bt_cncmm|ARM.Build.0 = bt_cncmm|ARM
 		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.G2v9k|ARM.ActiveCfg = G2v9k|ARM
 		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.G2v9k|ARM.Build.0 = G2v9k|ARM
 		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.G2v9k|ARM.Deploy.0 = G2v9k|ARM
@@ -44,14 +48,16 @@ Global
 		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.Makeblock-v9|ARM.Build.0 = Makeblock-v9|ARM
 		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.Othermill|ARM.ActiveCfg = Othermill|ARM
 		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.Othermill|ARM.Build.0 = Othermill|ARM
+		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.OthermillPro|ARM.ActiveCfg = OthermillPro|ARM
+		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.OthermillPro|ARM.Build.0 = OthermillPro|ARM
 		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.PrintrbotSimple1403-printrboardG2v3|ARM.ActiveCfg = PrintrbotSimple1403-printrboardG2v3|ARM
 		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.PrintrbotSimple1403-printrboardG2v3|ARM.Build.0 = PrintrbotSimple1403-printrboardG2v3|ARM
 		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.PrintrbotSimple1608-printrboardG2v3|ARM.ActiveCfg = PrintrbotSimple1608-printrboardG2v3|ARM
 		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.PrintrbotSimple1608-printrboardG2v3|ARM.Build.0 = PrintrbotSimple1608-printrboardG2v3|ARM
 		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.ProbotixV90|ARM.ActiveCfg = ProbotixV90|ARM
 		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.ProbotixV90|ARM.Build.0 = ProbotixV90|ARM
-		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.Quintic-Ender|ARM.ActiveCfg = Quintic|ARM
-		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.Quintic-Ender|ARM.Build.0 = Quintic|ARM
+		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.Quintic-Ender|ARM.ActiveCfg = qQuintic on AxiDraw v3|ARM
+		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.Quintic-Ender|ARM.Build.0 = qQuintic on AxiDraw v3|ARM
 		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.sbv300|ARM.ActiveCfg = sbv300|ARM
 		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.sbv300|ARM.Build.0 = sbv300|ARM
 		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.Shapeoko2|ARM.ActiveCfg = Shapeoko2|ARM
@@ -69,20 +75,25 @@ Global
 		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.TestV9|ARM.Build.0 = TestV9|ARM
 		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.Ultimakerv9k|ARM.ActiveCfg = Ultimakerv9k|ARM
 		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.Ultimakerv9k|ARM.Build.0 = Ultimakerv9k|ARM
-		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.xcarve-extended|ARM.ActiveCfg = xcarve-extended|ARM
-		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.xcarve-extended|ARM.Build.0 = xcarve-extended|ARM
+		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.xcarve-extended|ARM.ActiveCfg = PrintrbotPlay-v3|ARM
+		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.xcarve-extended|ARM.Build.0 = PrintrbotPlay-v3|ARM
 		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.Zen7x12|ARM.ActiveCfg = Zen7x12|ARM
 		{44EA8FEC-55D7-4149-8A78-A574FC26BF51}.Zen7x12|ARM.Build.0 = Zen7x12|ARM
+		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.bt_cncmm|ARM.ActiveCfg = Stub|ARM
+		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.bt_cncmm|ARM.Build.0 = Stub|ARM
 		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.G2v9k|ARM.ActiveCfg = Stub|ARM
 		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.gQuadratic on AxiDraw v3|ARM.ActiveCfg = Stub|ARM
 		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.gQuintic on AxiDraw v3|ARM.ActiveCfg = Stub|ARM
 		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.gShield|ARM.ActiveCfg = Stub|ARM
 		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.Makeblock-v9|ARM.ActiveCfg = Stub|ARM
 		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.Othermill|ARM.ActiveCfg = Stub|ARM
+		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.OthermillPro|ARM.ActiveCfg = Stub|ARM
+		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.OthermillPro|ARM.Build.0 = Stub|ARM
 		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.PrintrbotSimple1403-printrboardG2v3|ARM.ActiveCfg = Stub|ARM
 		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.PrintrbotSimple1608-printrboardG2v3|ARM.ActiveCfg = Stub|ARM
 		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.ProbotixV90|ARM.ActiveCfg = Stub|ARM
-		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.Quintic-Ender|ARM.ActiveCfg = Quintic|ARM
+		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.Quintic-Ender|ARM.ActiveCfg = Stub|ARM
+		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.Quintic-Ender|ARM.Build.0 = Stub|ARM
 		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.sbv300|ARM.ActiveCfg = Stub|ARM
 		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.Shapeoko2|ARM.ActiveCfg = Stub|ARM
 		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.shopbotShield|ARM.ActiveCfg = Stub|ARM
@@ -92,7 +103,8 @@ Global
 		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.TestQuintic|ARM.ActiveCfg = Stub|ARM
 		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.TestV9|ARM.ActiveCfg = Stub|ARM
 		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.Ultimakerv9k|ARM.ActiveCfg = Stub|ARM
-		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.xcarve-extended|ARM.ActiveCfg = xcarve-extended|ARM
+		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.xcarve-extended|ARM.ActiveCfg = Stub|ARM
+		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.xcarve-extended|ARM.Build.0 = Stub|ARM
 		{D7779B24-5CD6-4A1B-893C-2CAE8CF7A3A0}.Zen7x12|ARM.ActiveCfg = Stub|ARM
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution

diff --git a/g2core/boards.mk b/g2core/boards.mk
@@ -38,8 +38,21 @@ ifeq ("$(CONFIG)","Othermill")
     ifeq ("$(BOARD)","NONE")
         BOARD=g2v9k
     endif
-#    SETTINGS_FILE="settings_othermill.h"
-    SETTINGS_FILE="settings_othermill_test.h"
+    SETTINGS_FILE="settings_othermill.h"
+endif
+
+ifeq ("$(CONFIG)","OthermillPro")
+    ifeq ("$(BOARD)","NONE")
+        BOARD=g2v9k
+    endif
+    SETTINGS_FILE="settings_othermill_pro.h"
+endif
+
+ifeq ("$(CONFIG)","bt_cncmm")
+    ifeq ("$(BOARD)","NONE")
+        BOARD=g2v9k
+    endif
+    SETTINGS_FILE="settings_bt_cncmm.h"
 endif
 
 ifeq ("$(CONFIG)","ProbotixV90")