Changeset 5681

Timestamp:

11/03/07 17:45:54 (6 years ago)

Author:

jgaeddert

Message:

hacking port id to scan properly

Files:

• experimental/components/CIREN_SM/trunk/CIREN_SM/CIREN_SM.cpp (modified) (4 diffs)

experimental/components/CIREN_SM/trunk/CIREN_SM/CIREN_SM.cpp

@@ -103 +103 @@
     rx_power_threshold_hi = 35.0f;
     spectrumSensingFlag = false;
-    switch_scan = 50;
-    switch_linger = 100;
+    switch_scan = 100;
+    switch_linger = 500;
     switch_dwell = 10000;
     opMode = SCAN;
@@ -403 +403 @@
     switch (m) {
     case SCAN:
-        DEBUG(2, CIREN_SM, "switching mode to scan");
+        DEBUG(0, CIREN_SM, "switching mode to scan");
         dwell_packet_switch = switch_scan;
         break;
     case LINGER:
-        DEBUG(2, CIREN_SM, "switching mode to linger");
+        DEBUG(0, CIREN_SM, "switching mode to linger");
         dwell_packet_switch = switch_linger;
         break;
     case DWELL:
-        DEBUG(2, CIREN_SM, "switching mode to dwell");
+        DEBUG(0, CIREN_SM, "switching mode to dwell");
         dwell_packet_switch = switch_dwell;
         break;
@@ -431 +431 @@
         portTxDataIn->getData(I_in_tx, Q_in_tx, tx_metadata);
         N_in = I_in_tx->length();
-        if (opMode == SCAN)
-           SwitchOperationalMode(LINGER);
+        if (tx_metadata->port_id == 127) {
+            dwell_packet_counter = 0;
+            SwitchOperationalMode(LINGER);
+        }
 
         // process data here
@@ -525 +527 @@
         sensing_counter++;
         scan_energy = 0.01f;
-        if (opMode != DWELL || (opMode == DWELL && sensing_counter >= 100) ) {
+        if (opMode == SCAN || (opMode == DWELL && sensing_counter >= 100) ) {
             sensing_counter = 0;
             // measure energy