personalityList) { if (DEBUG) System.out.println("findPersonality: start"); //$NON-NLS-1$ if (personalityList == null || personalityList.isEmpty()) { @@ -707,16 +707,27 @@ // 0\VID_0421&PID_00AB\0 (no serial number as part of id) // 004401011418023\VID_0421&PID_0500\0 (serial number comes at front) // compare Device IDs - String id = address.substring(address.indexOf('\\'), address.lastIndexOf('\\')); - if (personality.deviceID.contains(id) && personality.deviceID.contains(serialNumber)) { - if (DEBUG) System.out.println("findPersonality: address matches deviceID with serial number"); //$NON-NLS-1$ + String vidpid = address.substring(address.indexOf('\\'), address.lastIndexOf('\\')); + String endid = address.substring(address.lastIndexOf('\\')+1); + if (personality.deviceID.contains(vidpid) && personality.deviceID.contains(endid)) { + if (DEBUG) System.out.println("findPersonality: address matches deviceID with end number\n"); //$NON-NLS-1$ + return personality; + } + else if (personality.deviceID.contains(vidpid) && personality.deviceID.contains(serialNumber)) { + if (DEBUG) System.out.println("findPersonality: address matches deviceID with serial number\n"); //$NON-NLS-1$ return personality; } else { + if (serialNumber.equals(NOT_KNOWN)) { + if (personality.deviceID.contains(vidpid) && numUSBDevicesExpected == 1) { + if (DEBUG) System.out.println("findPersonality: serial number not known, but VID/PID match\n"); //$NON-NLS-1$ + return personality; + } + } String begin = personality.deviceID.substring(0, personality.deviceID.indexOf('\\')); - if (begin.equals("0")) { + if (begin.equals("0") || numUSBDevicesExpected == 1) { // no serial number at beginning - if (personality.deviceID.contains(id)) { - if (DEBUG) System.out.println("findPersonality: address matches deviceID without serial number"); //$NON-NLS-1$ + if (personality.deviceID.contains(vidpid)) { + if (DEBUG) System.out.println("findPersonality: address matches deviceID without serial number\n"); //$NON-NLS-1$ return personality; } } diff -r 780e268db85f -r cfd24c7f99b4 connectivity/com.nokia.carbide.remoteConnections/META-INF/MANIFEST.MF diff -r 780e268db85f -r cfd24c7f99b4 core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm Fri Mar 12 14:58:03 2010 -0600 +++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm Fri Mar 12 14:59:20 2010 -0600 @@ -22,7 +22,7 @@ Install remote agents -

A list of the most current versions of remote agents sorted by SDK and version. Select the version most compatable with the device. For example, a device running S60 3.2.0 needs a version of the TRK software compiled for that SDK, which in the image above is Application TRK 3.0.4.

A list of the most current versions of remote agents sorted by SDK and version. Select the version most compatable with the device. For example, a device running S60 5.0 needs a version of the TRK software compiled for that SDK, which in the image above is Application TRK 3.1.2.

Additional information about the selected entry is displayed to the right to help you choose the correct version of TRK for the target device.

@@ -32,7 +32,8 @@ Install

Click Install to download and install the TRK selected in the Install remote agents list. A progress bar is shown if the install operation requires more than a few seconds to complete.

NOTE The SIS and SISX file types must be associated with an installer application like Nokia PC Suite in order to install them onto the device. Use the Save command above to perform a manual install to the device if you don't have an installer application.

NOTE Drivers installed by PC Suite or Ovi Suite are required in order for Install to download a remote agent onto the target device.

NOTE The SIS and SISX file types must be associated with an installer application like Nokia PC Suite or Ovi Suite in order to install them onto the device. Use the Save command above to perform a manual install to the device if you don't have an installer application.

diff -r 780e268db85f -r cfd24c7f99b4 core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm Fri Mar 12 14:58:03 2010 -0600 +++ b/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm Fri Mar 12 14:59:20 2010 -0600 @@ -38,8 +38,8 @@

What's New in 2.5.0

The following features for Symbian development are provided within Carbide.c++:

Plug-and-Play (PnP) On-device Debugging supported — debugging a target device just got easier. Using a USB cable, connect the PC to the target device, then launch Carbide.c++. Carbide locates the connected device and creates a remote connection setup to communicate with it. Build the program and launch it on the device to start the debugging session.
PnP Launch Wizard - If the project does not already have a launch configuration, the PnP Launch Wizard makes it easy to create one no matter what the target: emulator, phone, or hardware device. In addition the new Configure Launch Configuration dialog provides a quick summary of the remote connection for easy review and modification.
Plug-and-Play (PnP) On-device Debugging supported — debugging a target device just got easier. Using a USB cable, connect the PC to the target device, then launch Carbide.c++. Carbide locates the connected device and creates a remote connection setup to communicate with it. Build the program and launch it on the device to start the debugging session. Refer to Known PnP Issues for details if you experience problems.
PnP Phone Launch Wizard - If the project does not already have a launch configuration, the PnP Launch Wizard makes it easy to create one for phones. In addition the new Configure Launch Configuration dialog provides a quick summary of the remote connection for easy review and modification.
Carbide automatically detects TRK on target phones and devices - Carbide now detects the presence of either Application or System TRK on a connected device when TRK 3.2.6 or later are installed. Earlier TRK versions do not support this recognition feature.
TRK improvements - TRK continues to evolve and now includes these improvements: