* Also print channel number.
This commit is contained in:
parent
36f6efd21c
commit
738a970660
4 changed files with 20 additions and 16 deletions
|
@ -26,7 +26,7 @@
|
||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* @(#)$Id: gateway.c,v 1.1 2007/02/02 14:07:34 bg- Exp $
|
* @(#)$Id: gateway.c,v 1.2 2007/04/11 10:14:00 bg- Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -110,7 +110,7 @@ main(int argc, char **argv)
|
||||||
leds_toggle(LEDS_ALL);
|
leds_toggle(LEDS_ALL);
|
||||||
slip_arch_init(BAUD2UBR(38400)); /* Must come before first printf */
|
slip_arch_init(BAUD2UBR(38400)); /* Must come before first printf */
|
||||||
printf("Starting %s "
|
printf("Starting %s "
|
||||||
"($Id: gateway.c,v 1.1 2007/02/02 14:07:34 bg- Exp $)\n", __FILE__);
|
"($Id: gateway.c,v 1.2 2007/04/11 10:14:00 bg- Exp $)\n", __FILE__);
|
||||||
ds2411_init();
|
ds2411_init();
|
||||||
cc2420_init();
|
cc2420_init();
|
||||||
xmem_init();
|
xmem_init();
|
||||||
|
@ -120,9 +120,10 @@ main(int argc, char **argv)
|
||||||
* Hardware initialization done!
|
* Hardware initialization done!
|
||||||
*/
|
*/
|
||||||
|
|
||||||
printf("MAC %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n",
|
printf("MAC %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x CHANNEL %d\n",
|
||||||
ds2411_id[0], ds2411_id[1], ds2411_id[2], ds2411_id[3],
|
ds2411_id[0], ds2411_id[1], ds2411_id[2], ds2411_id[3],
|
||||||
ds2411_id[4], ds2411_id[5], ds2411_id[6], ds2411_id[7]);
|
ds2411_id[4], ds2411_id[5], ds2411_id[6], ds2411_id[7],
|
||||||
|
RF_CHANNEL);
|
||||||
|
|
||||||
uip_ipaddr_copy(&uip_hostaddr, &cc2420if.ipaddr);
|
uip_ipaddr_copy(&uip_hostaddr, &cc2420if.ipaddr);
|
||||||
uip_ipaddr_copy(&uip_netmask, &cc2420if.netmask);
|
uip_ipaddr_copy(&uip_netmask, &cc2420if.netmask);
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* @(#)$Id: client.c,v 1.5 2007/04/04 11:38:35 bg- Exp $
|
* @(#)$Id: client.c,v 1.6 2007/04/11 10:13:59 bg- Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -106,7 +106,7 @@ main(int argc, char **argv)
|
||||||
leds_toggle(LEDS_ALL);
|
leds_toggle(LEDS_ALL);
|
||||||
slip_arch_init(BAUD2UBR(115200)); /* Must come before first printf */
|
slip_arch_init(BAUD2UBR(115200)); /* Must come before first printf */
|
||||||
printf("Starting %s "
|
printf("Starting %s "
|
||||||
"($Id: client.c,v 1.5 2007/04/04 11:38:35 bg- Exp $)\n", __FILE__);
|
"($Id: client.c,v 1.6 2007/04/11 10:13:59 bg- Exp $)\n", __FILE__);
|
||||||
ds2411_init();
|
ds2411_init();
|
||||||
sensors_light_init();
|
sensors_light_init();
|
||||||
cc2420_init();
|
cc2420_init();
|
||||||
|
@ -117,9 +117,10 @@ main(int argc, char **argv)
|
||||||
* Hardware initialization done!
|
* Hardware initialization done!
|
||||||
*/
|
*/
|
||||||
|
|
||||||
printf("MAC %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n",
|
printf("MAC %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x CHANNEL %d\n",
|
||||||
ds2411_id[0], ds2411_id[1], ds2411_id[2], ds2411_id[3],
|
ds2411_id[0], ds2411_id[1], ds2411_id[2], ds2411_id[3],
|
||||||
ds2411_id[4], ds2411_id[5], ds2411_id[6], ds2411_id[7]);
|
ds2411_id[4], ds2411_id[5], ds2411_id[6], ds2411_id[7],
|
||||||
|
RF_CHANNEL);
|
||||||
|
|
||||||
uip_ipaddr_copy(&uip_hostaddr, &cc2420if.ipaddr);
|
uip_ipaddr_copy(&uip_hostaddr, &cc2420if.ipaddr);
|
||||||
uip_ipaddr_copy(&uip_netmask, &cc2420if.netmask);
|
uip_ipaddr_copy(&uip_netmask, &cc2420if.netmask);
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* @(#)$Id: dhclient.c,v 1.8 2007/04/04 11:40:17 bg- Exp $
|
* @(#)$Id: dhclient.c,v 1.9 2007/04/11 10:13:59 bg- Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -102,7 +102,7 @@ main(int argc, char **argv)
|
||||||
leds_toggle(LEDS_ALL);
|
leds_toggle(LEDS_ALL);
|
||||||
slip_arch_init(BAUD2UBR(115200)); /* Must come before first printf */
|
slip_arch_init(BAUD2UBR(115200)); /* Must come before first printf */
|
||||||
printf("Starting %s "
|
printf("Starting %s "
|
||||||
"($Id: dhclient.c,v 1.8 2007/04/04 11:40:17 bg- Exp $)\n", __FILE__);
|
"($Id: dhclient.c,v 1.9 2007/04/11 10:13:59 bg- Exp $)\n", __FILE__);
|
||||||
ds2411_init();
|
ds2411_init();
|
||||||
sensors_light_init();
|
sensors_light_init();
|
||||||
cc2420_init();
|
cc2420_init();
|
||||||
|
@ -113,9 +113,10 @@ main(int argc, char **argv)
|
||||||
* Hardware initialization done!
|
* Hardware initialization done!
|
||||||
*/
|
*/
|
||||||
|
|
||||||
printf("MAC %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n",
|
printf("MAC %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x CHANNEL %d\n",
|
||||||
ds2411_id[0], ds2411_id[1], ds2411_id[2], ds2411_id[3],
|
ds2411_id[0], ds2411_id[1], ds2411_id[2], ds2411_id[3],
|
||||||
ds2411_id[4], ds2411_id[5], ds2411_id[6], ds2411_id[7]);
|
ds2411_id[4], ds2411_id[5], ds2411_id[6], ds2411_id[7],
|
||||||
|
RF_CHANNEL);
|
||||||
|
|
||||||
srand(rand() +
|
srand(rand() +
|
||||||
(ds2411_id[3]<<8) + (ds2411_id[4]<<6) + (ds2411_id[5]<<4) +
|
(ds2411_id[3]<<8) + (ds2411_id[4]<<6) + (ds2411_id[5]<<4) +
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* @(#)$Id: gateway.c,v 1.7 2007/04/04 11:41:38 bg- Exp $
|
* @(#)$Id: gateway.c,v 1.8 2007/04/11 10:13:59 bg- Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -128,7 +128,7 @@ main(int argc, char **argv)
|
||||||
leds_toggle(LEDS_ALL);
|
leds_toggle(LEDS_ALL);
|
||||||
slip_arch_init(BAUD2UBR(115200)); /* Must come before first printf */
|
slip_arch_init(BAUD2UBR(115200)); /* Must come before first printf */
|
||||||
printf("Starting %s "
|
printf("Starting %s "
|
||||||
"($Id: gateway.c,v 1.7 2007/04/04 11:41:38 bg- Exp $)\n", __FILE__);
|
"($Id: gateway.c,v 1.8 2007/04/11 10:13:59 bg- Exp $)\n", __FILE__);
|
||||||
ds2411_init();
|
ds2411_init();
|
||||||
sensors_light_init();
|
sensors_light_init();
|
||||||
cc2420_init();
|
cc2420_init();
|
||||||
|
@ -138,9 +138,10 @@ main(int argc, char **argv)
|
||||||
* Hardware initialization done!
|
* Hardware initialization done!
|
||||||
*/
|
*/
|
||||||
|
|
||||||
printf("MAC %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n",
|
printf("MAC %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x CHANNEL %d\n",
|
||||||
ds2411_id[0], ds2411_id[1], ds2411_id[2], ds2411_id[3],
|
ds2411_id[0], ds2411_id[1], ds2411_id[2], ds2411_id[3],
|
||||||
ds2411_id[4], ds2411_id[5], ds2411_id[6], ds2411_id[7]);
|
ds2411_id[4], ds2411_id[5], ds2411_id[6], ds2411_id[7],
|
||||||
|
RF_CHANNEL);
|
||||||
|
|
||||||
uip_ipaddr_copy(&uip_hostaddr, &cc2420if.ipaddr);
|
uip_ipaddr_copy(&uip_hostaddr, &cc2420if.ipaddr);
|
||||||
uip_ipaddr_copy(&uip_netmask, &cc2420if.netmask);
|
uip_ipaddr_copy(&uip_netmask, &cc2420if.netmask);
|
||||||
|
|
Loading…
Reference in a new issue