--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.htm Fri Jan 22 13:01:00 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.htm Fri Jan 22 13:01:48 2010 -0600
@@ -15,7 +15,7 @@
<li><b>Symbian OS System TRK</b> (<i>not available in the Developer Edition</i>) —used to run or debug applications or ROM code on a target device using the System TRK on-device debug agent. System TRK is an application that runs on reference boards and prototype phones and allows you to debug your executables. The debugger will download files to the phone prior to launching.</li>
</ul>
<p>By default, you can click the <b>Debug</b> icon (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle">) in the toolbar to launch the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a>. This creates a launch configuration for the project based on project information and any additional input required, like COM port selection. It is the recommended method for creating new launch configurations. Or, use the <a href="../../projects/launch/page_main.htm">Debug</a> window to create a customized launch configuration. </p>
-<p align="center"><img src="../../reference/images/wnd_trk_debug_config.png" width="859" height="629" /></p>
+<p align="center"><img src="../../reference/images/wnd_trk_debug_config.png" width="819" height="593" /></p>
<p class="figure">Figure 1. Debug launch configuration for on-device debugging (<i>Application TRK shown</i>)</p>
<div class="step">
<h4>Defining a Customized Launch Configuration </h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_bluetooth.htm Fri Jan 22 13:01:00 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_bluetooth.htm Fri Jan 22 13:01:48 2010 -0600
@@ -6,15 +6,11 @@
<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
<title>Installing On-device Debug Agents using Bluetooth</title>
<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<style type="text/css">
-<!--
-.style1 {color: #FF0000}
--->
-</style>
</head>
<body bgcolor="#FFFFFF">
<h2>Installing On-device Debug Agents using Bluetooth </h2>
-<p>Use Bluetooth to install the on-device debug agent, either Application TRK or System TRK, as a SISX file, to enable on-target debugging. The installation location of the on-device debug agent will vary based on the phone. On some phones it will be the Installed folder, on others it may be in My Own folder. Refer to the documentation that came with the phone to learn where installed programs are stored. </p>
+<p>Use Bluetooth to install the on-device debug agent, either Application TRK or System TRK, as a SISX file, to enable on-target debugging. The installation location of the on-device debug agent will vary based on the phone. Application TRK is usable on both consumer and RnD versions of the device. System TRK is only usable on RnD devices.</p>
+<p>On some phones it will be the <b>Installed</b> folder, on others it may be in <b>My Own </b>folder. Refer to the documentation that came with the phone to learn where installed programs are stored. </p>
<p class="note"><b>NOTE</b> The following example shows how to install the SISX file from a PC running Windows XP SP2 using an internal Bluetooth device. The actions to install the SISX file may be different on your version of Windows. Refer to the OS documentation for information on transferring a file via a Bluetooth connection.</p>
<div class="step">
<h4>Installing an On-device Debug Agent using Bluetooth </h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_pcsuite.htm Fri Jan 22 13:01:00 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_pcsuite.htm Fri Jan 22 13:01:48 2010 -0600
@@ -9,7 +9,8 @@
</head>
<body bgcolor="#FFFFFF">
<h2>Installing On-device Debug Agents using PC Suite</h2>
-<p>Use the PC Suite software that came with your device (<a href="http://europe.nokia.com/A4144905">Nokia PC Suite</a> is one example) to install the on-device debug agent, either Application TRK or System TRK, as a SISX file, to enable on-device debugging. The installation location of the on-device debug agent will vary based on the phone. On some phones it will be the Installed folder, on others it may be in My Own folder. Refer to the documentation that came with the phone to learn where installed programs are stored. </p>
+<p>Use the PC Suite software that came with your device (<a href="http://europe.nokia.com/A4144905">Nokia PC Suite</a> is one example) to install the on-device debug agent, either Application TRK or System TRK, as a SISX file, to enable on-device debugging. Application TRK is usable on both consumer and RnD versions of the device. System TRK is only usable on RnD devices.</p>
+<p>The installation location of the on-device debug agent software varies based on the phone. On some phones it will be the <b>Installed</b> folder, on others it may be in <b>My Own</b> folder. Refer to the documentation that came with the phone to learn where installed programs are stored. </p>
<p>Using PC Suite you can install any TRK debug agent on the device using a Bluetooth or USB connection. </p>
<p class="note"><b>NOTE</b> You can use the connection software that came with your device to install the on-device debug agent SISX file. See your phone's operating manual for assistance on using it's software.</p>
<div class="step">
@@ -50,7 +51,7 @@
<li><a href="trk_connection_bluetooth.htm">Connecting via Bluetooth</a></li>
<li><a href="trk_connection_usb.htm">Connecting via USB </a></li>
</ul>
-<div id="footer">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
</body>
</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_overview.htm Fri Jan 22 13:01:00 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_overview.htm Fri Jan 22 13:01:48 2010 -0600
@@ -22,6 +22,6 @@
<li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup </a></li>
<li><a href="../../concepts/trk.htm">On-device Debugging </a></li>
</ul>
-<div id="footer">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
</body>
</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_preconditions.htm Fri Jan 22 13:01:00 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_preconditions.htm Fri Jan 22 13:01:48 2010 -0600
@@ -9,21 +9,20 @@
</head>
<body bgcolor="#FFFFFF">
<h2>Preconditions to On-Device Debugging</h2>
-<p>Before you can use on-device debugging to debug 3rd edition and UIQ devices, the following preconditions must be met.</p>
+<p>Before you can use on-device debugging to debug 3rd and 5th edition devices, the following preconditions must be met.</p>
<div class="step">
<h4>Verifying On-device Debugging Preconditions </h4>
<ol>
<li>Verify that your system has the following:
<ul>
- <li>S60 v3.x, UIQ 2.X or UIQ 3.X kit installed</li>
+ <li>S60 v3.x or S60 v5.x kit installed</li>
<li>ActivePerl installed</li>
<li>RVCT or GCCE compiler</li>
- <li>USB or Bluetooth capable S60 3rd Edition or UIQ 3rd Edition device</li>
<li>USB or Bluetooth support on your PC </li>
<li>Nokia PC Suite (or equivilent software) for connecting and installing applications to the device </li>
</ul>
</li>
- <li>Download and install the current TRK SISX file using the <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup</a> dialog for debugging S60 5th edition and UIQ devices</li>
+ <li>Download and install the current TRK SISX file using the <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup</a> dialog</li>
<p>The Application TRK debug agents are stored If not, install it now using the <a href="../../projects/launch/wiz_new_launch_config.htm">On-Device Connections > New Connection Wizard > Install remote agents</a> pane.</p>
<p class="note"><b>NOTE</b> The Application TRK versions included with Carbide is for CE versions of devices only. They are not intended for use with RnD devices. </p>
<li>Specify the communication method with the on-target device during the debug session</li>
@@ -45,7 +44,7 @@
<li><a href="trk_install_bluetooth.htm">Installing On-device Debug Agents using Bluetooth</a></li>
<li><a href="trk_install_usb.htm">Installing On-device Debug Agents using USB </a></li>
</ul>
-<div id="footer">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
</body>
</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx.htm Fri Jan 22 13:01:00 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx.htm Fri Jan 22 13:01:48 2010 -0600
@@ -43,7 +43,7 @@
<ul>
<li><a href="trk_install_bluetooth.htm">Installing On-device Debug Agents using Bluetooth </a></li>
</ul>
-<div id="footer">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
</body>
</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx_usb.htm Fri Jan 22 13:01:00 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx_usb.htm Fri Jan 22 13:01:48 2010 -0600
@@ -15,11 +15,9 @@
<li>On the device
<ol>
<li>Launch Application TRK or System TRK program on the device</li>
- <li></li>
+ <li>Select PC-Suite from the USB Mode list</li>
</ol>
</li>
- <li>Select PC-Suite from the USB Mode list</li>
- <li>Launch the Application TRK program</li>
<li>Halt the Bluetooth device search by pressing the Cancel soft key</li>
<li>Click Options > Settings > Connection</li>
<li>Change Connection type to USB and set connection options</li>
@@ -27,7 +25,7 @@
<p align="center"><img src="images/trk_connection_options.png" width="211" height="250" /> <img src="images/trk_usb_settings.png" width="211" height="250" /></p>
<p class="figure">Figure 1 - Change connection type to USB and set connection options</p>
</blockquote>
- <li>Select Back and start the TRK again and you should be connected</li>
+ <li>Select Back and start TRK again and you should be connected</li>
</ol>
</div>
<h5>Related concepts</h5>
@@ -42,7 +40,7 @@
<ul>
<li><a href="trk_install_bluetooth.htm">Installing On-device Debug Agents using Bluetooth </a></li>
</ul>
-<div id="footer">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
</body>
</html>