[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r275 - in /projects/zb4osgi/sandbox/michele.girolami/zigbee.CC2530.driver/src/main/java/it/cnr/isti/zigbee/dongle/CC2530: Activator.java impl/DriverCC2530.java impl/MasterResetGUI.java
scm-notify at zb4osgi.aaloa.org
scm-notify at zb4osgi.aaloa.org
Thu Jun 23 13:51:58 CEST 2011
Author: michele.girolami
Date: Thu Jun 23 13:51:58 2011
New Revision: 275
Log:
Modified class name and references
Modified:
projects/zb4osgi/sandbox/michele.girolami/zigbee.CC2530.driver/src/main/java/it/cnr/isti/zigbee/dongle/CC2530/Activator.java
projects/zb4osgi/sandbox/michele.girolami/zigbee.CC2530.driver/src/main/java/it/cnr/isti/zigbee/dongle/CC2530/impl/DriverCC2530.java
projects/zb4osgi/sandbox/michele.girolami/zigbee.CC2530.driver/src/main/java/it/cnr/isti/zigbee/dongle/CC2530/impl/MasterResetGUI.java
Modified: projects/zb4osgi/sandbox/michele.girolami/zigbee.CC2530.driver/src/main/java/it/cnr/isti/zigbee/dongle/CC2530/Activator.java
==============================================================================
--- projects/zb4osgi/sandbox/michele.girolami/zigbee.CC2530.driver/src/main/java/it/cnr/isti/zigbee/dongle/CC2530/Activator.java (original)
+++ projects/zb4osgi/sandbox/michele.girolami/zigbee.CC2530.driver/src/main/java/it/cnr/isti/zigbee/dongle/CC2530/Activator.java Thu Jun 23 13:51:58 2011
@@ -19,7 +19,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-package it.cnr.isti.zigbee.dongle.tsb;
+package it.cnr.isti.zigbee.dongle.CC2530;
import it.cnr.isti.osgi.util.OSGiProperties;
import it.cnr.isti.zigbee.dongle.api.ConfigurationProperties;
@@ -28,7 +28,7 @@
import it.cnr.isti.zigbee.dongle.api.SimpleDriver;
//import it.cnr.isti.zigbee.dongle.tsb.impl.DriverTSB;
//import it.cnr.isti.zigbee.dongle.tsb.impl.DriverTSBi;
-import it.cnr.isti.zigbee.dongle.tsb.impl.DriverTSBn;
+import it.cnr.isti.zigbee.dongle.CC2530.impl.DriverCC2530;
import java.util.Properties;
@@ -45,11 +45,11 @@
*/
public class Activator implements BundleActivator {
- private DriverTSBn driver;
+ private DriverCC2530 driver;
private ServiceRegistration service;
public void start(BundleContext bc) throws Exception {
- driver = new DriverTSBn(
+ driver = new DriverCC2530(
OSGiProperties.getString(bc, ConfigurationProperties.COM_NAME_KEY, ConfigurationProperties.COM_NAME),
OSGiProperties.getInt(bc, ConfigurationProperties.COM_BOUDRATE_KEY, 115200),
NetworkMode.valueOf(OSGiProperties.getString(
@@ -60,7 +60,7 @@
OSGiProperties.getBoolean(bc, ConfigurationProperties.NETWORK_FLUSH_KEY, ConfigurationProperties.NETWORK_FLUSH)
);
Properties properties = new Properties();
- properties.put("zigbee.driver.id", DriverTSBn.class.getName());
+ properties.put("zigbee.driver.id", DriverCC2530.class.getName());
properties.put("zigbee.supported.devices", new String[]{"tsb"});
properties.put("zigbee.driver.type", "hardware");
properties.put("zigbee.driver.mode", "real");
Modified: projects/zb4osgi/sandbox/michele.girolami/zigbee.CC2530.driver/src/main/java/it/cnr/isti/zigbee/dongle/CC2530/impl/DriverCC2530.java
==============================================================================
--- projects/zb4osgi/sandbox/michele.girolami/zigbee.CC2530.driver/src/main/java/it/cnr/isti/zigbee/dongle/CC2530/impl/DriverCC2530.java (original)
+++ projects/zb4osgi/sandbox/michele.girolami/zigbee.CC2530.driver/src/main/java/it/cnr/isti/zigbee/dongle/CC2530/impl/DriverCC2530.java Thu Jun 23 13:51:58 2011
@@ -1,6 +1,7 @@
-package it.cnr.isti.zigbee.dongle.tsb.impl;
-
-import gnu.io.CommPortIdentifier;import it.cnr.isti.cc2480.high.AsynchrounsCommandListener;
+package it.cnr.isti.zigbee.dongle.CC2530.impl;
+
+import gnu.io.CommPortIdentifier;
+import it.cnr.isti.cc2480.high.AsynchrounsCommandListener;
import it.cnr.isti.cc2480.high.HWHighLevelDriver;
import it.cnr.isti.cc2480.high.SynchrounsCommandListner;
import it.cnr.isti.cc2480.low.HWLowLevelDriver;
@@ -77,9 +78,9 @@
* @since 0.1.0
*
*/
-public class DriverTSBn implements Runnable, SimpleDriver{
+public class DriverCC2530 implements Runnable, SimpleDriver{
private MasterResetGUI resetGUI;
- private final static Logger logger = LoggerFactory.getLogger(DriverTSBn.class);
+ private final static Logger logger = LoggerFactory.getLogger(DriverCC2530.class);
private final static Logger logger4Waiter = LoggerFactory.getLogger(WaitForCommand.class);
public static final int RESEND_TIMEOUT_DEFAULT = 1000;
@@ -173,18 +174,18 @@
}
- public DriverTSBn(String serialPort, int bitrate) throws ZToolException {
+ public DriverCC2530(String serialPort, int bitrate) throws ZToolException {
this(serialPort,bitrate,NetworkMode.Coordinator,0,19, false);
}
- public DriverTSBn(
+ public DriverCC2530(
String serialPort, int bitrate, NetworkMode mode, int pan, int channel
) throws ZToolException {
this(serialPort, bitrate, mode, pan, channel, false);
}
- public DriverTSBn(
+ public DriverCC2530(
String serialPort, int bitRate, NetworkMode mode, int pan, int channel, boolean cleanNetworkStatus
) throws ZToolException {
int aux = RESEND_TIMEOUT_DEFAULT;
@@ -443,7 +444,7 @@
Enumeration<CommPortIdentifier> ports = CommPortIdentifier.getPortIdentifiers();
while(ports.hasMoreElements()){
CommPortIdentifier com = ports.nextElement();
- if(DriverTSBn.initializeHardware(com.getName(), rate)){
+ if(DriverCC2530.initializeHardware(com.getName(), rate)){
portToOpen=com.getName();
Thread.currentThread().setName(buildDriverThreadName(portToOpen, rate));
break;
@@ -454,7 +455,7 @@
return false;
}
}else{
- if( DriverTSBn.initializeHardware(port, rate) == true ){
+ if( DriverCC2530.initializeHardware(port, rate) == true ){
portToOpen = port;
} else {
logger.error("Failed to intialize the dongle on port {} at rate {}", port, rate);
Modified: projects/zb4osgi/sandbox/michele.girolami/zigbee.CC2530.driver/src/main/java/it/cnr/isti/zigbee/dongle/CC2530/impl/MasterResetGUI.java
==============================================================================
--- projects/zb4osgi/sandbox/michele.girolami/zigbee.CC2530.driver/src/main/java/it/cnr/isti/zigbee/dongle/CC2530/impl/MasterResetGUI.java (original)
+++ projects/zb4osgi/sandbox/michele.girolami/zigbee.CC2530.driver/src/main/java/it/cnr/isti/zigbee/dongle/CC2530/impl/MasterResetGUI.java Thu Jun 23 13:51:58 2011
@@ -1,12 +1,12 @@
-package it.cnr.isti.zigbee.dongle.tsb.impl;
+package it.cnr.isti.zigbee.dongle.CC2530.impl;
import java.awt.Dimension;
import javax.swing.UIManager;
public class MasterResetGUI extends javax.swing.JFrame {
- DriverTSBn parentDriver;
- public MasterResetGUI(DriverTSBn parent) {
+ DriverCC2530 parentDriver;
+ public MasterResetGUI(DriverCC2530 parent) {
parentDriver=parent;
try {
UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
More information about the Commit
mailing list