Skip to content

Commit

Permalink
share: updated configuration files using old mtmr.json and mtml.json.…
Browse files Browse the repository at this point in the history 
… See #106
  • Loading branch information
@adeguet1
adeguet1 committed Mar 10, 2019
1 parent 14d191a commit 147b51c
Show file tree
Hide file tree
Showing 22 changed files with 44 additions and 57 deletions.
2 changes: 1 addition & 1 deletion share/console-MTML_KIN_SIMULATED.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "MTM",
"simulation": "KINEMATIC",
"pid": "sawControllersPID-MTML.xml",
"kinematic": "mtml.json"
"kinematic": "mtm.json"
}
]
}
13 changes: 5 additions & 8 deletions share/cuhk-dVRK/console-MTML-MTMR-ECM_KIN_SIMULATED-Teleop.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
"type": "MTM",
"io": "sawRobotIO1394-MTML-foot-pedal-73298.xml",
"pid": "sawControllersPID-MTML.xml",
"kinematic": "mtml.json"
"kinematic": "mtm.json"
}
,
{
"name": "MTMR",
"type": "MTM",
"io": "sawRobotIO1394-MTMR-31519.xml",
"pid": "sawControllersPID-MTMR.xml",
"kinematic": "mtmr.json"
"kinematic": "mtm.json"
}
,
{
Expand All @@ -29,11 +29,8 @@
,
"ecm-teleop":
{
"master-left": "MTML",
"master-right": "MTMR",
"slave": "ECM",
"rotation" : [[ 1.0000, 0.0000, 0.0000],
[ 0.0000, 1.0000, 0.0000],
[ 0.0000, 0.0000, 1.0000]]
"mtm-left": "MTML",
"mtm-right": "MTMR",
"ecm": "ECM"
}
}
4 changes: 2 additions & 2 deletions share/jhu-daVinci/console-ECM-MTML-MTMR-Teleop.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
"type": "MTM",
"io": "sawRobotIO1394-MTMR-32336.xml",
"pid": "sawControllersPID-MTMR.xml",
"kinematic": "mtmr.json"
"kinematic": "mtm.json"
}
,
{
"name": "MTML",
"type": "MTM",
"io": "sawRobotIO1394-MTML-34863.xml",
"pid": "sawControllersPID-MTML.xml",
"kinematic": "mtml.json"
"kinematic": "mtm.json"
}
]
,
Expand Down
4 changes: 2 additions & 2 deletions share/jhu-daVinci/console-ECM-MTMR-PSM1-MTML-PSM2-Teleop.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@
"type": "MTM",
"io": "sawRobotIO1394-MTMR-32336.xml",
"pid": "sawControllersPID-MTMR.xml",
"kinematic": "mtmr.json"
"kinematic": "mtm.json"
}
,
{
"name": "MTML",
"type": "MTM",
"io": "sawRobotIO1394-MTML-34863.xml",
"pid": "sawControllersPID-MTML.xml",
"kinematic": "mtml.json"
"kinematic": "mtm.json"
}
]
,
Expand Down
2 changes: 1 addition & 1 deletion share/jhu-daVinci/console-MTML-MTMR.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"type": "MTM",
"io": "sawRobotIO1394-MTMR-32336.xml",
"pid": "sawControllersPID-MTMR.xml",
"kinematic": "mtmr.json"
"kinematic": "mtm.json"
}
]
}
4 changes: 2 additions & 2 deletions share/jhu-daVinci/console-MTMR-MTML-PSM3-ECM-Teleop.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
"type": "MTM",
"io": "sawRobotIO1394-MTMR-32336.xml",
"pid": "sawControllersPID-MTMR.xml",
"kinematic": "mtmr.json"
"kinematic": "mtm.json"
}
,
{
"name": "MTML",
"type": "MTM",
"io": "sawRobotIO1394-MTML-34863.xml",
"pid": "sawControllersPID-MTML.xml",
"kinematic": "mtml.json"
"kinematic": "mtm.json"
}
,
{
Expand Down
2 changes: 1 addition & 1 deletion share/jhu-daVinci/console-MTMR-PSM1-5mm-Teleop.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"type": "MTM",
"io": "sawRobotIO1394-MTMR-32336.xml",
"pid": "sawControllersPID-MTMR.xml",
"kinematic": "mtmr.json"
"kinematic": "mtm.json"
}
]
,
Expand Down
2 changes: 1 addition & 1 deletion share/jhu-daVinci/console-MTMR-PSM1-Teleop-PSM2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"type": "MTM",
"io": "sawRobotIO1394-MTMR-32336.xml",
"pid": "sawControllersPID-MTMR.xml",
"kinematic": "mtmr.json"
"kinematic": "mtm.json"
}
]
,
Expand Down
4 changes: 2 additions & 2 deletions share/jhu-daVinci/console-SUJ-ECM-MTMR-PSM1-5mm-MTML-PSM2-Teleop.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@
"type": "MTM",
"io": "sawRobotIO1394-MTMR-32336.xml",
"pid": "sawControllersPID-MTMR.xml",
"kinematic": "mtmr.json"
"kinematic": "mtm.json"
}
,
{
"name": "MTML",
"type": "MTM",
"io": "sawRobotIO1394-MTML-34863.xml",
"pid": "sawControllersPID-MTML.xml",
"kinematic": "mtml.json"
"kinematic": "mtm.json"
}
]
,
Expand Down
2 changes: 1 addition & 1 deletion share/jhu-daVinci/console-SUJ-ECM-MTMR-PSM1-5mm-Teleop.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"type": "MTM",
"io": "sawRobotIO1394-MTMR-32336.xml",
"pid": "sawControllersPID-MTMR.xml",
"kinematic": "mtmr.json"
"kinematic": "mtm.json"
}
]
,
Expand Down
4 changes: 2 additions & 2 deletions share/jhu-daVinci/console-SUJ-ECM-MTMR-PSM1-MTML-PSM3-Teleop.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@
"type": "MTM",
"io": "sawRobotIO1394-MTMR-32336.xml",
"pid": "sawControllersPID-MTMR.xml",
"kinematic": "mtmr.json"
"kinematic": "mtm.json"
}
,
{
"name": "MTML",
"type": "MTM",
"io": "sawRobotIO1394-MTML-34863.xml",
"pid": "sawControllersPID-MTML.xml",
"kinematic": "mtml.json"
"kinematic": "mtm.json"
}
]
,
Expand Down
2 changes: 1 addition & 1 deletion share/jhu-daVinci/console-SUJ-ECM-MTMR-PSM1-Teleop-PSM2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"type": "MTM",
"io": "sawRobotIO1394-MTMR-32336.xml",
"pid": "sawControllersPID-MTMR.xml",
"kinematic": "mtmr.json"
"kinematic": "mtm.json"
}
]
,
Expand Down
2 changes: 1 addition & 1 deletion share/jhu-daVinci/console-SUJ-ECM-MTMR-PSM1-Teleop.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"type": "MTM",
"io": "sawRobotIO1394-MTMR-32336.xml",
"pid": "sawControllersPID-MTMR.xml",
"kinematic": "mtmr.json"
"kinematic": "mtm.json"
}
]
,
Expand Down
2 changes: 1 addition & 1 deletion share/sssup-dVRK/console-MTML.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "MTM",
"io": "sawRobotIO1394-MTML-19871_cal.xml",
"pid": "sawControllersPID-MTMR.xml",
"kinematic": "mtml.json"
"kinematic": "mtm.json"
}
]
}
2 changes: 1 addition & 1 deletion share/sssup-dVRK/console-MTMR.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "MTM",
"io": "sawRobotIO1394-MTMR-foot-pedal-35185_cal.xml",
"pid": "sawControllersPID-MTMR.xml",
"kinematic": "mtmr.json"
"kinematic": "mtm.json"
}
]
}
13 changes: 5 additions & 8 deletions share/sssup-dVRK/one-arm-PSM1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "MTM",
"io": "sawRobotIO1394-MTMR-foot-pedal-35185_cal.xml",
"pid": "sawControllersPID-MTMR.xml",
"kinematic": "mtmr.json"
"kinematic": "mtm.json"
}
,
{
Expand All @@ -17,18 +17,15 @@
"pid": "sawControllersPID-PSM.xml",
"kinematic": "psm-large-needle-driver.json"
}


]
,
"psm-teleops":
[
{
"master": "MTMR",
"slave": "PSM1",
"rotation" : [[ 1.0000, 0.0000, 0.0000],
[ 0.0000, 1.0000, 0.0000],
[ 0.0000, 0.0000, 1.0000]]
"mtm": "MTMR",
"psm": "PSM1"
}
]
}
13 changes: 5 additions & 8 deletions share/sssup-dVRK/one-arm-PSM1_original.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "MTM",
"io": "sawRobotIO1394-MTMR-foot-pedal-35185_cal.xml",
"pid": "sawControllersPID-MTMR.xml",
"kinematic": "mtmr.json"
"kinematic": "mtm.json"
}
,
{
Expand All @@ -17,18 +17,15 @@
"pid": "sawControllersPID-PSM.xml",
"kinematic": "psm-large-needle-driver.json"
}


]
,
"psm-teleops":
[
{
"master": "MTMR",
"slave": "PSM1",
"rotation" : [[ 1.0000, 0.0000, 0.0000],
[ 0.0000, 1.0000, 0.0000],
[ 0.0000, 0.0000, 1.0000]]
"mtm": "MTMR",
"psm": "PSM1"
}
]
}
13 changes: 5 additions & 8 deletions share/sssup-dVRK/one-arm-PSM2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "MTM",
"io": "sawRobotIO1394-MTMR-foot-pedal-35185_cal.xml",
"pid": "sawControllersPID-MTMR.xml",
"kinematic": "mtmr.json"
"kinematic": "mtm.json"
}
,
{
Expand All @@ -17,18 +17,15 @@
"pid": "sawControllersPID-PSM.xml",
"kinematic": "psm-large-needle-driver.json"
}


]
,
"psm-teleops":
[
{
"master": "MTMR",
"slave": "PSM2",
"rotation" : [[ 1.0000, 0.0000, 0.0000],
[ 0.0000, 1.0000, 0.0000],
[ 0.0000, 0.0000, 1.0000]]
"mtm": "MTMR",
"psm": "PSM2"
}
]
}
2 changes: 1 addition & 1 deletion share/ul-daVinci/console-MTML.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "MTM",
"io": "xml/sawRobotIO1394-MTML-68162.xml",
"pid": "sawControllersPID-MTML.xml",
"kinematic": "mtml.json"
"kinematic": "mtm.json"
}
]
}
2 changes: 1 addition & 1 deletion share/ul-daVinci/console-MTML_and_PSM2_KIN_SIMULATED.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"type": "MTM",
"simulation": "KINEMATIC",
"pid": "sawControllersPID-MTML.xml",
"kinematic": "mtml.json"
"kinematic": "mtm.json"
}
]
}
3 changes: 1 addition & 2 deletions share/ul-daVinci/console-MTMR.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
"type": "MTM",
"io": "xml/sawRobotIO1394-MTMR-31093.xml",
"pid": "sawControllersPID-MTMR.xml",
"kinematic": "mtmr.json"
"kinematic": "mtm.json"
}
]

}
4 changes: 2 additions & 2 deletions share/ul-daVinci/console-MTMR_and_PSM1_KIN_SIMULATED.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* -*- Mode: Javascript; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
{
{
"arms":
[
{
Expand All @@ -15,7 +15,7 @@
"type": "MTM",
"simulation": "KINEMATIC",
"pid": "sawControllersPID-MTML.xml",
"kinematic": "mtmr.json"
"kinematic": "mtm.json"
}
]
}

0 comments on commit 147b51c

Please sign in to comment.