SQUASHME: added optional pan id to txtsnd

Author: thomaseichinger

drivers/at86rf231/at86rf231.c

@@ -66,10 +66,11 @@ int at86rf231_initialize(netdev_t *dev)
     /* TODO :
      * and configure security, power
      */
-
-    radio_pan = 0;
-    radio_pan = 0x00FF & (uint16_t)at86rf231_reg_read(AT86RF231_REG__PAN_ID_0);
-    radio_pan |= (uint16_t)at86rf231_reg_read(AT86RF231_REG__PAN_ID_1) << 8;
+#ifdef MODULE_CONFIG
+    at86rf231_set_pan(sysconfig.pan_id);
+#else
+    at86rf231_set_pan(0x0001);
+#endif
 
     radio_channel = at86rf231_reg_read(AT86RF231_REG__PHY_CC_CCA) & AT86RF231_PHY_CC_CCA_MASK__CHANNEL;
 

sys/shell/commands/sc_transceiver.c

@@ -218,8 +218,8 @@ void _transceiver_send_handler(int argc, char **argv)
         puts("Transceiver not initialized");
         return;
     }
-    if (argc != 3) {
-        printf("Usage:\t%s <ADDR> <MSG>\n", argv[0]);
+    if (argc < 3) {
+        printf("Usage:\t%s <ADDR> <MSG> [PAN]\n", argv[0]);
         return;
     }
 
@@ -243,8 +243,13 @@ void _transceiver_send_handler(int argc, char **argv)
     p.frame.payload_len = strlen(text_msg) + 1;
     p.frame.fcf.dest_addr_m = IEEE_802154_SHORT_ADDR_M;
     p.frame.fcf.src_addr_m = IEEE_802154_SHORT_ADDR_M;
-    p.frame.dest_pan_id = 1;
     p.frame.dest_addr[1] = atoi(argv[1]);
+    if (argc == 4) {
+        p.frame.dest_pan_id = atoi(argv[3]);
+    }
+    else {
+        p.frame.dest_pan_id = 1;
+    }
 #else
     p.data = (uint8_t *) text_msg;
     p.length = strlen(text_msg) + 1;