From d4cd90455c7662f0ffc53d95b65d47c0849817c1 Mon Sep 17 00:00:00 2001 From: Jose Luis Garcia del Castillo Date: Wed, 27 Feb 2019 15:49:39 -0500 Subject: [PATCH] CHANGELOG --- CHANGELOG.md | 4 ++++ src/Machina.sln | 22 ------------------- src/Machina/Robot.cs | 2 +- src/Tests/TEST_NewAPITests/OfflineAPITests.cs | 18 +++++++-------- .../TEST_StreamAPITests/StreamAPITests.cs | 2 +- 5 files changed, 15 insertions(+), 33 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2c95a0..8ee673b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,10 @@ - [ ] `noTool` gets declared on every ABB program, even if not used. Fix this, and probably use `tool0` on compilation? - [ ] Review if second attachments produce a TCP transformation without undoing the previous tool. +# v0.8.9 +## BUILD 1429 +- Fix Example files. + # v0.8.8 ## BUILD 1428 - Revert `RobotCursor` to default `null` tool; this was giving a full other set of problems... Let's see what I break now by doing this... diff --git a/src/Machina.sln b/src/Machina.sln index 5888c05..a8805a2 100644 --- a/src/Machina.sln +++ b/src/Machina.sln @@ -33,10 +33,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EXAMPLE_OfflineCodeGenerati EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EXAMPLE_StreamTargets", "Sample Projects\EXAMPLE_StreamTargets\EXAMPLE_StreamTargets.csproj", "{16AF5FDC-0CA2-4934-B565-FE7A53045BB5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EXAMPLE_TUIO_DEMO", "Sample Projects\EXAMPLE_TUIO_DEMO\EXAMPLE_TUIO_DEMO.csproj", "{1D5CA94F-0209-4A42-BFBD-8818B5049B6C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EXAMPLE_XBOX1Control", "Sample Projects\EXAMPLE_XBOX1Control\EXAMPLE_XBOX1Control.csproj", "{D85F7A35-B2DB-4840-A6B2-2E04FE3CA55F}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -125,22 +121,6 @@ Global {16AF5FDC-0CA2-4934-B565-FE7A53045BB5}.Release|Any CPU.Build.0 = Release|Any CPU {16AF5FDC-0CA2-4934-B565-FE7A53045BB5}.Release|x64.ActiveCfg = Release|Any CPU {16AF5FDC-0CA2-4934-B565-FE7A53045BB5}.Release|x64.Build.0 = Release|Any CPU - {1D5CA94F-0209-4A42-BFBD-8818B5049B6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D5CA94F-0209-4A42-BFBD-8818B5049B6C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D5CA94F-0209-4A42-BFBD-8818B5049B6C}.Debug|x64.ActiveCfg = Debug|x64 - {1D5CA94F-0209-4A42-BFBD-8818B5049B6C}.Debug|x64.Build.0 = Debug|x64 - {1D5CA94F-0209-4A42-BFBD-8818B5049B6C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D5CA94F-0209-4A42-BFBD-8818B5049B6C}.Release|Any CPU.Build.0 = Release|Any CPU - {1D5CA94F-0209-4A42-BFBD-8818B5049B6C}.Release|x64.ActiveCfg = Release|x64 - {1D5CA94F-0209-4A42-BFBD-8818B5049B6C}.Release|x64.Build.0 = Release|x64 - {D85F7A35-B2DB-4840-A6B2-2E04FE3CA55F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D85F7A35-B2DB-4840-A6B2-2E04FE3CA55F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D85F7A35-B2DB-4840-A6B2-2E04FE3CA55F}.Debug|x64.ActiveCfg = Debug|Any CPU - {D85F7A35-B2DB-4840-A6B2-2E04FE3CA55F}.Debug|x64.Build.0 = Debug|Any CPU - {D85F7A35-B2DB-4840-A6B2-2E04FE3CA55F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D85F7A35-B2DB-4840-A6B2-2E04FE3CA55F}.Release|Any CPU.Build.0 = Release|Any CPU - {D85F7A35-B2DB-4840-A6B2-2E04FE3CA55F}.Release|x64.ActiveCfg = Release|Any CPU - {D85F7A35-B2DB-4840-A6B2-2E04FE3CA55F}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -155,7 +135,5 @@ Global {B1AF7C8B-CFE5-4267-A1B2-ECBED63DBDD7} = {BA32CB47-9EAB-4191-9581-734ACC9633E7} {9E155754-5524-45C8-A72E-43F472F502C0} = {BA32CB47-9EAB-4191-9581-734ACC9633E7} {16AF5FDC-0CA2-4934-B565-FE7A53045BB5} = {BA32CB47-9EAB-4191-9581-734ACC9633E7} - {1D5CA94F-0209-4A42-BFBD-8818B5049B6C} = {BA32CB47-9EAB-4191-9581-734ACC9633E7} - {D85F7A35-B2DB-4840-A6B2-2E04FE3CA55F} = {BA32CB47-9EAB-4191-9581-734ACC9633E7} EndGlobalSection EndGlobal diff --git a/src/Machina/Robot.cs b/src/Machina/Robot.cs index 0fef2d7..5163f82 100644 --- a/src/Machina/Robot.cs +++ b/src/Machina/Robot.cs @@ -37,7 +37,7 @@ public class Robot /// /// Build number. /// - public static readonly int Build = 1428; + public static readonly int Build = 1429; /// /// Version number. diff --git a/src/Tests/TEST_NewAPITests/OfflineAPITests.cs b/src/Tests/TEST_NewAPITests/OfflineAPITests.cs index 52597ef..c443964 100644 --- a/src/Tests/TEST_NewAPITests/OfflineAPITests.cs +++ b/src/Tests/TEST_NewAPITests/OfflineAPITests.cs @@ -14,13 +14,13 @@ static void Main(string[] args) { Console.WriteLine("--> GENERAL TEST"); - Robot arm = Robot.Create("ToolTesting", "UR"); + Robot arm = Robot.Create("HelloRobot", "KUKA"); - RotationTest(arm); + //RotationTest(arm); //ToolTesting(arm); - //HelloRobot(arm); + HelloRobot(arm); //ExternalAxes(arm); @@ -90,7 +90,7 @@ static void Main(string[] args) arm.Compile(arm.IsBrand("ABB") ? @"C:\offlineTests.prg" : arm.IsBrand("UR") ? @"C:\offlineTests.script" : arm.IsBrand("KUKA") ? @"C:\offlineTests.src" : - arm.IsBrand("ZMORPH") ? @"C:\offlineTests.gcode" : @"C:\offlineTests.machina", true, false); + arm.IsBrand("ZMORPH") ? @"C:\offlineTests.gcode" : @"C:\offlineTests.machina", true, true); //List code = arm.Export(); //foreach (string s in code) Console.WriteLine(s); @@ -156,14 +156,14 @@ static public void HelloRobot(Robot arm) { arm.ControlMode("offline"); - //arm.Message("Hello Robot!"); - arm.SpeedTo(50); - arm.MoveTo(600, 0, 500); + arm.Message("Hello Robot!"); + arm.SpeedTo(100); + arm.MoveTo(400, 300, 500); arm.Rotate(0, 1, 0, -90); arm.Move(0, 0, 250); arm.Wait(2000); - //arm.AxesTo(0, 0, 0, 0, 90, 0); - arm.AxesTo(0, -90, -90, -90, 90, 90); + arm.AxesTo(0, 0, 0, 0, 90, 0); + //arm.AxesTo(0, -90, -90, -90, 90, 90); //List program = arm.Compile(); diff --git a/src/Tests/TEST_StreamAPITests/StreamAPITests.cs b/src/Tests/TEST_StreamAPITests/StreamAPITests.cs index 95029bc..c44145a 100644 --- a/src/Tests/TEST_StreamAPITests/StreamAPITests.cs +++ b/src/Tests/TEST_StreamAPITests/StreamAPITests.cs @@ -37,7 +37,7 @@ static void Main(string[] args) //arm.ActionIssued += LogEvent; Machina.Logger.SetLogLevel(3); - + Machina.Logger.WriteLine += Console.WriteLine; arm.MotionUpdate += LogEvent;