diff --git a/.gitignore b/.gitignore index 0cc3baf0a..ecec9ba6e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,13 @@ -*~ -*.swp +.a +*.bin +*.map +*.png +*.log +*.elf *.ihex obj_* -*.z1 -!Makefile.z1 -*.sky -*.map -*.a -*pyc -*.pyc -symbols.c -symbols.h -*_del* -tools/ -*.class +symbols.* +Makefile.target +doc/html +patches-* +tools/tunslip6 diff --git a/Makefile.include b/Makefile.include index 916d07df9..89dd09304 100644 --- a/Makefile.include +++ b/Makefile.include @@ -36,9 +36,6 @@ savedefines: @echo >Makefile.$(TARGET).defines "DEFINES = $(DEFINES)" OBJECTDIR = obj_$(TARGET) -ifeq (${wildcard $(OBJECTDIR)},) - DUMMY := ${shell mkdir $(OBJECTDIR)} -endif LOWERCASE = -abcdefghijklmnopqrstuvwxyz UPPERCASE = _ABCDEFGHIJKLMNOPQRSTUVWXYZ @@ -109,10 +106,13 @@ endif target_makefile := $(wildcard $(CONTIKI)/platform/$(TARGET)/Makefile.$(TARGET)) -# Check if the target makefile exists +# Check if the target makefile exists, and create the object directory if necessary. ifeq ($(strip $(target_makefile)),) ${error The target platform "$(TARGET)" does not exist (maybe it was misspelled?)} else + ifeq (${wildcard $(OBJECTDIR)},) + DUMMY := ${shell mkdir $(OBJECTDIR)} + endif include $(CONTIKI)/platform/$(TARGET)/Makefile.$(TARGET) endif diff --git a/apps/rest-coap/Makefile.rest-coap b/apps/rest-coap/Makefile.rest-coap old mode 100755 new mode 100644 diff --git a/apps/rest-common/Makefile.rest-common b/apps/rest-common/Makefile.rest-common old mode 100755 new mode 100644 diff --git a/apps/rest-common/rest.c b/apps/rest-common/rest.c old mode 100755 new mode 100644 diff --git a/apps/rest-common/rest.h b/apps/rest-common/rest.h old mode 100755 new mode 100644 diff --git a/apps/rest-http/Makefile.rest-http b/apps/rest-http/Makefile.rest-http old mode 100755 new mode 100644 diff --git a/apps/rest-http/http-common.c b/apps/rest-http/http-common.c old mode 100755 new mode 100644 diff --git a/apps/rest-http/http-common.h b/apps/rest-http/http-common.h old mode 100755 new mode 100644 diff --git a/apps/rest-http/http-server.c b/apps/rest-http/http-server.c old mode 100755 new mode 100644 diff --git a/apps/rest-http/http-server.h b/apps/rest-http/http-server.h old mode 100755 new mode 100644 diff --git a/apps/shell/shell-netperf.c b/apps/shell/shell-netperf.c index d68ba47f0..435b4505b 100644 --- a/apps/shell/shell-netperf.c +++ b/apps/shell/shell-netperf.c @@ -146,7 +146,7 @@ print_remote_stats(struct stats *s) { unsigned long total_time; - printf("%d 1 %d %d %d %u %lu %lu %lu %lu %lu %lu # for automatic processing\n", + printf("%d 1 %d %d %d %lu %lu %lu %lu %lu %lu %lu # for automatic processing\n", current_type, s->sent, s->received, s->timedout, s->end - s->start, @@ -173,7 +173,7 @@ print_local_stats(struct stats *s) { unsigned long total_time; - printf("%d 0 %d %d %d %u %lu %lu %lu %lu %lu %lu # for automatic processing\n", + printf("%d 0 %d %d %d %lu %lu %lu %lu %lu %lu %lu # for automatic processing\n", current_type, s->sent, s->received, s->timedout, s->end - s->start, @@ -185,12 +185,12 @@ print_local_stats(struct stats *s) printf("Local node statistics:\n"); - printf(" Total transfer time: %d.%d seconds, %d.%02d packets/second\n", + printf(" Total transfer time: %lu.%02lu seconds, %lu.%02lu packets/second\n", (s->end - s->start) / CLOCK_SECOND, ((10 * (s->end - s->start)) / CLOCK_SECOND) % 10, - CLOCK_SECOND * s->sent / (s->end - s->start), - (100 * CLOCK_SECOND * s->sent / (s->end - s->start)) % 100); - + ((1UL * CLOCK_SECOND * s->sent) / (s->end - s->start)), + (((100UL * CLOCK_SECOND * s->sent) / (s->end - s->start)) % 100)); + printf(" Average round-trip-time: %lu ms (%lu + %lu)\n", (1000 * (s->total_rx_latency + s->total_tx_latency) / s->received) / RTIMER_ARCH_SECOND, diff --git a/apps/unit-test/unit-test.h b/apps/unit-test/unit-test.h index d11747cb0..e12fff50d 100644 --- a/apps/unit-test/unit-test.h +++ b/apps/unit-test/unit-test.h @@ -174,6 +174,17 @@ typedef struct unit_test { } \ } while(0) +/** + * Obtain the result of a certain unit test. + * + * If the unit test has not yet been executed, this macro returns + * unit_test_failed. Otherwise it returns the result of the last + * execution of the unit test. + * + * \param name The name of the unit test. + */ +#define UNIT_TEST_RESULT(name) (unit_test_##name.result) + /* The default print function. */ void unit_test_print_report(const unit_test_t *utp); diff --git a/core/cfs/cfs-coffee.c b/core/cfs/cfs-coffee.c old mode 100755 new mode 100644 diff --git a/core/dev/ds2411.c b/core/dev/ds2411.c index c98e1940c..e4f938cb9 100644 --- a/core/dev/ds2411.c +++ b/core/dev/ds2411.c @@ -50,7 +50,6 @@ #include -#include #include #include "contiki.h" diff --git a/core/dev/leds.c b/core/dev/leds.c index a78fc7a75..f0d1e8fc5 100644 --- a/core/dev/leds.c +++ b/core/dev/leds.c @@ -121,7 +121,3 @@ leds_invert(unsigned char ledv) { show_leds(ledv); } /*---------------------------------------------------------------------------*/ -void leds_green(int o) { o?leds_on(LEDS_GREEN):leds_off(LEDS_GREEN); } -void leds_yellow(int o) { o?leds_on(LEDS_YELLOW):leds_off(LEDS_YELLOW); } -void leds_red(int o) { o?leds_on(LEDS_RED):leds_off(LEDS_RED); } -/*---------------------------------------------------------------------------*/ diff --git a/core/dev/leds.h b/core/dev/leds.h index 60f279d4c..dcb947e36 100644 --- a/core/dev/leds.h +++ b/core/dev/leds.h @@ -55,11 +55,18 @@ void leds_init(void); */ void leds_blink(void); +#ifndef LEDS_GREEN #define LEDS_GREEN 1 -#define LEDS_YELLOW 2 -#define LEDS_RED 4 -#define LEDS_BLUE LEDS_YELLOW /* Tmote Sky is colorblind? */ -#define leds_blue leds_yellow +#endif /* LEDS_GREEN */ +#ifndef LEDS_YELLOW +#define LEDS_YELLOW 2 +#endif /* LEDS_YELLOW */ +#ifndef LEDS_RED +#define LEDS_RED 4 +#endif /* LEDS_RED */ +#ifndef LEDS_BLUE +#define LEDS_BLUE LEDS_YELLOW +#endif /* LEDS_BLUE */ #ifdef LEDS_CONF_ALL #define LEDS_ALL LEDS_CONF_ALL @@ -76,18 +83,6 @@ void leds_off(unsigned char leds); void leds_toggle(unsigned char leds); void leds_invert(unsigned char leds); - - - -void leds_green(int onoroff); -void leds_red(int onoroff); -void leds_yellow(int onoroff); -#define LEDS_ON 1 -#define LEDS_OFF 0 - - - - /** * Leds implementation */ diff --git a/core/net/neighbor-info.c b/core/net/neighbor-info.c index 16312e06d..c36a2b8a5 100644 --- a/core/net/neighbor-info.c +++ b/core/net/neighbor-info.c @@ -46,41 +46,40 @@ #define ETX_LIMIT 15 #define ETX_SCALE 100 #define ETX_ALPHA 90 -#define ETX_FIRST_GUESS 5 - -#define NOACK_PACKET_ETX 8 +#define ETX_NOACK_PENALTY ETX_LIMIT /*---------------------------------------------------------------------------*/ -NEIGHBOR_ATTRIBUTE(uint8_t, etx, NULL); +NEIGHBOR_ATTRIBUTE(link_metric_t, etx, NULL); static neighbor_info_subscriber_t subscriber_callback; /*---------------------------------------------------------------------------*/ static void -update_etx(const rimeaddr_t *dest, int packet_etx) +update_metric(const rimeaddr_t *dest, int packet_metric) { - uint8_t *etxp; - uint8_t recorded_etx, new_etx; + link_metric_t *metricp; + link_metric_t recorded_metric, new_metric; - etxp = (uint8_t *)neighbor_attr_get_data(&etx, dest); - if(etxp == NULL || *etxp == 0) { - recorded_etx = NEIGHBOR_INFO_ETX2FIX(ETX_FIRST_GUESS); + metricp = (link_metric_t *)neighbor_attr_get_data(&etx, dest); + packet_metric = NEIGHBOR_INFO_ETX2FIX(packet_metric); + if(metricp == NULL || *metricp == 0) { + recorded_metric = NEIGHBOR_INFO_ETX2FIX(ETX_LIMIT); + new_metric = packet_metric; } else { - recorded_etx = *etxp; + recorded_metric = *metricp; + /* Update the EWMA of the ETX for the neighbor. */ + new_metric = ((uint16_t)recorded_metric * ETX_ALPHA + + (uint16_t)packet_metric * (ETX_SCALE - ETX_ALPHA)) / ETX_SCALE; } - /* Update the EWMA of the ETX for the neighbor. */ - packet_etx = NEIGHBOR_INFO_ETX2FIX(packet_etx); - new_etx = ((uint16_t)recorded_etx * ETX_ALPHA + - (uint16_t)packet_etx * (ETX_SCALE - ETX_ALPHA)) / ETX_SCALE; PRINTF("neighbor-info: ETX changed from %d to %d (packet ETX = %d) %d\n", - NEIGHBOR_INFO_FIX2ETX(recorded_etx), - NEIGHBOR_INFO_FIX2ETX(new_etx), - NEIGHBOR_INFO_FIX2ETX(packet_etx), + NEIGHBOR_INFO_FIX2ETX(recorded_metric), + NEIGHBOR_INFO_FIX2ETX(new_metric), + NEIGHBOR_INFO_FIX2ETX(packet_metric), dest->u8[7]); if(neighbor_attr_has_neighbor(dest)) { - neighbor_attr_set_data(&etx, dest, &new_etx); - if(new_etx != recorded_etx && subscriber_callback != NULL) { - subscriber_callback(dest, 1, new_etx); + neighbor_attr_set_data(&etx, dest, &new_metric); + if(new_metric != recorded_metric && subscriber_callback != NULL) { + subscriber_callback(dest, 1, new_metric); } } } @@ -96,9 +95,6 @@ add_neighbor(const rimeaddr_t *addr) PRINTF("neighbor-info: The neighbor is already known\n"); break; default: - if(subscriber_callback != NULL) { - subscriber_callback(addr, 1, NEIGHBOR_INFO_ETX2FIX(ETX_FIRST_GUESS)); - } break; } } @@ -107,7 +103,7 @@ void neighbor_info_packet_sent(int status, int numtx) { const rimeaddr_t *dest; - uint8_t packet_etx; + link_metric_t packet_metric; dest = packetbuf_addr(PACKETBUF_ADDR_RECEIVER); if(rimeaddr_cmp(dest, &rimeaddr_null)) { @@ -120,25 +116,22 @@ neighbor_info_packet_sent(int status, int numtx) switch(status) { case MAC_TX_OK: - packet_etx = numtx; + packet_metric = numtx; add_neighbor(dest); break; case MAC_TX_COLLISION: - packet_etx = numtx; + packet_metric = numtx; break; case MAC_TX_NOACK: - packet_etx = NOACK_PACKET_ETX; - /* error and collissions will not cause high hits ??? */ + packet_metric = ETX_NOACK_PENALTY; break; - case MAC_TX_ERR: default: - packet_etx = 0; - break; + /* Do not penalize the ETX when collisions or transmission + errors occur. */ + return; } - if(packet_etx > 0) { - update_etx(dest, packet_etx); - } + update_metric(dest, packet_metric); } /*---------------------------------------------------------------------------*/ void @@ -169,12 +162,12 @@ neighbor_info_subscribe(neighbor_info_subscriber_t s) return 0; } /*---------------------------------------------------------------------------*/ -uint8_t -neighbor_info_get_etx(const rimeaddr_t *addr) +link_metric_t +neighbor_info_get_metric(const rimeaddr_t *addr) { - uint8_t *etxp; + link_metric_t *metricp; - etxp = (uint8_t *)neighbor_attr_get_data(&etx, addr); - return etxp == NULL ? 0 : *etxp; + metricp = (link_metric_t *)neighbor_attr_get_data(&etx, addr); + return metricp == NULL ? ETX_LIMIT : *metricp; } /*---------------------------------------------------------------------------*/ diff --git a/core/net/neighbor-info.h b/core/net/neighbor-info.h index 09dd84ed4..f292c2ef1 100644 --- a/core/net/neighbor-info.h +++ b/core/net/neighbor-info.h @@ -52,6 +52,7 @@ #define NEIGHBOR_INFO_FIX2ETX(fix) ((fix) / NEIGHBOR_INFO_ETX_DIVISOR) typedef void (*neighbor_info_subscriber_t)(const rimeaddr_t *, int known, int etx); +typedef uint8_t link_metric_t; /** * Notify the neighbor information module about the status of @@ -85,6 +86,6 @@ int neighbor_info_subscribe(neighbor_info_subscriber_t); * * \return Returns ETX if the neighbor exists, and 0 if not. */ -uint8_t neighbor_info_get_etx(const rimeaddr_t *addr); +link_metric_t neighbor_info_get_etx(const rimeaddr_t *addr); #endif /* NEIGHBOR_INFO_H */ diff --git a/core/net/psock.c b/core/net/psock.c index 117618229..9d3d0781d 100644 --- a/core/net/psock.c +++ b/core/net/psock.c @@ -286,31 +286,34 @@ PT_THREAD(psock_readto(CC_REGISTER_ARG struct psock *psock, unsigned char c)) PT_END(&psock->psockpt); } /*---------------------------------------------------------------------------*/ -PT_THREAD(psock_readbuf(CC_REGISTER_ARG struct psock *psock)) +PT_THREAD(psock_readbuf_len(CC_REGISTER_ARG struct psock *psock, uint16_t len)) { PT_BEGIN(&psock->psockpt); buf_setup(&psock->buf, psock->bufptr, psock->bufsize); - + /* XXX: Should add buf_checkmarker() before do{} loop, if incoming data has been handled while waiting for a write. */ - - if(psock->readlen == 0) { - PT_WAIT_UNTIL(&psock->psockpt, psock_newdata(psock)); - psock->state = STATE_READ; - psock->readptr = (u8_t *)uip_appdata; - psock->readlen = uip_datalen(); - } - buf_bufdata(&psock->buf, psock->bufsize, - &psock->readptr, - &psock->readlen); - + + /* read len bytes or to end of data */ + do { + if(psock->readlen == 0) { + PT_WAIT_UNTIL(&psock->psockpt, psock_newdata(psock)); + psock->state = STATE_READ; + psock->readptr = (u8_t *)uip_appdata; + psock->readlen = uip_datalen(); + } + } while(buf_bufdata(&psock->buf, psock->bufsize, + &psock->readptr, &psock->readlen) == BUF_NOT_FULL && + psock_datalen(psock) < len); + if(psock_datalen(psock) == 0) { psock->state = STATE_NONE; PT_RESTART(&psock->psockpt); } PT_END(&psock->psockpt); } + /*---------------------------------------------------------------------------*/ void psock_init(CC_REGISTER_ARG struct psock *psock, diff --git a/core/net/psock.h b/core/net/psock.h index 1d3a7fd3f..bdd6e95b6 100644 --- a/core/net/psock.h +++ b/core/net/psock.h @@ -241,7 +241,7 @@ PT_THREAD(psock_generator_send(struct psock *psock, */ #define PSOCK_CLOSE(psock) uip_close() -PT_THREAD(psock_readbuf(struct psock *psock)); +PT_THREAD(psock_readbuf_len(struct psock *psock, uint16_t len)); /** * Read data until the buffer is full. * @@ -255,7 +255,24 @@ PT_THREAD(psock_readbuf(struct psock *psock)); * \hideinitializer */ #define PSOCK_READBUF(psock) \ - PT_WAIT_THREAD(&((psock)->pt), psock_readbuf(psock)) + PT_WAIT_THREAD(&((psock)->pt), psock_readbuf_len(psock, 1)) + + +/** + * Read data until at least len bytes have been read. + * + * This macro will block waiting for data and read the data into the + * input buffer specified with the call to PSOCK_INIT(). Data is read + * until the buffer is full or len bytes have been read. + * + * \param psock (struct psock *) A pointer to the protosocket from which + * data should be read. + * \param len (uint16_t) The minimum number of bytes to read. + * + * \hideinitializer + */ +#define PSOCK_READBUF_LEN(psock, len) \ + PT_WAIT_THREAD(&((psock)->pt), psock_readbuf_len(psock, len)) PT_THREAD(psock_readto(struct psock *psock, unsigned char c)); /** diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c index 1aec5be77..64201ca50 100644 --- a/core/net/rpl/rpl-dag.c +++ b/core/net/rpl/rpl-dag.c @@ -94,8 +94,6 @@ static rpl_of_t * const objective_functions[] = {&RPL_OF}; #define RPL_DIO_INTERVAL_DOUBLINGS RPL_CONF_DIO_INTERVAL_DOUBLINGS #endif /* !RPL_CONF_DIO_INTERVAL_DOUBLINGS */ -#define INITIAL_ETX NEIGHBOR_INFO_ETX_DIVISOR * 5 - /************************************************************************/ /* Allocate parents from the same static MEMB chunk to reduce memory waste. */ MEMB(parent_memb, struct rpl_parent, RPL_MAX_PARENTS); @@ -309,7 +307,7 @@ rpl_add_parent(rpl_dag_t *dag, rpl_dio_t *dio, uip_ipaddr_t *addr) memcpy(&p->addr, addr, sizeof(p->addr)); p->dag = dag; p->rank = dio->rank; - p->etx = INITIAL_ETX; + p->link_metric = INITIAL_LINK_METRIC; p->dtsn = 0; memcpy(&p->mc, &dio->mc, sizeof(p->mc)); @@ -358,6 +356,7 @@ rpl_select_parent(rpl_dag_t *dag) rpl_reset_dio_timer(dag, 1); PRINTF("RPL: New preferred parent, rank changed from %u to %u\n", (unsigned)dag->rank, dag->of->calculate_rank(best, 0)); + RPL_STAT(rpl_stats.parent_switch++); } /* Update the DAG rank, since link-layer information may have changed @@ -458,8 +457,6 @@ join_dag(uip_ipaddr_t *from, rpl_dio_t *dio) } PRINTF("succeeded\n"); - p->etx = INITIAL_ETX; /* The lowest confidence for new parents. */ - /* Determine the objective function by using the objective code point of the DIO. */ of = rpl_find_of(dio->ocp); @@ -732,7 +729,7 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio) PRINTF(")\n"); return; } - + PRINTF("RPL: New candidate parent with rank %u: ", (unsigned)p->rank); PRINT6ADDR(from); PRINTF("\n"); @@ -742,7 +739,8 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio) } /* We have allocated a candidate parent; process the DIO further. */ - + + memcpy(&p->mc, &dio->mc, sizeof(p->mc)); p->rank = dio->rank; if(rpl_process_parent_event(dag, p) == 0) { /* The candidate parent no longer exists. */ diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c index d4963b79e..2b76f919f 100644 --- a/core/net/rpl/rpl-icmp6.c +++ b/core/net/rpl/rpl-icmp6.c @@ -250,9 +250,10 @@ dio_input(void) dio.mc.aggr = buffer[i + 4] >> 4; dio.mc.prec = buffer[i + 4] & 0xf; dio.mc.length = buffer[i + 5]; + if(dio.mc.type == RPL_DAG_MC_ETX) { - dio.mc.etx.etx = buffer[i + 6] << 8; - dio.mc.etx.etx |= buffer[i + 7]; + dio.mc.obj.etx = buffer[i + 6] << 8; + dio.mc.obj.etx |= buffer[i + 7]; PRINTF("RPL: DAG MC: type %u, flags %u, aggr %u, prec %u, length %u, ETX %u\n", (unsigned)dio.mc.type, @@ -260,7 +261,10 @@ dio_input(void) (unsigned)dio.mc.aggr, (unsigned)dio.mc.prec, (unsigned)dio.mc.length, - (unsigned)dio.mc.etx.etx); + (unsigned)dio.mc.obj.etx); + } else if(dio.mc.type == RPL_DAG_MC_ENERGY) { + dio.mc.obj.energy.flags = buffer[i + 6]; + dio.mc.obj.energy.energy_est = buffer[i + 7]; } else { PRINTF("RPL: Unhandled DAG MC type: %u\n", (unsigned)dio.mc.type); return; @@ -380,8 +384,12 @@ dio_output(rpl_dag_t *dag, uip_ipaddr_t *uc_addr) buffer[pos++] |= dag->mc.prec; if(dag->mc.type == RPL_DAG_MC_ETX) { buffer[pos++] = 2; - buffer[pos++] = dag->mc.etx.etx >> 8; - buffer[pos++] = dag->mc.etx.etx & 0xff; + buffer[pos++] = dag->mc.obj.etx >> 8; + buffer[pos++] = dag->mc.obj.etx & 0xff; + } else if(dag->mc.type == RPL_DAG_MC_ENERGY) { + buffer[pos++] = 2; + buffer[pos++] = dag->mc.obj.energy.flags; + buffer[pos++] = dag->mc.obj.energy.energy_est; } else { PRINTF("RPL: Unable to send DIO because of unhandled DAG MC type %u\n", (unsigned)dag->mc.type); @@ -459,6 +467,8 @@ dao_input(void) uint8_t prefixlen; uint8_t flags; uint8_t subopt_type; + uint8_t pathcontrol; + uint8_t pathsequence; uip_ipaddr_t prefix; uip_ds6_route_t *rep; uint8_t buffer_length; @@ -523,7 +533,9 @@ dao_input(void) break; case RPL_DIO_SUBOPT_TRANSIT: /* path sequence and control ignored */ - lifetime = get32(buffer, i + 4); + pathcontrol = buffer[i + 3]; + pathsequence = buffer[i + 4]; + lifetime = buffer[i + 5]; /* parent address also ignored */ break; } @@ -567,11 +579,11 @@ dao_input(void) rep = rpl_add_route(dag, &prefix, prefixlen, &dao_sender_addr); if(rep == NULL) { - RPL_STAT(rpl_stats.memory_overflows++); + RPL_STAT(rpl_stats.mem_overflows++); PRINTF("RPL: Could not add a route after receiving a DAO\n"); return; } else { - rep->state.lifetime = lifetime; + rep->state.lifetime = lifetime * dag->lifetime_unit; rep->state.learned_from = learned_from; } @@ -637,13 +649,13 @@ dao_output(rpl_parent_t *n, uint32_t lifetime) memcpy(buffer + pos, &prefix, (prefixlen + 7) / CHAR_BIT); pos += ((prefixlen + 7) / CHAR_BIT); - /* create a transit information subopt */ + /* create a transit information subopt (RPL-18)*/ buffer[pos++] = RPL_DIO_SUBOPT_TRANSIT; - buffer[pos++] = 6; - buffer[pos++] = 0; /* path seq - ignored */ + buffer[pos++] = 4; + buffer[pos++] = 0; /* flags - ignored */ buffer[pos++] = 0; /* path control - ignored */ - set32(buffer, pos, lifetime); - pos += 4; + buffer[pos++] = 0; /* path seq - ignored */ + buffer[pos++] = (lifetime / dag->lifetime_unit) & 0xff; if(n == NULL) { uip_create_linklocal_rplnodes_mcast(&addr); diff --git a/core/net/rpl/rpl-of-etx.c b/core/net/rpl/rpl-of-etx.c index e301968c0..9d3748174 100644 --- a/core/net/rpl/rpl-of-etx.c +++ b/core/net/rpl/rpl-of-etx.c @@ -66,7 +66,7 @@ rpl_of_t rpl_of_etx = { #define NI_ETX_TO_RPL_ETX(etx) \ ((etx) * (RPL_DAG_MC_ETX_DIVISOR / NEIGHBOR_INFO_ETX_DIVISOR)) -#define RPL_ETX_TO_NI_ETX(etx) \ +#define RPL_ETX_TO_NI_ETX(etx) \ ((etx) / (RPL_DAG_MC_ETX_DIVISOR / NEIGHBOR_INFO_ETX_DIVISOR)) /* Reject parents that have a higher link metric than the following. */ @@ -75,22 +75,21 @@ rpl_of_t rpl_of_etx = { /* Reject parents that have a higher path cost than the following. */ #define MAX_PATH_COST 100 -/* An initial guess of the link metric. */ -#define INITIAL_LINK_METRIC 3 - /* * The rank must differ more than 1/PARENT_SWITCH_THRESHOLD_DIV in order * to switch preferred parent. */ #define PARENT_SWITCH_THRESHOLD_DIV 2 -typedef uint16_t rpl_etx_t; -#define MAX_ETX 65535 +typedef uint16_t rpl_path_metric_t; static uint16_t -calculate_etx(rpl_parent_t *p) +calculate_path_metric(rpl_parent_t *p) { - return p->mc.etx.etx + NI_ETX_TO_RPL_ETX(p->etx); + if(p->mc.obj.etx == 0 && p->rank > ROOT_RANK(p->dag)) { + return MAX_PATH_COST * RPL_DAG_MC_ETX_DIVISOR; + } + return p->mc.obj.etx + NI_ETX_TO_RPL_ETX(p->link_metric); } static void @@ -113,12 +112,9 @@ calculate_rank(rpl_parent_t *p, rpl_rank_t base_rank) if(base_rank == 0) { return INFINITE_RANK; } - rank_increase = INITIAL_LINK_METRIC * DEFAULT_MIN_HOPRANKINC; + rank_increase = NEIGHBOR_INFO_FIX2ETX(INITIAL_LINK_METRIC) * DEFAULT_MIN_HOPRANKINC; } else { - if(p->etx == 0) { - p->etx = INITIAL_LINK_METRIC * NEIGHBOR_INFO_ETX_DIVISOR; - } - rank_increase = (p->etx * p->dag->min_hoprankinc) / NEIGHBOR_INFO_ETX_DIVISOR; + rank_increase = NEIGHBOR_INFO_FIX2ETX(p->link_metric) * p->dag->min_hoprankinc; if(base_rank == 0) { base_rank = p->rank; } @@ -140,46 +136,64 @@ static rpl_parent_t * best_parent(rpl_parent_t *p1, rpl_parent_t *p2) { rpl_dag_t *dag; - rpl_etx_t min_diff; - rpl_etx_t p1_etx; - rpl_etx_t p2_etx; + rpl_path_metric_t min_diff; + rpl_path_metric_t p1_metric; + rpl_path_metric_t p2_metric; dag = p1->dag; /* Both parents must be in the same DAG. */ min_diff = RPL_DAG_MC_ETX_DIVISOR / PARENT_SWITCH_THRESHOLD_DIV; - p1_etx = calculate_etx(p1); - p2_etx = calculate_etx(p2); + p1_metric = calculate_path_metric(p1); + p2_metric = calculate_path_metric(p2); /* Maintain stability of the preferred parent in case of similar ranks. */ - if(p1_etx < p2_etx + min_diff && - p1_etx > p2_etx - min_diff) { - PRINTF("RPL: MRHOF hysteresis: %u <= %u <= %u\n", - p2_etx - min_diff, - p1_etx, - p2_etx + min_diff); - return dag->preferred_parent; + if(p1 == dag->preferred_parent || p2 == dag->preferred_parent) { + if(p1_metric < p2_metric + min_diff && + p1_metric > p2_metric - min_diff) { + PRINTF("RPL: MRHOF hysteresis: %u <= %u <= %u\n", + p2_metric - min_diff, + p1_metric, + p2_metric + min_diff); + return dag->preferred_parent; + } } - return p1_etx < p2_etx ? p1 : p2; + return p1_metric < p2_metric ? p1 : p2; } static void update_metric_container(rpl_dag_t *dag) { +#if RPL_DAG_MC == RPL_DAG_MC_ETX dag->mc.type = RPL_DAG_MC_ETX; dag->mc.flags = RPL_DAG_MC_FLAG_P; dag->mc.aggr = RPL_DAG_MC_AGGR_ADDITIVE; dag->mc.prec = 0; - dag->mc.length = sizeof(dag->mc.etx.etx); + dag->mc.length = sizeof(dag->mc.obj.etx); if(dag->rank == ROOT_RANK(dag)) { - dag->mc.etx.etx = 0; + dag->mc.obj.etx = 0; } else { - dag->mc.etx.etx = calculate_etx(dag->preferred_parent); + dag->mc.obj.etx = calculate_path_metric(dag->preferred_parent); } PRINTF("RPL: My path ETX to the root is %u.%u\n", - dag->mc.etx.etx / RPL_DAG_MC_ETX_DIVISOR, - (dag->mc.etx.etx % RPL_DAG_MC_ETX_DIVISOR * 100) / RPL_DAG_MC_ETX_DIVISOR); + dag->mc.obj.etx / RPL_DAG_MC_ETX_DIVISOR, + (dag->mc.obj.etx % RPL_DAG_MC_ETX_DIVISOR * 100) / RPL_DAG_MC_ETX_DIVISOR); +#elif RPL_DAG_MC == RPL_DAG_MC_ENERGY + dag->mc.type = RPL_DAG_MC_ENERGY; + dag->mc.flags = RPL_DAG_MC_FLAG_P; + dag->mc.aggr = RPL_DAG_MC_AGGR_ADDITIVE; + dag->mc.prec = 0; + dag->mc.length = sizeof(dag->mc.obj.energy); + if(dag->rank == ROOT_RANK(dag)) { + dag->mc.obj.energy.flags = RPL_DAG_MC_ENERGY_TYPE_MAINS << RPL_DAG_MC_ENERGY_TYPE; + } else { + dag->mc.obj.energy.flags = RPL_DAG_MC_ENERGY_TYPE_BATTERY << RPL_DAG_MC_ENERGY_TYPE; + } + dag->mc.obj.energy.energy_est = calculate_path_metric(dag->preferred_parent); +#else +#error "Unsupported RPL_DAG_MC configured. See rpl.h." +#endif /* RPL_DAG_MC */ } diff --git a/core/net/rpl/rpl-private.h b/core/net/rpl/rpl-private.h index 2f5643058..764ed940a 100644 --- a/core/net/rpl/rpl-private.h +++ b/core/net/rpl/rpl-private.h @@ -127,6 +127,8 @@ #define INFINITE_RANK 0xffff +#define INITIAL_LINK_METRIC NEIGHBOR_INFO_ETX2FIX(5) + /* Represents 2^n ms. */ /* Default value according to the specification is 3 which means 8 milliseconds, but that is an unreasonable value if @@ -218,6 +220,7 @@ struct rpl_stats { uint16_t global_repairs; uint16_t malformed_msgs; uint16_t resets; + uint16_t parent_switch; }; typedef struct rpl_stats rpl_stats_t; diff --git a/core/net/rpl/rpl-timers.c b/core/net/rpl/rpl-timers.c index 5d91ba1eb..aa5e6d086 100644 --- a/core/net/rpl/rpl-timers.c +++ b/core/net/rpl/rpl-timers.c @@ -112,7 +112,7 @@ new_dio_interval(rpl_dag_t *dag) dag->version, dag->dio_totint, dag->dio_totsend, dag->dio_totrecv,dag->dio_intcurrent, - dag->rank == ROOT_RANK ? "BLUE" : "ORANGE"); + dag->rank == ROOT_RANK(dag) ? "BLUE" : "ORANGE"); #endif /* RPL_CONF_STATS */ /* reset the redundancy counter */ @@ -205,7 +205,8 @@ handle_dao_timer(void *ptr) fan-out as being under investigation. */ if(dag->preferred_parent != NULL) { PRINTF("RPL: handle_dao_timer - sending DAO\n"); - dao_output(dag->preferred_parent, DEFAULT_ROUTE_LIFETIME); + /* set time to maxtime */ + dao_output(dag->preferred_parent, dag->lifetime_unit * 0xffUL); } else { PRINTF("RPL: Could not find a parent to send a DAO to \n"); } diff --git a/core/net/rpl/rpl.c b/core/net/rpl/rpl.c index fa7ad7be6..b41fbeea7 100644 --- a/core/net/rpl/rpl.c +++ b/core/net/rpl/rpl.c @@ -148,11 +148,10 @@ rpl_link_neighbor_callback(const rimeaddr_t *addr, int known, int etx) return; } - if(etx != parent->etx) { - /* Trigger DAG rank recalculation. */ - parent->updated = 1; - } - parent->etx = etx; + /* Trigger DAG rank recalculation. */ + parent->updated = 1; + + parent->link_metric = etx; if(dag->of->parent_state_callback != NULL) { dag->of->parent_state_callback(parent, known, etx); @@ -163,7 +162,6 @@ rpl_link_neighbor_callback(const rimeaddr_t *addr, int known, int etx) PRINT6ADDR(&parent->addr); PRINTF(" because of bad connectivity (ETX %d)\n", etx); parent->rank = INFINITE_RANK; - parent->updated = 1; } } /************************************************************************/ diff --git a/core/net/rpl/rpl.h b/core/net/rpl/rpl.h index 17a1845ec..c55ee6cd0 100644 --- a/core/net/rpl/rpl.h +++ b/core/net/rpl/rpl.h @@ -49,6 +49,17 @@ #define RPL_CONF_STATS 0 #endif /* RPL_CONF_STATS */ +/* + * Select routing metric supported at runtime. This must be a valid + * DAG Metric Container Object Type (see below). Currently, we only + * support RPL_DAG_MC_ETX and RPL_DAG_MC_ENERGY. + */ +#ifdef RPL_CONF_DAG_MC +#define RPL_DAG_MC RPL_CONF_DAG_MC +#else +#define RPL_DAG_MC RPL_DAG_MC_ETX +#endif /* RPL_CONF_DAG_MC */ + /* * The objective function used by RPL is configurable through the * RPL_CONF_OF parameter. This should be defined to be the name of an @@ -78,8 +89,8 @@ typedef uint16_t rpl_ocp_t; /* DAG Metric Container Object Types, to be confirmed by IANA. */ #define RPL_DAG_MC_NONE 0 /* Local identifier for empty MC */ #define RPL_DAG_MC_NSA 1 /* Node State and Attributes */ -#define RPL_DAG_MC_NE 2 /* Node Energy */ -#define RPL_DAG_MC_HC 3 /* Hop Count */ +#define RPL_DAG_MC_ENERGY 2 /* Node Energy */ +#define RPL_DAG_MC_HOPCOUNT 3 /* Hop Count */ #define RPL_DAG_MC_THROUGHPUT 4 /* Throughput */ #define RPL_DAG_MC_LATENCY 5 /* Latency */ #define RPL_DAG_MC_LQL 6 /* Link Quality Level */ @@ -99,9 +110,19 @@ typedef uint16_t rpl_ocp_t; #define RPL_DAG_MC_AGGR_MINIMUM 2 #define RPL_DAG_MC_AGGR_MULTIPLICATIVE 3 -/* Logical representation of an ETX object in a DAG Metric Container. */ -struct rpl_metric_object_etx { - uint16_t etx; +/* The bit index within the flags field of + the rpl_metric_object_energy structure. */ +#define RPL_DAG_MC_ENERGY_INCLUDED 3 +#define RPL_DAG_MC_ENERGY_TYPE 1 +#define RPL_DAG_MC_ENERGY_ESTIMATION 0 + +#define RPL_DAG_MC_ENERGY_TYPE_MAINS 0 +#define RPL_DAG_MC_ENERGY_TYPE_BATTERY 1 +#define RPL_DAG_MC_ENERGY_TYPE_SCAVENGING 2 + +struct rpl_metric_object_energy { + uint8_t flags; + uint8_t energy_est; }; /* Logical representation of a DAG Metric Container. */ @@ -111,9 +132,10 @@ struct rpl_metric_container { uint8_t aggr; uint8_t prec; uint8_t length; - /* Once we support more objects, the etx field will be replaced by a - union of those. */ - struct rpl_metric_object_etx etx; + union metric_object { + struct rpl_metric_object_energy energy; + uint16_t etx; + } obj; }; typedef struct rpl_metric_container rpl_metric_container_t; /*---------------------------------------------------------------------------*/ @@ -125,7 +147,7 @@ struct rpl_parent { rpl_metric_container_t mc; uip_ipaddr_t addr; rpl_rank_t rank; - uint8_t etx; + uint8_t link_metric; uint8_t dtsn; uint8_t updated; }; diff --git a/core/net/sicslowpan.c b/core/net/sicslowpan.c index 2a795d09d..e58724126 100644 --- a/core/net/sicslowpan.c +++ b/core/net/sicslowpan.c @@ -268,7 +268,7 @@ static uint8_t *hc06_ptr; /* Uncompression of linklocal */ /* 0 -> 16 bytes from packet */ /* 1 -> 2 bytes from prefix - bunch of zeroes and 8 from packet */ -/* 2 -> 2 bytes from prefix - zeroes + 2 from packet */ +/* 2 -> 2 bytes from prefix - 0000::00ff:fe00:XXXX from packet */ /* 3 -> 2 bytes from prefix - infer 8 bytes from lladdr */ /* NOTE: => the uncompress function does change 0xf to 0x10 */ /* NOTE: 0x00 => no-autoconfig => unspecified */ @@ -277,7 +277,7 @@ const uint8_t unc_llconf[] = {0x0f,0x28,0x22,0x20}; /* Uncompression of ctx-based */ /* 0 -> 0 bits from packet [unspecified / reserved] */ /* 1 -> 8 bytes from prefix - bunch of zeroes and 8 from packet */ -/* 2 -> 8 bytes from prefix - zeroes + 2 from packet */ +/* 2 -> 8 bytes from prefix - 0000::00ff:fe00:XXXX + 2 from packet */ /* 3 -> 8 bytes from prefix - infer 8 bytes from lladdr */ const uint8_t unc_ctxconf[] = {0x00,0x88,0x82,0x80}; @@ -338,7 +338,7 @@ compress_addr_64(uint8_t bitpos, uip_ipaddr_t *ipaddr, uip_lladdr_t *lladdr) if(uip_is_addr_mac_addr_based(ipaddr, lladdr)) { return 3 << bitpos; /* 0-bits */ } else if(sicslowpan_is_iid_16_bit_compressable(ipaddr)) { - /* compress IID to 16 bits xxxx::XXXX */ + /* compress IID to 16 bits xxxx::0000:00ff:fe00:XXXX */ memcpy(hc06_ptr, &ipaddr->u16[7], 2); hc06_ptr += 2; return 2 << bitpos; /* 16-bits */ @@ -377,6 +377,11 @@ uncompress_addr(uip_ipaddr_t *ipaddr, uint8_t const prefix[], } if(postcount > 0) { memcpy(&ipaddr->u8[16 - postcount], hc06_ptr, postcount); + if(postcount == 2 && prefcount < 11) { + /* 16 bits uncompression => 0000:00ff:fe00:XXXX */ + ipaddr->u8[11] = 0xff; + ipaddr->u8[12] = 0xfe; + } hc06_ptr += postcount; } else if (prefcount > 0) { /* no IID based configuration if no prefix and no data => unspec */ diff --git a/core/net/sicslowpan.h b/core/net/sicslowpan.h index 49488bcc2..cb73db599 100644 --- a/core/net/sicslowpan.h +++ b/core/net/sicslowpan.h @@ -233,13 +233,15 @@ struct sicslowpan_addr_context { * \brief check whether we can compress the IID in * address 'a' to 16 bits. * This is used for unicast addresses only, and is true - * if first 49 bits of IID are 0 + * if the address is on the format ::0000:00ff:fe00:XXXX + * NOTE: we currently assume 64-bits prefixes */ #define sicslowpan_is_iid_16_bit_compressable(a) \ ((((a)->u16[4]) == 0) && \ - (((a)->u16[5]) == 0) && \ - (((a)->u16[6]) == 0) && \ - ((((a)->u8[14]) & 0x80) == 0)) + (((a)->u8[10]) == 0)&& \ + (((a)->u8[11]) == 0xff)&& \ + (((a)->u8[12]) == 0xfe)&& \ + (((a)->u8[13]) == 0)) /** * \brief check whether the 9-bit group-id of the diff --git a/core/net/uip-debug.c b/core/net/uip-debug.c index 60ec30f86..bc611f383 100644 --- a/core/net/uip-debug.c +++ b/core/net/uip-debug.c @@ -26,7 +26,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: uip-debug.c,v 1.1 2010/04/30 13:20:57 joxe Exp $ */ /** @@ -39,7 +38,7 @@ */ #include "net/uip-debug.h" -#include + /*---------------------------------------------------------------------------*/ void uip_debug_ipaddr_print(const uip_ipaddr_t *addr) @@ -52,19 +51,19 @@ uip_debug_ipaddr_print(const uip_ipaddr_t *addr) a = (addr->u8[i] << 8) + addr->u8[i + 1]; if(a == 0 && f >= 0) { if(f++ == 0) { - printf("::"); + PRINTA("::"); } } else { if(f > 0) { f = -1; } else if(i > 0) { - printf(":"); + PRINTA(":"); } - printf("%x", a); + PRINTA("%x", a); } } #else /* UIP_CONF_IPV6 */ - printf("%u.%u.%u.%u", addr->u8[0], addr->u8[1], addr->u8[2], addr->u8[3]); + PRINTA("%u.%u.%u.%u", addr->u8[0], addr->u8[1], addr->u8[2], addr->u8[3]); #endif /* UIP_CONF_IPV6 */ } /*---------------------------------------------------------------------------*/ @@ -74,9 +73,9 @@ uip_debug_lladdr_print(const uip_lladdr_t *addr) unsigned int i; for(i = 0; i < sizeof(uip_lladdr_t); i++) { if(i > 0) { - printf(":"); + PRINTA(":"); } - printf("%02x", addr->addr[i]); + PRINTA("%02x", addr->addr[i]); } } /*---------------------------------------------------------------------------*/ diff --git a/core/net/uip-debug.h b/core/net/uip-debug.h index c8467e51f..8015c03f1 100644 --- a/core/net/uip-debug.h +++ b/core/net/uip-debug.h @@ -43,6 +43,7 @@ #define UIP_DEBUG_H #include "net/uip.h" +#include void uip_debug_ipaddr_print(const uip_ipaddr_t *addr); void uip_debug_lladdr_print(const uip_lladdr_t *addr); @@ -52,16 +53,30 @@ void uip_debug_lladdr_print(const uip_lladdr_t *addr); #define DEBUG_ANNOTATE 2 #define DEBUG_FULL DEBUG_ANNOTATE | DEBUG_PRINT +/* PRINTA will always print if the debug routines are called directly */ +#ifdef __AVR__ +#include +#define PRINTA(FORMAT,args...) printf_P(PSTR(FORMAT),##args) +#else +#define PRINTA(...) printf(__VA_ARGS__) +#endif + #if (DEBUG) & DEBUG_ANNOTATE -#include +#ifdef __AVR__ +#define ANNOTATE(FORMAT,args...) printf_P(PSTR(FORMAT),##args) +#else #define ANNOTATE(...) printf(__VA_ARGS__) +#endif #else #define ANNOTATE(...) #endif /* (DEBUG) & DEBUG_ANNOTATE */ #if (DEBUG) & DEBUG_PRINT -#include +#ifdef __AVR__ +#define PRINTF(FORMAT,args...) printf_P(PSTR(FORMAT),##args) +#else #define PRINTF(...) printf(__VA_ARGS__) +#endif #define PRINT6ADDR(addr) uip_debug_ipaddr_print(addr) #define PRINTLLADDR(lladdr) uip_debug_lladdr_print(lladdr) #else diff --git a/core/net/uip-ds6.c b/core/net/uip-ds6.c old mode 100755 new mode 100644 index 66f7c0d1f..7e3cf1882 --- a/core/net/uip-ds6.c +++ b/core/net/uip-ds6.c @@ -174,60 +174,60 @@ uip_ds6_periodic(void) #if !UIP_CONF_ROUTER /* Periodic processing on prefixes */ for(locprefix = uip_ds6_prefix_list; - locprefix < uip_ds6_prefix_list + UIP_DS6_PREFIX_NB; locprefix++) { - if((locprefix->isused) && (!locprefix->isinfinite) - && (stimer_expired(&(locprefix->vlifetime)))) { + locprefix < uip_ds6_prefix_list + UIP_DS6_PREFIX_NB; + locprefix++) { + if(locprefix->isused && !locprefix->isinfinite + && stimer_expired(&(locprefix->vlifetime))) { uip_ds6_prefix_rm(locprefix); } } #endif /* !UIP_CONF_ROUTER */ /* Periodic processing on neighbors */ - for(locnbr = uip_ds6_nbr_cache; locnbr < uip_ds6_nbr_cache + UIP_DS6_NBR_NB; + for(locnbr = uip_ds6_nbr_cache; + locnbr < uip_ds6_nbr_cache + UIP_DS6_NBR_NB; locnbr++) { if(locnbr->isused) { - switch (locnbr->state) { + switch(locnbr->state) { case NBR_INCOMPLETE: if(locnbr->nscount >= UIP_ND6_MAX_MULTICAST_SOLICIT) { uip_ds6_nbr_rm(locnbr); - } else if(stimer_expired(&(locnbr->sendns))) { + } else if(stimer_expired(&locnbr->sendns)) { locnbr->nscount++; PRINTF("NBR_INCOMPLETE: NS %u\n", locnbr->nscount); uip_nd6_ns_output(NULL, NULL, &locnbr->ipaddr); - stimer_set(&(locnbr->sendns), uip_ds6_if.retrans_timer / 1000); + stimer_set(&locnbr->sendns, uip_ds6_if.retrans_timer / 1000); } break; case NBR_REACHABLE: - if(stimer_expired(&(locnbr->reachable))) { + if(stimer_expired(&locnbr->reachable)) { PRINTF("REACHABLE: moving to STALE ("); PRINT6ADDR(&locnbr->ipaddr); PRINTF(")\n"); locnbr->state = NBR_STALE; - /* NEIGHBOR_STATE_CHANGED(locnbr); */ } break; case NBR_DELAY: - if(stimer_expired(&(locnbr->reachable))) { + if(stimer_expired(&locnbr->reachable)) { locnbr->state = NBR_PROBE; locnbr->nscount = 1; - /* NEIGHBOR_STATE_CHANGED(locnbr); */ PRINTF("DELAY: moving to PROBE + NS %u\n", locnbr->nscount); uip_nd6_ns_output(NULL, &locnbr->ipaddr, &locnbr->ipaddr); - stimer_set(&(locnbr->sendns), uip_ds6_if.retrans_timer / 1000); + stimer_set(&locnbr->sendns, uip_ds6_if.retrans_timer / 1000); } break; case NBR_PROBE: if(locnbr->nscount >= UIP_ND6_MAX_UNICAST_SOLICIT) { - PRINTF("PROBE END \n"); + PRINTF("PROBE END\n"); if((locdefrt = uip_ds6_defrt_lookup(&locnbr->ipaddr)) != NULL) { uip_ds6_defrt_rm(locdefrt); } uip_ds6_nbr_rm(locnbr); - } else if(stimer_expired(&(locnbr->sendns))) { + } else if(stimer_expired(&locnbr->sendns)) { locnbr->nscount++; PRINTF("PROBE: NS %u\n", locnbr->nscount); uip_nd6_ns_output(NULL, &locnbr->ipaddr, &locnbr->ipaddr); - stimer_set(&(locnbr->sendns), uip_ds6_if.retrans_timer / 1000); + stimer_set(&locnbr->sendns, uip_ds6_if.retrans_timer / 1000); } break; default: @@ -248,9 +248,9 @@ uip_ds6_periodic(void) /*---------------------------------------------------------------------------*/ uint8_t -uip_ds6_list_loop(uip_ds6_element_t * list, uint8_t size, - uint16_t elementsize, uip_ipaddr_t * ipaddr, - uint8_t ipaddrlen, uip_ds6_element_t ** out_element) +uip_ds6_list_loop(uip_ds6_element_t *list, uint8_t size, + uint16_t elementsize, uip_ipaddr_t *ipaddr, + uint8_t ipaddrlen, uip_ds6_element_t **out_element) { uip_ds6_element_t *element; @@ -258,11 +258,10 @@ uip_ds6_list_loop(uip_ds6_element_t * list, uint8_t size, for(element = list; element < - (uip_ds6_element_t *) ((uint8_t *) list + (size * elementsize)); - element = (uip_ds6_element_t *) ((uint8_t *) element + elementsize)) { - // printf("+ %p %d\n", &element->isused, element->isused); + (uip_ds6_element_t *)((uint8_t *)list + (size * elementsize)); + element = (uip_ds6_element_t *)((uint8_t *)element + elementsize)) { if(element->isused) { - if(uip_ipaddr_prefixcmp(&(element->ipaddr), ipaddr, ipaddrlen)) { + if(uip_ipaddr_prefixcmp(&element->ipaddr, ipaddr, ipaddrlen)) { *out_element = element; return FOUND; } @@ -271,33 +270,28 @@ uip_ds6_list_loop(uip_ds6_element_t * list, uint8_t size, } } - if(*out_element != NULL) { - return FREESPACE; - } else { - return NOSPACE; - } + return *out_element != NULL ? FREESPACE : NOSPACE; } /*---------------------------------------------------------------------------*/ uip_ds6_nbr_t * -uip_ds6_nbr_add(uip_ipaddr_t * ipaddr, uip_lladdr_t * lladdr, +uip_ds6_nbr_add(uip_ipaddr_t *ipaddr, uip_lladdr_t * lladdr, uint8_t isrouter, uint8_t state) { int r; r = uip_ds6_list_loop - ((uip_ds6_element_t *) uip_ds6_nbr_cache, UIP_DS6_NBR_NB, + ((uip_ds6_element_t *)uip_ds6_nbr_cache, UIP_DS6_NBR_NB, sizeof(uip_ds6_nbr_t), ipaddr, 128, - (uip_ds6_element_t **) &locnbr); - // printf("r %d\n", r); + (uip_ds6_element_t **)&locnbr); if(r == FREESPACE) { locnbr->isused = 1; - uip_ipaddr_copy(&(locnbr->ipaddr), ipaddr); + uip_ipaddr_copy(&locnbr->ipaddr, ipaddr); if(lladdr != NULL) { - memcpy(&(locnbr->lladdr), lladdr, UIP_LLADDR_LEN); + memcpy(&locnbr->lladdr, lladdr, UIP_LLADDR_LEN); } else { - memset(&(locnbr->lladdr), 0, UIP_LLADDR_LEN); + memset(&locnbr->lladdr, 0, UIP_LLADDR_LEN); } locnbr->isrouter = isrouter; locnbr->state = state; @@ -305,18 +299,17 @@ uip_ds6_nbr_add(uip_ipaddr_t * ipaddr, uip_lladdr_t * lladdr, uip_packetqueue_new(&locnbr->packethandle); #endif /* UIP_CONF_IPV6_QUEUE_PKT */ /* timers are set separately, for now we put them in expired state */ - stimer_set(&(locnbr->reachable), 0); - stimer_set(&(locnbr->sendns), 0); + stimer_set(&locnbr->reachable, 0); + stimer_set(&locnbr->sendns, 0); locnbr->nscount = 0; - PRINTF("Adding neighbor with ip addr"); + PRINTF("Adding neighbor with ip addr "); PRINT6ADDR(ipaddr); - PRINTF("link addr"); + PRINTF("link addr "); PRINTLLADDR((&(locnbr->lladdr))); PRINTF("state %u\n", state); NEIGHBOR_STATE_CHANGED(locnbr); locnbr->last_lookup = clock_time(); - // printf("add %p\n", locnbr); return locnbr; } else if(r == NOSPACE) { /* We did not find any empty slot on the neighbor list, so we need @@ -338,7 +331,6 @@ uip_ds6_nbr_add(uip_ipaddr_t * ipaddr, uip_lladdr_t * lladdr, } } if(oldest != NULL) { - // printf("rm3\n"); uip_ds6_nbr_rm(oldest); return uip_ds6_nbr_add(ipaddr, lladdr, isrouter, state); } @@ -354,7 +346,6 @@ uip_ds6_nbr_rm(uip_ds6_nbr_t *nbr) if(nbr != NULL) { nbr->isused = 0; #if UIP_CONF_IPV6_QUEUE_PKT - // printf("rm %p\n", &nbr->isused); uip_packetqueue_free(&nbr->packethandle); #endif /* UIP_CONF_IPV6_QUEUE_PKT */ NEIGHBOR_STATE_CHANGED(nbr); @@ -367,9 +358,9 @@ uip_ds6_nbr_t * uip_ds6_nbr_lookup(uip_ipaddr_t *ipaddr) { if(uip_ds6_list_loop - ((uip_ds6_element_t *) uip_ds6_nbr_cache, UIP_DS6_NBR_NB, + ((uip_ds6_element_t *)uip_ds6_nbr_cache, UIP_DS6_NBR_NB, sizeof(uip_ds6_nbr_t), ipaddr, 128, - (uip_ds6_element_t **) & locnbr) == FOUND) { + (uip_ds6_element_t **)&locnbr) == FOUND) { return locnbr; } return NULL; @@ -380,19 +371,19 @@ uip_ds6_defrt_t * uip_ds6_defrt_add(uip_ipaddr_t *ipaddr, unsigned long interval) { if(uip_ds6_list_loop - ((uip_ds6_element_t *) uip_ds6_defrt_list, UIP_DS6_DEFRT_NB, + ((uip_ds6_element_t *)uip_ds6_defrt_list, UIP_DS6_DEFRT_NB, sizeof(uip_ds6_defrt_t), ipaddr, 128, - (uip_ds6_element_t **) & locdefrt) == FREESPACE) { + (uip_ds6_element_t **)&locdefrt) == FREESPACE) { locdefrt->isused = 1; - uip_ipaddr_copy(&(locdefrt->ipaddr), ipaddr); + uip_ipaddr_copy(&locdefrt->ipaddr, ipaddr); if(interval != 0) { - stimer_set(&(locdefrt->lifetime), interval); + stimer_set(&locdefrt->lifetime, interval); locdefrt->isinfinite = 0; } else { locdefrt->isinfinite = 1; } - PRINTF("Adding defrouter with ip addr"); + PRINTF("Adding defrouter with ip addr "); PRINT6ADDR(&locdefrt->ipaddr); PRINTF("\n"); @@ -405,7 +396,7 @@ uip_ds6_defrt_add(uip_ipaddr_t *ipaddr, unsigned long interval) /*---------------------------------------------------------------------------*/ void -uip_ds6_defrt_rm(uip_ds6_defrt_t * defrt) +uip_ds6_defrt_rm(uip_ds6_defrt_t *defrt) { if(defrt != NULL) { defrt->isused = 0; @@ -416,11 +407,11 @@ uip_ds6_defrt_rm(uip_ds6_defrt_t * defrt) /*---------------------------------------------------------------------------*/ uip_ds6_defrt_t * -uip_ds6_defrt_lookup(uip_ipaddr_t * ipaddr) +uip_ds6_defrt_lookup(uip_ipaddr_t *ipaddr) { - if(uip_ds6_list_loop((uip_ds6_element_t *) uip_ds6_defrt_list, + if(uip_ds6_list_loop((uip_ds6_element_t *)uip_ds6_defrt_list, UIP_DS6_DEFRT_NB, sizeof(uip_ds6_defrt_t), ipaddr, 128, - (uip_ds6_element_t **) & locdefrt) == FOUND) { + (uip_ds6_element_t **)&locdefrt) == FOUND) { return locdefrt; } return NULL; @@ -440,7 +431,7 @@ uip_ds6_defrt_choose(void) PRINT6ADDR(&locdefrt->ipaddr); PRINTF("\n"); bestnbr = uip_ds6_nbr_lookup(&locdefrt->ipaddr); - if((bestnbr != NULL) && (bestnbr->state != NBR_INCOMPLETE)) { + if(bestnbr != NULL && bestnbr->state != NBR_INCOMPLETE) { PRINTF("Defrt found, IP address "); PRINT6ADDR(&locdefrt->ipaddr); PRINTF("\n"); @@ -459,16 +450,16 @@ uip_ds6_defrt_choose(void) #if UIP_CONF_ROUTER /*---------------------------------------------------------------------------*/ uip_ds6_prefix_t * -uip_ds6_prefix_add(uip_ipaddr_t * ipaddr, uint8_t ipaddrlen, +uip_ds6_prefix_add(uip_ipaddr_t *ipaddr, uint8_t ipaddrlen, uint8_t advertise, uint8_t flags, unsigned long vtime, unsigned long ptime) { if(uip_ds6_list_loop - ((uip_ds6_element_t *) uip_ds6_prefix_list, UIP_DS6_PREFIX_NB, + ((uip_ds6_element_t *)uip_ds6_prefix_list, UIP_DS6_PREFIX_NB, sizeof(uip_ds6_prefix_t), ipaddr, ipaddrlen, - (uip_ds6_element_t **) & locprefix) == FREESPACE) { + (uip_ds6_element_t **)&locprefix) == FREESPACE) { locprefix->isused = 1; - uip_ipaddr_copy(&(locprefix->ipaddr), ipaddr); + uip_ipaddr_copy(&locprefix->ipaddr, ipaddr); locprefix->length = ipaddrlen; locprefix->advertise = advertise; locprefix->l_a_reserved = flags; @@ -488,15 +479,15 @@ uip_ds6_prefix_add(uip_ipaddr_t * ipaddr, uint8_t ipaddrlen, #else /* UIP_CONF_ROUTER */ uip_ds6_prefix_t * -uip_ds6_prefix_add(uip_ipaddr_t * ipaddr, uint8_t ipaddrlen, +uip_ds6_prefix_add(uip_ipaddr_t *ipaddr, uint8_t ipaddrlen, unsigned long interval) { if(uip_ds6_list_loop - ((uip_ds6_element_t *) uip_ds6_prefix_list, UIP_DS6_PREFIX_NB, + ((uip_ds6_element_t *)uip_ds6_prefix_list, UIP_DS6_PREFIX_NB, sizeof(uip_ds6_prefix_t), ipaddr, ipaddrlen, - (uip_ds6_element_t **) & locprefix) == FREESPACE) { + (uip_ds6_element_t **)&locprefix) == FREESPACE) { locprefix->isused = 1; - uip_ipaddr_copy(&(locprefix->ipaddr), ipaddr); + uip_ipaddr_copy(&locprefix->ipaddr, ipaddr); locprefix->length = ipaddrlen; if(interval != 0) { stimer_set(&(locprefix->vlifetime), interval); @@ -523,7 +514,7 @@ uip_ds6_prefix_rm(uip_ds6_prefix_t * prefix) } /*---------------------------------------------------------------------------*/ uip_ds6_prefix_t * -uip_ds6_prefix_lookup(uip_ipaddr_t * ipaddr, uint8_t ipaddrlen) +uip_ds6_prefix_lookup(uip_ipaddr_t *ipaddr, uint8_t ipaddrlen) { if(uip_ds6_list_loop((uip_ds6_element_t *)uip_ds6_prefix_list, UIP_DS6_PREFIX_NB, sizeof(uip_ds6_prefix_t), @@ -536,7 +527,7 @@ uip_ds6_prefix_lookup(uip_ipaddr_t * ipaddr, uint8_t ipaddrlen) /*---------------------------------------------------------------------------*/ uint8_t -uip_ds6_is_addr_onlink(uip_ipaddr_t * ipaddr) +uip_ds6_is_addr_onlink(uip_ipaddr_t *ipaddr) { for(locprefix = uip_ds6_prefix_list; locprefix < uip_ds6_prefix_list + UIP_DS6_PREFIX_NB; locprefix++) { @@ -550,12 +541,12 @@ uip_ds6_is_addr_onlink(uip_ipaddr_t * ipaddr) /*---------------------------------------------------------------------------*/ uip_ds6_addr_t * -uip_ds6_addr_add(uip_ipaddr_t * ipaddr, unsigned long vlifetime, uint8_t type) +uip_ds6_addr_add(uip_ipaddr_t *ipaddr, unsigned long vlifetime, uint8_t type) { if(uip_ds6_list_loop - ((uip_ds6_element_t *) uip_ds6_if.addr_list, UIP_DS6_ADDR_NB, + ((uip_ds6_element_t *)uip_ds6_if.addr_list, UIP_DS6_ADDR_NB, sizeof(uip_ds6_addr_t), ipaddr, 128, - (uip_ds6_element_t **) & locaddr) == FREESPACE) { + (uip_ds6_element_t **)&locaddr) == FREESPACE) { locaddr->isused = 1; uip_ipaddr_copy(&locaddr->ipaddr, ipaddr); locaddr->state = ADDR_TENTATIVE; @@ -579,7 +570,7 @@ uip_ds6_addr_add(uip_ipaddr_t * ipaddr, unsigned long vlifetime, uint8_t type) /*---------------------------------------------------------------------------*/ void -uip_ds6_addr_rm(uip_ds6_addr_t * addr) +uip_ds6_addr_rm(uip_ds6_addr_t *addr) { if(addr != NULL) { uip_create_solicited_node(&addr->ipaddr, &loc_fipaddr); @@ -593,12 +584,12 @@ uip_ds6_addr_rm(uip_ds6_addr_t * addr) /*---------------------------------------------------------------------------*/ uip_ds6_addr_t * -uip_ds6_addr_lookup(uip_ipaddr_t * ipaddr) +uip_ds6_addr_lookup(uip_ipaddr_t *ipaddr) { if(uip_ds6_list_loop - ((uip_ds6_element_t *) uip_ds6_if.addr_list, UIP_DS6_ADDR_NB, + ((uip_ds6_element_t *)uip_ds6_if.addr_list, UIP_DS6_ADDR_NB, sizeof(uip_ds6_addr_t), ipaddr, 128, - (uip_ds6_element_t **) & locaddr) == FOUND) { + (uip_ds6_element_t **)&locaddr) == FOUND) { return locaddr; } return NULL; @@ -615,7 +606,7 @@ uip_ds6_get_link_local(int8_t state) { for(locaddr = uip_ds6_if.addr_list; locaddr < uip_ds6_if.addr_list + UIP_DS6_ADDR_NB; locaddr++) { - if((locaddr->isused) && (state == -1 || locaddr->state == state) + if(locaddr->isused && (state == -1 || locaddr->state == state) && (uip_is_addr_link_local(&locaddr->ipaddr))) { return locaddr; } @@ -634,7 +625,7 @@ uip_ds6_get_global(int8_t state) { for(locaddr = uip_ds6_if.addr_list; locaddr < uip_ds6_if.addr_list + UIP_DS6_ADDR_NB; locaddr++) { - if((locaddr->isused) && (state == -1 || locaddr->state == state) + if(locaddr->isused && (state == -1 || locaddr->state == state) && !(uip_is_addr_link_local(&locaddr->ipaddr))) { return locaddr; } @@ -644,12 +635,12 @@ uip_ds6_get_global(int8_t state) /*---------------------------------------------------------------------------*/ uip_ds6_maddr_t * -uip_ds6_maddr_add(uip_ipaddr_t * ipaddr) +uip_ds6_maddr_add(uip_ipaddr_t *ipaddr) { if(uip_ds6_list_loop - ((uip_ds6_element_t *) uip_ds6_if.maddr_list, UIP_DS6_MADDR_NB, + ((uip_ds6_element_t *)uip_ds6_if.maddr_list, UIP_DS6_MADDR_NB, sizeof(uip_ds6_maddr_t), ipaddr, 128, - (uip_ds6_element_t **) & locmaddr) == FREESPACE) { + (uip_ds6_element_t **)&locmaddr) == FREESPACE) { locmaddr->isused = 1; uip_ipaddr_copy(&locmaddr->ipaddr, ipaddr); return locmaddr; @@ -669,12 +660,12 @@ uip_ds6_maddr_rm(uip_ds6_maddr_t * maddr) /*---------------------------------------------------------------------------*/ uip_ds6_maddr_t * -uip_ds6_maddr_lookup(uip_ipaddr_t * ipaddr) +uip_ds6_maddr_lookup(uip_ipaddr_t *ipaddr) { if(uip_ds6_list_loop - ((uip_ds6_element_t *) uip_ds6_if.maddr_list, UIP_DS6_MADDR_NB, + ((uip_ds6_element_t *)uip_ds6_if.maddr_list, UIP_DS6_MADDR_NB, sizeof(uip_ds6_maddr_t), ipaddr, 128, - (uip_ds6_element_t **) & locmaddr) == FOUND) { + (uip_ds6_element_t **)&locmaddr) == FOUND) { return locmaddr; } return NULL; @@ -683,12 +674,12 @@ uip_ds6_maddr_lookup(uip_ipaddr_t * ipaddr) /*---------------------------------------------------------------------------*/ uip_ds6_aaddr_t * -uip_ds6_aaddr_add(uip_ipaddr_t * ipaddr) +uip_ds6_aaddr_add(uip_ipaddr_t *ipaddr) { if(uip_ds6_list_loop - ((uip_ds6_element_t *) uip_ds6_if.aaddr_list, UIP_DS6_AADDR_NB, + ((uip_ds6_element_t *)uip_ds6_if.aaddr_list, UIP_DS6_AADDR_NB, sizeof(uip_ds6_aaddr_t), ipaddr, 128, - (uip_ds6_element_t **) & locaaddr) == FREESPACE) { + (uip_ds6_element_t **)&locaaddr) == FREESPACE) { locaaddr->isused = 1; uip_ipaddr_copy(&locaaddr->ipaddr, ipaddr); return locaaddr; @@ -708,9 +699,9 @@ uip_ds6_aaddr_rm(uip_ds6_aaddr_t * aaddr) /*---------------------------------------------------------------------------*/ uip_ds6_aaddr_t * -uip_ds6_aaddr_lookup(uip_ipaddr_t * ipaddr) +uip_ds6_aaddr_lookup(uip_ipaddr_t *ipaddr) { - if(uip_ds6_list_loop((uip_ds6_element_t *) uip_ds6_if.aaddr_list, + if(uip_ds6_list_loop((uip_ds6_element_t *)uip_ds6_if.aaddr_list, UIP_DS6_AADDR_NB, sizeof(uip_ds6_aaddr_t), ipaddr, 128, (uip_ds6_element_t **)&locaaddr) == FOUND) { return locaaddr; @@ -720,12 +711,12 @@ uip_ds6_aaddr_lookup(uip_ipaddr_t * ipaddr) /*---------------------------------------------------------------------------*/ uip_ds6_route_t * -uip_ds6_route_lookup(uip_ipaddr_t * destipaddr) +uip_ds6_route_lookup(uip_ipaddr_t *destipaddr) { uip_ds6_route_t *locrt = NULL; uint8_t longestmatch = 0; - PRINTF("DS6: Looking up route for"); + PRINTF("DS6: Looking up route for "); PRINT6ADDR(destipaddr); PRINTF("\n"); @@ -747,7 +738,7 @@ uip_ds6_route_lookup(uip_ipaddr_t * destipaddr) PRINT6ADDR(&locrt->nexthop); PRINTF("\n"); } else { - PRINTF("DS6: No route found ...\n"); + PRINTF("DS6: No route found\n"); } return locrt; @@ -755,27 +746,25 @@ uip_ds6_route_lookup(uip_ipaddr_t * destipaddr) /*---------------------------------------------------------------------------*/ uip_ds6_route_t * -uip_ds6_route_add(uip_ipaddr_t * ipaddr, u8_t length, uip_ipaddr_t * nexthop, - u8_t metric) +uip_ds6_route_add(uip_ipaddr_t *ipaddr, uint8_t length, uip_ipaddr_t *nexthop, + uint8_t metric) { - if(uip_ds6_list_loop - ((uip_ds6_element_t *) uip_ds6_routing_table, UIP_DS6_ROUTE_NB, + ((uip_ds6_element_t *)uip_ds6_routing_table, UIP_DS6_ROUTE_NB, sizeof(uip_ds6_route_t), ipaddr, length, - (uip_ds6_element_t **) & locroute) == FREESPACE) { + (uip_ds6_element_t **)&locroute) == FREESPACE) { locroute->isused = 1; uip_ipaddr_copy(&(locroute->ipaddr), ipaddr); locroute->length = length; uip_ipaddr_copy(&(locroute->nexthop), nexthop); locroute->metric = metric; - PRINTF("DS6: adding route:"); + PRINTF("DS6: adding route: "); PRINT6ADDR(ipaddr); PRINTF(" via "); PRINT6ADDR(nexthop); PRINTF("\n"); - ANNOTATE("#L %u 1;blue\n",nexthop->u8[sizeof(uip_ipaddr_t) - 1]); - + ANNOTATE("#L %u 1;blue\n", nexthop->u8[sizeof(uip_ipaddr_t) - 1]); } return locroute; @@ -790,9 +779,10 @@ uip_ds6_route_rm(uip_ds6_route_t *route) /* we need to check if this was the last route towards "nexthop" */ /* if so - remove that link (annotation) */ for(locroute = uip_ds6_routing_table; - locroute < uip_ds6_routing_table + UIP_DS6_ROUTE_NB; locroute++) { - if((locroute->isused) && uip_ipaddr_cmp(&locroute->nexthop, &route->nexthop)) { - /* we did find another link using the specific nexthop, so keep the #L */ + locroute < uip_ds6_routing_table + UIP_DS6_ROUTE_NB; + locroute++) { + if(locroute->isused && uip_ipaddr_cmp(&locroute->nexthop, &route->nexthop)) { + /* we found another link using the specific nexthop, so keep the #L */ return; } } @@ -804,8 +794,9 @@ void uip_ds6_route_rm_by_nexthop(uip_ipaddr_t *nexthop) { for(locroute = uip_ds6_routing_table; - locroute < uip_ds6_routing_table + UIP_DS6_ROUTE_NB; locroute++) { - if((locroute->isused) && uip_ipaddr_cmp(&locroute->nexthop, nexthop)) { + locroute < uip_ds6_routing_table + UIP_DS6_ROUTE_NB; + locroute++) { + if(locroute->isused && uip_ipaddr_cmp(&locroute->nexthop, nexthop)) { locroute->isused = 0; } } @@ -825,9 +816,9 @@ uip_ds6_select_src(uip_ipaddr_t *src, uip_ipaddr_t *dst) for(locaddr = uip_ds6_if.addr_list; locaddr < uip_ds6_if.addr_list + UIP_DS6_ADDR_NB; locaddr++) { /* Only preferred global (not link-local) addresses */ - if((locaddr->isused) && (locaddr->state == ADDR_PREFERRED) && - (!uip_is_addr_link_local(&locaddr->ipaddr))) { - n = get_match_length(dst, &(locaddr->ipaddr)); + if(locaddr->isused && locaddr->state == ADDR_PREFERRED && + !uip_is_addr_link_local(&locaddr->ipaddr)) { + n = get_match_length(dst, &locaddr->ipaddr); if(n >= best) { best = n; matchaddr = locaddr; @@ -848,7 +839,7 @@ uip_ds6_select_src(uip_ipaddr_t *src, uip_ipaddr_t *dst) /*---------------------------------------------------------------------------*/ void -uip_ds6_set_addr_iid(uip_ipaddr_t * ipaddr, uip_lladdr_t * lladdr) +uip_ds6_set_addr_iid(uip_ipaddr_t *ipaddr, uip_lladdr_t * lladdr) { /* We consider only links with IEEE EUI-64 identifier or * IEEE 48-bit MAC addresses */ @@ -859,7 +850,7 @@ uip_ds6_set_addr_iid(uip_ipaddr_t * ipaddr, uip_lladdr_t * lladdr) memcpy(ipaddr->u8 + 8, lladdr, 3); ipaddr->u8[11] = 0xff; ipaddr->u8[12] = 0xfe; - memcpy(ipaddr->u8 + 13, (uint8_t *) lladdr + 3, 3); + memcpy(ipaddr->u8 + 13, (uint8_t *)lladdr + 3, 3); ipaddr->u8[8] ^= 0x02; #else #error uip-ds6.c cannot build interface address when UIP_LLADDR_LEN is not 6 or 8 @@ -868,7 +859,7 @@ uip_ds6_set_addr_iid(uip_ipaddr_t * ipaddr, uip_lladdr_t * lladdr) /*---------------------------------------------------------------------------*/ uint8_t -get_match_length(uip_ipaddr_t * src, uip_ipaddr_t * dst) +get_match_length(uip_ipaddr_t *src, uip_ipaddr_t *dst) { uint8_t j, k, x_or; uint8_t len = 0; @@ -894,7 +885,7 @@ get_match_length(uip_ipaddr_t * src, uip_ipaddr_t * dst) /*---------------------------------------------------------------------------*/ void -uip_ds6_dad(uip_ds6_addr_t * addr) +uip_ds6_dad(uip_ds6_addr_t *addr) { /* send maxdadns NS for DAD */ if(addr->dadnscount < uip_ds6_if.maxdadns) { diff --git a/core/net/uip-ds6.h b/core/net/uip-ds6.h old mode 100755 new mode 100644 index 7b9f4cf71..064587ac2 --- a/core/net/uip-ds6.h +++ b/core/net/uip-ds6.h @@ -373,7 +373,7 @@ uip_ds6_aaddr_t *uip_ds6_aaddr_lookup(uip_ipaddr_t *ipaddr); /** @{ */ uip_ds6_route_t *uip_ds6_route_lookup(uip_ipaddr_t *destipaddr); uip_ds6_route_t *uip_ds6_route_add(uip_ipaddr_t *ipaddr, uint8_t length, - uip_ipaddr_t *next_hop, u8_t metric); + uip_ipaddr_t *next_hop, uint8_t metric); void uip_ds6_route_rm(uip_ds6_route_t *route); void uip_ds6_route_rm_by_nexthop(uip_ipaddr_t *nexthop); diff --git a/core/net/uiplib.c b/core/net/uiplib.c index 630385373..0bf35b039 100644 --- a/core/net/uiplib.c +++ b/core/net/uiplib.c @@ -53,15 +53,17 @@ uiplib_ipaddrconv(const char *addrstr, uip_ipaddr_t *ipaddr) value = 0; zero = -1; + if(*addrstr == '[') addrstr++; + for(len = 0; len < sizeof(uip_ipaddr_t) - 1; addrstr++) { c = *addrstr; - if(c == ':' || c == '\0') { + if(c == ':' || c == '\0' || c == ']') { ipaddr->u8[len] = (value >> 8) & 0xff; ipaddr->u8[len + 1] = value & 0xff; len += 2; value = 0; - if(c == '\0') { + if(c == '\0' || c == ']') { break; } @@ -86,7 +88,7 @@ uiplib_ipaddrconv(const char *addrstr, uip_ipaddr_t *ipaddr) value = (value << 4) + (tmp & 0xf); } } - if(c != '\0') { + if(c != '\0' && c != ']') { PRINTF("uiplib: too large address\n"); return 0; } diff --git a/cpu/avr/Makefile.avr b/cpu/avr/Makefile.avr index 636fdbe7d..bb9af8beb 100644 --- a/cpu/avr/Makefile.avr +++ b/cpu/avr/Makefile.avr @@ -139,7 +139,7 @@ ifndef NOAVRSIZE endif %.hex: %.out - $(OBJCOPY) $^ -O ihex $@ + $(OBJCOPY) $^ -j .text -j .data -O ihex $@ %.ihex: %.out $(OBJCOPY) $^ -O ihex $@ diff --git a/cpu/avr/dev/clock.c b/cpu/avr/dev/clock.c index ad1711828..a24afaa8c 100644 --- a/cpu/avr/dev/clock.c +++ b/cpu/avr/dev/clock.c @@ -15,12 +15,23 @@ long sleepseconds; #if RF230BB && WEBSERVER #define RADIOSTATS 1 #endif + #if RADIOSTATS static volatile uint8_t rcount; volatile unsigned long radioontime; extern uint8_t RF230_receive_on; #endif +/* Set RADIOCALIBRATE for periodic calibration of the PLL during extended radio on time. + * The data sheet suggests every 5 minutes if the temperature is fluctuating. + * Using an eight bit counter gives 256 second calibrations. + * Actual calibration is done by the driver on the next transmit request. + */ +#if RADIOCALIBRATE +extern volatile uint8_t rf230_calibrate; +static uint8_t calibrate_interval; +#endif + /* CLOCK_SECOND is the number of ticks per second. It is defined through CONF_CLOCK_SECOND in the contiki-conf.h for each platform. @@ -46,48 +57,50 @@ void clock_adjust_seconds(uint8_t howmany) { #endif } /*---------------------------------------------------------------------------*/ -/* These routines increment the second counters. - * Calling these avoids the interrupt overhead of pushing many registers on the stack. - */ -static void increment_seconds(void) __attribute__ ((noinline)); -static void increment_seconds(void) -{ - seconds++; -} -#if RADIOSTATS -extern volatile uint8_t rf230_calibrate; -static void increment_radioontime(void) __attribute__ ((noinline)); -static void increment_radioontime(void) -{ -static uint8_t calibrate_interval; - radioontime++; - if (++calibrate_interval==0) { - rf230_calibrate=1; - } -} -#endif -/*---------------------------------------------------------------------------*/ //SIGNAL(SIG_OUTPUT_COMPARE0) ISR(AVR_OUTPUT_COMPARE_INT) { count++; if(++scount == CLOCK_SECOND) { scount = 0; - increment_seconds(); -// seconds++; + seconds++; } +#if RADIOCALIBRATE + if (++calibrate_interval==0) { + rf230_calibrate=1; + } +#endif #if RADIOSTATS if (RF230_receive_on) { if (++rcount == CLOCK_SECOND) { rcount=0; - increment_radioontime(); - // radioontime++; + radioontime++; } } #endif + +#if 1 +/* gcc will save all registers on the stack if an external routine is called */ if(etimer_pending()) { etimer_request_poll(); } +#else +/* doing this locally saves 9 pushes and 9 pops, but these etimer.c and process.c variables have to lose the static qualifier */ + extern struct etimer *timerlist; + extern volatile unsigned char poll_requested; + +#define PROCESS_STATE_NONE 0 +#define PROCESS_STATE_RUNNING 1 +#define PROCESS_STATE_CALLED 2 + + if (timerlist) { + if(etimer_process.state == PROCESS_STATE_RUNNING || + etimer_process.state == PROCESS_STATE_CALLED) { + etimer_process.needspoll = 1; + poll_requested = 1; + } + } +#endif } /*---------------------------------------------------------------------------*/ @@ -153,3 +166,91 @@ clock_seconds(void) } while(tmp != seconds); return tmp; } + +#ifdef HANG_ON_UNKNOWN_INTERRUPT +/* Useful for diagnosing unknown interrupts that reset the mcu. + * Currently set up for 12mega128rfa1. + * For other mcus, enable all and then disable the conflicts. + */ +static volatile uint8_t x; +ISR( _VECTOR(0)) {while (1) x++;} +ISR( _VECTOR(1)) {while (1) x++;} +ISR( _VECTOR(2)) {while (1) x++;} +ISR( _VECTOR(3)) {while (1) x++;} +ISR( _VECTOR(4)) {while (1) x++;} +ISR( _VECTOR(5)) {while (1) x++;} +ISR( _VECTOR(6)) {while (1) x++;} +ISR( _VECTOR(7)) {while (1) x++;} +ISR( _VECTOR(8)) {while (1) x++;} +ISR( _VECTOR(9)) {while (1) x++;} +ISR( _VECTOR(10)) {while (1) x++;} +ISR( _VECTOR(11)) {while (1) x++;} +ISR( _VECTOR(12)) {while (1) x++;} +ISR( _VECTOR(13)) {while (1) x++;} +ISR( _VECTOR(14)) {while (1) x++;} +ISR( _VECTOR(15)) {while (1) x++;} +ISR( _VECTOR(16)) {while (1) x++;} +ISR( _VECTOR(17)) {while (1) x++;} +ISR( _VECTOR(18)) {while (1) x++;} +ISR( _VECTOR(19)) {while (1) x++;} +//ISR( _VECTOR(20)) {while (1) x++;} +//ISR( _VECTOR(21)) {while (1) x++;} +ISR( _VECTOR(22)) {while (1) x++;} +ISR( _VECTOR(23)) {while (1) x++;} +ISR( _VECTOR(24)) {while (1) x++;} +//ISR( _VECTOR(25)) {while (1) x++;} +ISR( _VECTOR(26)) {while (1) x++;} +//ISR( _VECTOR(27)) {while (1) x++;} +ISR( _VECTOR(28)) {while (1) x++;} +ISR( _VECTOR(29)) {while (1) x++;} +ISR( _VECTOR(30)) {while (1) x++;} +ISR( _VECTOR(31)) {while (1) x++;} +//ISR( _VECTOR(32)) {while (1) x++;} +ISR( _VECTOR(33)) {while (1) x++;} +ISR( _VECTOR(34)) {while (1) x++;} +ISR( _VECTOR(35)) {while (1) x++;} +//ISR( _VECTOR(36)) {while (1) x++;} +ISR( _VECTOR(37)) {while (1) x++;} +//ISR( _VECTOR(38)) {while (1) x++;} +ISR( _VECTOR(39)) {while (1) x++;} +ISR( _VECTOR(40)) {while (1) x++;} +ISR( _VECTOR(41)) {while (1) x++;} +ISR( _VECTOR(42)) {while (1) x++;} +ISR( _VECTOR(43)) {while (1) x++;} +ISR( _VECTOR(44)) {while (1) x++;} +ISR( _VECTOR(45)) {while (1) x++;} +ISR( _VECTOR(46)) {while (1) x++;} +ISR( _VECTOR(47)) {while (1) x++;} +ISR( _VECTOR(48)) {while (1) x++;} +ISR( _VECTOR(49)) {while (1) x++;} +ISR( _VECTOR(50)) {while (1) x++;} +ISR( _VECTOR(51)) {while (1) x++;} +ISR( _VECTOR(52)) {while (1) x++;} +ISR( _VECTOR(53)) {while (1) x++;} +ISR( _VECTOR(54)) {while (1) x++;} +ISR( _VECTOR(55)) {while (1) x++;} +ISR( _VECTOR(56)) {while (1) x++;} +//ISR( _VECTOR(57)) {while (1) x++;} +//ISR( _VECTOR(58)) {while (1) x++;} +//ISR( _VECTOR(59)) {while (1) x++;} +//ISR( _VECTOR(60)) {while (1) x++;} +ISR( _VECTOR(61)) {while (1) x++;} +ISR( _VECTOR(62)) {while (1) x++;} +ISR( _VECTOR(63)) {while (1) x++;} +ISR( _VECTOR(64)) {while (1) x++;} +ISR( _VECTOR(65)) {while (1) x++;} +ISR( _VECTOR(66)) {while (1) x++;} +ISR( _VECTOR(67)) {while (1) x++;} +ISR( _VECTOR(68)) {while (1) x++;} +ISR( _VECTOR(69)) {while (1) x++;} +ISR( _VECTOR(70)) {while (1) x++;} +ISR( _VECTOR(71)) {while (1) x++;} +ISR( _VECTOR(72)) {while (1) x++;} +ISR( _VECTOR(73)) {while (1) x++;} +ISR( _VECTOR(74)) {while (1) x++;} +ISR( _VECTOR(75)) {while (1) x++;} +ISR( _VECTOR(76)) {while (1) x++;} +ISR( _VECTOR(77)) {while (1) x++;} +ISR( _VECTOR(78)) {while (1) x++;} +ISR( _VECTOR(79)) {while (1) x++;} +#endif \ No newline at end of file diff --git a/cpu/avr/dev/uart1.h b/cpu/avr/dev/uart1.h new file mode 100644 index 000000000..69b96e574 --- /dev/null +++ b/cpu/avr/dev/uart1.h @@ -0,0 +1,31 @@ +/* + Copied from mc1322x/dev/cpu. + + This file exists as a work-around for the hardware dependant calls + to slip_arch_init. + + Current the prototype for slip_arch_init is slip_arch_init(urb) + + and a typical call is something like + slip_arch_init(BAUD2URB(115200)) + + BAUD2UBR is hardware specific, however. Furthermore, for the sky + platform it's typically defined with #include "dev/uart1.h" (see + rpl-boarder-router/slip-bridge.c), a sky specific file. dev/uart1.h + includes msp430.h which includes the sky contiki-conf.h which + defines BAUD2UBR. + + To me, the correct think to pass is simply the baudrate and have the + hardware specific conversion happen inside slip_arch_init. + + Notably, most implementations just ignore the passed parameter + anyway. (except AVR) + + */ + +#ifndef DEV_UART1_H +#define DEV_UART1_H + +#define BAUD2UBR(x) x + +#endif diff --git a/cpu/avr/radio/rf230bb/atmega128rfa1_registermap.h b/cpu/avr/radio/rf230bb/atmega128rfa1_registermap.h index 0c7bd53cb..3edd23cab 100644 --- a/cpu/avr/radio/rf230bb/atmega128rfa1_registermap.h +++ b/cpu/avr/radio/rf230bb/atmega128rfa1_registermap.h @@ -73,6 +73,12 @@ #define RG_CSMA_BE CSMA_BE #define RG_CSMA_SEED_0 CSMA_SEED_0 #define RG_PHY_RSSI PHY_RSSI +#define SR_CCA_MODE 0x08, 0x60, 5 +//#define SR_CCA_CS_THRES 0x09, 0xf0, 4 +#define SR_CCA_ED_THRES 0x09, 0x0f, 0 +#define SR_CCA_REQUEST 0x08, 0x80, 7 +#define SR_CCA_DONE 0x01, 0x80, 7 +#define SR_CCA_STATUS 0x01, 0x40, 6 /* RF230 register assignments, for reference */ diff --git a/cpu/avr/radio/rf230bb/rf230bb.c b/cpu/avr/radio/rf230bb/rf230bb.c index b937a0bbd..fc9005704 100644 --- a/cpu/avr/radio/rf230bb/rf230bb.c +++ b/cpu/avr/radio/rf230bb/rf230bb.c @@ -148,9 +148,12 @@ struct timestamp { #if RADIOSTATS uint16_t RF230_sendpackets,RF230_receivepackets,RF230_sendfail,RF230_receivefail; #endif + +#if RADIOCALIBRATE /* Set in clock.c every 256 seconds */ uint8_t rf230_calibrate; -uint8_t rf230_calibrated; //debugging +uint8_t rf230_calibrated; //for debugging, prints from main loop when calibration occurs +#endif /* Track flow through driver, see contiki-raven-main.c for example of use */ //#define DEBUGFLOWSIZE 64 @@ -206,8 +209,7 @@ static int rf230_receiving_packet(void); static int pending_packet(void); static int rf230_cca(void); -signed char rf230_last_rssi; -uint8_t rf230_last_correlation; +uint8_t rf230_last_correlation,rf230_last_rssi,rf230_smallest_rssi; const struct radio_driver rf230_driver = { @@ -700,6 +702,27 @@ rf230_init(void) PRINTF("rf230: Unsupported manufacturer ID %u\n",tmanu); PRINTF("rf230: Version %u, ID %u\n",tvers,tmanu); + + rf230_warm_reset(); + + /* Start the packet receive process */ + process_start(&rf230_process, NULL); + + /* Leave radio in on state (?)*/ + on(); + + return 1; +} +/*---------------------------------------------------------------------------*/ +/* Used to reinitialize radio parameters without losing pan and mac address, channel, power, etc. */ +void rf230_warm_reset(void) { +#if RF230_CONF_SNEEZER && JACKDAW + /* Take jackdaw radio out of test mode */ +#warning Manipulating PORTB pins for RF230 Sneezer mode! + PORTB &= ~(1<<7); + DDRB &= ~(1<<7); +#endif + hal_register_write(RG_IRQ_MASK, RF230_SUPPORTED_INTERRUPT_MASK); /* Set up number of automatic retries 0-15 (0 implies PLL_ON sends instead of the extended TX_ARET mode */ @@ -711,6 +734,24 @@ rf230_init(void) hal_register_write(RG_CSMA_SEED_0,hal_register_read(RG_PHY_RSSI) );//upper two RSSI reg bits RND_VALUE are random in rf231 // hal_register_write(CSMA_SEED_1,42 ); + /* CCA Mode Mode 1=Energy above threshold 2=Carrier sense only 3=Both 0=Either (RF231 only) */ +//hal_subregister_write(SR_CCA_MODE,1); //1 is the power-on default + + /* Carrier sense threshold (not implemented in RF230 or RF231) */ +// hal_subregister_write(SR_CCA_CS_THRES,1); + + /* CCA energy threshold = -91dB + 2*SR_CCA_ED_THRESH. Reset defaults to -77dB */ + /* Use RF230 base of -91; RF231 base is -90 according to datasheet */ +#if RF230_CONF_CCA_THRES < -91 +#warning RF230_CONF_CCA_THRES below hardware limit, setting to -91dBm + hal_subregister_write(SR_CCA_ED_THRES,0); +#elif RF230_CONF_CCA_THRES > -61 +#warning RF230_CONF_CCA_THRES above hardware limit, setting to -61dBm + hal_subregister_write(SR_CCA_ED_THRES,15); +#else + hal_subregister_write(SR_CCA_ED_THRES,(RF230_CONF_CCA_THRES+91)/2); +#endif + /* Use automatic CRC unless manual is specified */ #if RF230_CONF_CHECKSUM hal_subregister_write(SR_TX_AUTO_CRC_ON, 0); @@ -718,19 +759,10 @@ rf230_init(void) hal_subregister_write(SR_TX_AUTO_CRC_ON, 1); #endif - /* Start the packet receive process */ - process_start(&rf230_process, NULL); - /* Limit tx power for testing miniature Raven mesh */ #ifdef RF230_MAX_TX_POWER set_txpower(RF230_MAX_TX_POWER); //0=3dbm 15=-17.2dbm #endif - - /* Leave radio in on state (?)*/ - on(); - - - return 1; } /*---------------------------------------------------------------------------*/ static uint8_t buffer[RF230_MAX_TX_FRAME_LENGTH+AUX_LEN]; @@ -758,6 +790,7 @@ rf230_transmit(unsigned short payload_len) // delay_us(TIME_SLEEP_TO_TRX_OFF); RF230_sleeping=0; } else { +#if RADIOCALIBRATE /* If on, do periodic calibration. See clock.c */ if (rf230_calibrate) { hal_subregister_write(SR_PLL_CF_START,1); //takes 80us max @@ -766,6 +799,7 @@ rf230_transmit(unsigned short payload_len) rf230_calibrated=1; delay_us(80); //? } +#endif } /* Wait for any previous operation or state transition to finish */ @@ -878,7 +912,6 @@ rf230_transmit(unsigned short payload_len) } RELEASE_LOCK(); - if (tx_result==1) { //success, data pending from adressee tx_result=0; //Just show success? } else if (tx_result==3) { //CSMA channel access failure @@ -1327,6 +1360,10 @@ if (RF230_receive_on) { #endif #endif /* speed vs. generality */ + /* Save the smallest rssi. The display routine can reset by setting it to zero */ + if ((rf230_smallest_rssi==0) || (rf230_last_rssi #include +#if WATCHDOG_CONF_BALANCE && WATCHDOG_CONF_TIMEOUT >= 0 static int stopped = 0; +#endif /*---------------------------------------------------------------------------*/ void watchdog_init(void) { +/* Clear startup bit and disable the wdt, whether or not it will be used. + Random code may have caused the last reset. + */ MCUSR&=~(1<= 0 + stopped = 1; +#endif } /*---------------------------------------------------------------------------*/ void watchdog_start(void) { +#if WATCHDOG_CONF_TIMEOUT >= 0 +#if WATCHDOG_CONF_BALANCE stopped--; -// if(!stopped) - wdt_enable(WDTO_2S); + if(!stopped) +#endif + wdt_enable(WATCHDOG_CONF_TIMEOUT); +#endif } /*---------------------------------------------------------------------------*/ void watchdog_periodic(void) { -// if(!stopped) +#if WATCHDOG_CONF_TIMEOUT >= 0 +#if WATCHDOG_CONF_BALANCE + if(!stopped) +#endif wdt_reset(); +#endif } /*---------------------------------------------------------------------------*/ void watchdog_stop(void) { -// stopped++; +#if WATCHDOG_CONF_TIMEOUT >= 0 +#if WATCHDOG_CONF_BALANCE + stopped++; +#endif wdt_disable(); +#endif } /*---------------------------------------------------------------------------*/ void @@ -77,3 +124,9 @@ watchdog_reboot(void) while(1); //loop } /*---------------------------------------------------------------------------*/ +#if 0 +/* Not all AVRs implement the wdt interrupt */ +ISR(WDT_vect) +{ +} +#endif \ No newline at end of file diff --git a/cpu/mc1322x/Makefile.mc1322x b/cpu/mc1322x/Makefile.mc1322x index 6f146b0f7..146098aa1 100644 --- a/cpu/mc1322x/Makefile.mc1322x +++ b/cpu/mc1322x/Makefile.mc1322x @@ -72,7 +72,12 @@ CUSTOM_RULE_C_TO_O=yes CFLAGS += -I$(OBJECTDIR) -I$(CONTIKI_CPU)/board -DBOARD=$(TARGET) $(OBJECTDIR)/board.h: $(OBJECTDIR) +ifneq (,$(findstring Windows,$(OS))) + ${info Cygwin detected.} + ln -f $(CONTIKI_CPU)/board/$(TARGET).h $(OBJECTDIR)/board.h +else ln -sf ../$(CONTIKI_CPU)/board/$(TARGET).h $(OBJECTDIR)/board.h +endif $(OBJECTDIR)/isr.o: $(CONTIKI_CPU)/src/isr.c @@ -85,8 +90,6 @@ $(OBJECTDIR)/%.o: %.c $(CC) $(CFLAGS) $(THUMB_FLAGS) -c $< -o $@ CUSTOM_RULE_S_TO_OBJECTDIR_O = yes -%.o: %.S - $(CC) $(CFLAGS) $(AFLAGS) $(ARM_FLAGS) $< -c $(OBJECTDIR)/%.o: %.S $(CC) $(CFLAGS) $(AFLAGS) $(ARM_FLAGS) $< -c -o $@ diff --git a/cpu/mc1322x/lib/adc.c b/cpu/mc1322x/lib/adc.c new file mode 100644 index 000000000..841855107 --- /dev/null +++ b/cpu/mc1322x/lib/adc.c @@ -0,0 +1,138 @@ +/* + * Copyright (c) 2010, Mariano Alvira and other contributors + * to the MC1322x project (http://mc1322x.devl.org) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This file is part of libmc1322x: see http://mc1322x.devl.org + * for details. + * + * + */ + +#include +#include "crm.h" +#include "adc.h" +#include "gpio-util.h" + +//#define ADC_CHANS_ENABLED 0x3F // channels 0-5 enabled +//#define ADC_CHANS_ENABLED 0x7E // channels 1-6 enabled +//#define ADC_CHANS_ENABLED (1 << 6) // only channel 6 enabled +#define ADC_CHANS_ENABLED 0x1FF // all channels, including battery reference voltage + +//#define ADC_PRESCALE_VALUE 24 // divide by 24 for 1MHz. + +#define ADC_SAMPLE_FREQ 400 // Hz (minimum of ~366.21 Hz) +#define ADC_PRESCALE_VALUE (REF_OSC / ADC_SAMPLE_FREQ) + +#define ADC_USE_TIMER 0 +#define ADC_USE_INTERRUPTS 0 // incomplete support + +uint16_t adc_reading[NUM_ADC_CHAN]; + +void ADC_flush(void) { + while(ADC->FIFO_STATUSbits.EMPTY == 0) ADC->FIFO_READ; +} + +uint16_t ADC_READ(void) { + while(ADC->FIFO_STATUSbits.EMPTY); // loop while empty + return ADC->FIFO_READ; // upper 4 bits are channel number +} + + +void adc_service(void) { + uint16_t value; + uint8_t channel; + while (ADC->FIFO_STATUSbits.EMPTY == 0) { + value = ADC->FIFO_READ; + channel = value >> 12; + if (channel < NUM_ADC_CHAN) adc_reading[channel] = value & 0xFFF; + } +} + +void adc_init(void) { + uint8_t n; + + ADC->CLOCK_DIVIDER = 80; // 300 KHz + ADC->PRESCALE = ADC_PRESCALE_VALUE - 1; // divide by 24 for 1MHz. + + ADC->CONTROL = 1; + + // The ON-TIME must always be 10µs or greater - typical On-Time value = 0x000A (10dec) + ADC->ON_TIME = 10; + + /* + NOTE + The ADC analog block requires 6 ADC_Clocks per conversion, and the + ADC_Clock must 300kHz or less. With 6 clocks/conversion and a 33.33µs + clock period: + * The ADC convert time must always be 20µs or greater + * If the ADC_Clock is a frequency lower than 300kHz, the convert time + must always be 6 ADC_Clock periods or greater + * For override mode, extend convert time to 40µs minimum or greater + For the convert time: + * This delay is a function of the Prescale Clock (typically 1 MHz) + * The register must be initialized for proper operation + * For a 20µs convert time with 1MHz, value = 0x0014 (20dec) + * If convert time is insufficient, inaccurate sample data will result + */ + ADC->CONVERT_TIME = 1000000 / (115200 / 8) - 1; + + ADC->MODE = 0; // Automatic + +#if ADC_USE_INTERRUPTS + ADC->FIFO_CONTROL = 7; +#else + ADC->FIFO_CONTROL = 0; +#endif + +#if ADC_USE_TIMER + ADC->SR_1_HIGH = 0x0000; + ADC->SR_1_LOW = (REF_OSC / ADC_PRESCALE_VALUE) / (115200 / 8) + 1; +#endif + + ADC->SEQ_1 = 0 +#if ADC_USE_TIMER + | (1 << 15) // sequence based on Timer 1. +#else + | (0 << 15) // sequence based on convert time. +#endif + | ADC_CHANS_ENABLED; + + ADC->CONTROL = 0xF001 +//#if ADC_USE_TIMER + | (1 << 1) // Timer 1 enable +//#endif + ; + ADC->OVERRIDE = (1 << 8); + + for (n=0; n<=8; n++) { + if ((ADC_CHANS_ENABLED >> n) & 1) { + gpio_select_function(30 + n, 1); // Function 1 = ADC + gpio_set_pad_dir(30 + n, PAD_DIR_INPUT); + } + } +} diff --git a/cpu/mc1322x/lib/gpio-util.c b/cpu/mc1322x/lib/gpio-util.c new file mode 100644 index 000000000..e1f55d426 --- /dev/null +++ b/cpu/mc1322x/lib/gpio-util.c @@ -0,0 +1,63 @@ + +#include +#include + +#include "gpio-util.h" + +void gpio_select_function(uint8_t gpio, uint8_t func) { + uint32_t mask = 3; + uint8_t major, minor, shift; + volatile uint32_t *base = GPIO_FUNC_SEL0; + uint32_t value; + major = gpio >> 4; + minor = gpio & 0xF; + shift = 2 * minor; + + value = base[major]; + value &= ~(mask << shift); + value |= (func << shift); + base[major] = value; +} + +void gpio_reg_set(volatile uint32_t* reg, uint8_t bit) { + uint8_t major, minor; + major = bit / 32; + minor = bit % 32; + *(reg + major) |= (1UL << minor); +} + +void gpio_reg_clear(volatile uint32_t* reg, uint8_t bit) { + uint8_t major, minor; + major = bit / 32; + minor = bit % 32; + *(reg + major) &= ~(1UL << minor); +} + +void gpio_set_pad_dir(uint8_t gpio, uint8_t dir) { + uint8_t major, minor; + major = gpio / 32; + minor = gpio % 32; + if (dir) gpio_reg_set(GPIO_PAD_DIR0 + major, minor); + else gpio_reg_clear(GPIO_PAD_DIR0 + major, minor); +} + +void gpio_set(uint8_t gpio) { + uint8_t major, minor; + major = gpio / 32; + minor = gpio % 32; + *(GPIO_DATA_SET0 + major) = (1UL << minor); +} + +void gpio_reset(uint8_t gpio) { + uint8_t major, minor; + major = gpio / 32; + minor = gpio % 32; + *(GPIO_DATA_RESET0 + major) = (1UL << minor); +} + +bool gpio_read(uint8_t gpio) { + uint8_t major, minor; + major = gpio / 32; + minor = gpio % 32; + return (*(GPIO_DATA0 + major) >> minor) & 1; +} diff --git a/cpu/mc1322x/lib/include/adc.h b/cpu/mc1322x/lib/include/adc.h new file mode 100644 index 000000000..580e3545e --- /dev/null +++ b/cpu/mc1322x/lib/include/adc.h @@ -0,0 +1,164 @@ +/* + * Copyright (c) 2010, Mariano Alvira and other contributors + * to the MC1322x project (http://mc1322x.devl.org) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This file is part of libmc1322x: see http://mc1322x.devl.org + * for details. + * + * + */ + +#ifndef ADC_H +#define ADC_H + +#include +#include "utils.h" + +/* ADC registers are all 16-bit wide with 16-bit access only */ +#define ADC_BASE (0x8000D000) + +/* Structure-based register definitions */ + +struct ADC_struct { + union { + uint16_t COMP[8]; + struct { + uint16_t COMP_0; + uint16_t COMP_1; + uint16_t COMP_2; + uint16_t COMP_3; + uint16_t COMP_4; + uint16_t COMP_5; + uint16_t COMP_6; + uint16_t COMP_7; + }; + }; + uint16_t BAT_COMP_OVER; + uint16_t BAT_COMP_UNDER; + union { + uint16_t SEQ_1; + struct ADC_SEQ_1 { + uint16_t CH0:1; + uint16_t CH1:1; + uint16_t CH2:1; + uint16_t CH3:1; + uint16_t CH4:1; + uint16_t CH5:1; + uint16_t CH6:1; + uint16_t CH7:1; + uint16_t BATT:1; + uint16_t :6; + uint16_t SEQ_MODE:1; + } SEQ_1bits; + }; + union { + uint16_t SEQ_2; + struct ADC_SEQ_2 { + uint16_t CH0:1; + uint16_t CH1:1; + uint16_t CH2:1; + uint16_t CH3:1; + uint16_t CH4:1; + uint16_t CH5:1; + uint16_t CH6:1; + uint16_t CH7:1; + uint16_t :7; + uint16_t SEQ_MODE:1; + } SEQ_2bits; + }; + union { + uint16_t CONTROL; + struct ADC_CONTROL { + uint16_t ON:1; + uint16_t TIMER1_ON:1; + uint16_t TIMER2_ON:1; + uint16_t SOFT_RESET:1; + uint16_t AD1_FREFHL_EN:1; + uint16_t AD2_VREFHL_EN:1; + uint16_t :6; + uint16_t COMPARE_IRQ_MASK:1; + uint16_t SEQ1_IRQ_MASK:1; + uint16_t SEQ2_IRQ_MASK:1; + uint16_t FIFO_IRQ_MASK:1; + } CONTROLbits; + }; + uint16_t TRIGGERS; + uint16_t PRESCALE; + uint16_t reserved1; + uint16_t FIFO_READ; + uint16_t FIFO_CONTROL; + union { + uint16_t FIFO_STATUS; + struct ADC_FIFO_STATUS { + uint16_t LEVEL:4; + uint16_t FULL:1; + uint16_t EMPTY:1; + uint16_t :10; + } FIFO_STATUSbits; + }; + uint16_t reserved2[5]; + uint16_t SR_1_HIGH; + uint16_t SR_1_LOW; + uint16_t SR_2_HIGH; + uint16_t SR_2_LOW; + uint16_t ON_TIME; + uint16_t CONVERT_TIME; + uint16_t CLOCK_DIVIDER; + uint16_t reserved3; + union { + uint16_t OVERRIDE; + struct ADC_OVERRIDE { + uint16_t MUX1:4; + uint16_t MUX2:4; + uint16_t AD1_ON:1; + uint16_t AD2_ON:1; + uint16_t :6; + } OVERRIDEbits; + }; + uint16_t IRQ; + uint16_t MODE; + uint16_t RESULT_1; + uint16_t RESULT_2; +}; + +static volatile struct ADC_struct * const ADC = (void *) (ADC_BASE); + +#define NUM_ADC_CHAN 9 + +#define adc_enable() (ADC->CONTROLbits.ON = 1) +#define adc_disable() (ADC->CONTROLbits.ON = 0) +#define adc_select_channels(chans) (ADC->SEQ_1 = (ADC->SEQ_1 & 0xFE00) | chans) + +extern uint16_t adc_reading[NUM_ADC_CHAN]; +void ADC_flush(void); +uint16_t ADC_READ(void); +void read_scanners(void); +void adc_init(void); +void adc_service(void); + +#endif diff --git a/cpu/mc1322x/lib/include/asm.h b/cpu/mc1322x/lib/include/asm.h new file mode 100644 index 000000000..85af38da1 --- /dev/null +++ b/cpu/mc1322x/lib/include/asm.h @@ -0,0 +1,116 @@ +/* + * Copyright (c) 2010, Mariano Alvira and other contributors + * to the MC1322x project (http://mc1322x.devl.org) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This file is part of libmc1322x: see http://mc1322x.devl.org + * for details. + * + * + */ + +#ifndef ASM_H +#define ASM_H + +/* Structure-based register definitions */ +/* Example use: + ASM->KEY0 = 0xaabbccdd; + ASM->CONTROL1bits = (struct ASM_CONTROL1) { + .MASK_IRQ = 1, + .CBC = 1, + }; + ASM->CONTROL1bits.SELF_TEST = 1; +*/ + +struct ASM_struct { + uint32_t KEY0; + uint32_t KEY1; + uint32_t KEY2; + uint32_t KEY3; + uint32_t DATA0; + uint32_t DATA1; + uint32_t DATA2; + uint32_t DATA3; + uint32_t CTR0; + uint32_t CTR1; + uint32_t CTR2; + uint32_t CTR3; + uint32_t CTR0_RESULT; + uint32_t CTR1_RESULT; + uint32_t CTR2_RESULT; + uint32_t CTR3_RESULT; + uint32_t CBC0_RESULT; + uint32_t CBC1_RESULT; + uint32_t CBC2_RESULT; + uint32_t CBC3_RESULT; + + union { + uint32_t CONTROL0; + struct ASM_CONTROL0 { + uint32_t :24; + uint32_t START:1; + uint32_t CLEAR:1; + uint32_t LOAD_MAC:1; + uint32_t :4; + uint32_t CLEAR_IRQ:1; + } CONTROL0bits; + }; + union { + uint32_t CONTROL1; + struct ASM_CONTROL1 { + uint32_t ON:1; + uint32_t NORMAL_MODE:1; + uint32_t BYPASS:1; + uint32_t :21; + uint32_t CBC:1; + uint32_t CTR:1; + uint32_t SELF_TEST:1; + uint32_t :4; + uint32_t MASK_IRQ:1; + } CONTROL1bits; + }; + union { + uint32_t STATUS; + struct ASM_STATUS { + uint32_t :24; + uint32_t DONE:1; + uint32_t TEST_PASS:1; + uint32_t :6; + } STATUSbits; + }; + + uint32_t reserved; + + uint32_t MAC0; + uint32_t MAC1; + uint32_t MAC2; + uint32_t MAC3; +}; + +static volatile struct ASM_struct * const ASM = (void *) (0x80008000); + +#endif diff --git a/cpu/mc1322x/lib/include/crm.h b/cpu/mc1322x/lib/include/crm.h index 6766bd5a3..27c0adc53 100644 --- a/cpu/mc1322x/lib/include/crm.h +++ b/cpu/mc1322x/lib/include/crm.h @@ -220,6 +220,11 @@ struct CRM_struct { static volatile struct CRM_struct * const CRM = (void *) (CRM_BASE); +/* COP watchdog timer helpers */ + +/* set the cop timout in milliseconds */ +#define cop_timeout_ms(x) (CRM->COP_CNTLbits.COP_TIMEOUT = x/87) +#define cop_service() (CRM->COP_SERVICE = 0xc0de5afe) /* Old register definitions, for compatibility */ #ifndef REG_NO_COMPAT diff --git a/cpu/mc1322x/lib/include/gpio-util.h b/cpu/mc1322x/lib/include/gpio-util.h new file mode 100644 index 000000000..258ecf097 --- /dev/null +++ b/cpu/mc1322x/lib/include/gpio-util.h @@ -0,0 +1,28 @@ + +#ifndef GPIO_UTIL_H +#define GPIO_UTIL_H + +#include +#include + +void gpio_select_function(uint8_t gpio, uint8_t func); +void gpio_reg_set(volatile uint32_t* reg, uint8_t bit); +void gpio_reg_clear(volatile uint32_t* reg, uint8_t bit); + +#define PAD_DIR_INPUT 0 +#define PAD_DIR_OUTPUT 1 +void gpio_set_pad_dir(uint8_t gpio, uint8_t dir); + +#undef gpio_set +#undef gpio_reset +#undef gpio_read + +//#define gpio_set gpio_set_ian +//#define gpio_reset gpio_reset_ian +//#define gpio_read gpio_read_ian + +void gpio_set(uint8_t gpio); +void gpio_reset(uint8_t gpio); +bool gpio_read(uint8_t gpio); + +#endif diff --git a/cpu/mc1322x/lib/include/isr.h b/cpu/mc1322x/lib/include/isr.h index faa4966cc..f362d81d8 100644 --- a/cpu/mc1322x/lib/include/isr.h +++ b/cpu/mc1322x/lib/include/isr.h @@ -166,5 +166,7 @@ extern void uart1_isr(void) __attribute__((weak)); extern void maca_isr(void) __attribute__((weak)); +extern void asm_isr(void) __attribute__((weak)); + #endif diff --git a/cpu/mc1322x/lib/include/maca.h b/cpu/mc1322x/lib/include/maca.h index 2f567a9ac..d9bb283b8 100644 --- a/cpu/mc1322x/lib/include/maca.h +++ b/cpu/mc1322x/lib/include/maca.h @@ -121,8 +121,8 @@ enum { #define LFSR 6 /* 1 use polynomial for Turbolink */ #define TM 5 -#define MODE 3 -#define MODE_MASK bit_mask(2,MODE) +#define MACA_MODE 3 +#define MODE_MASK bit_mask(2,MACA_MODE) #define NO_CCA 0 #define NO_SLOT_CCA 1 #define SLOT_CCA 2 diff --git a/cpu/mc1322x/lib/include/mc1322x.h b/cpu/mc1322x/lib/include/mc1322x.h index df19b19c2..e6437e0de 100644 --- a/cpu/mc1322x/lib/include/mc1322x.h +++ b/cpu/mc1322x/lib/include/mc1322x.h @@ -46,5 +46,6 @@ #include "packet.h" #include "uart1.h" #include "utils.h" +#include "asm.h" #endif diff --git a/cpu/mc1322x/lib/include/pwm.h b/cpu/mc1322x/lib/include/pwm.h new file mode 100644 index 000000000..65cfe1616 --- /dev/null +++ b/cpu/mc1322x/lib/include/pwm.h @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2010, Mariano Alvira and other contributors + * to the MC1322x project (http://mc1322x.devl.org) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This file is part of libmc1322x: see http://mc1322x.devl.org + * for details. + * + * + */ + +#ifndef PWM_H +#define PWM_H + +/* Initialize PWM output. + timer_num = 0, 1, 2, 3 + rate = desired rate in Hz, + duty = desired duty cycle. 0=always off, 65536=always on. + enable_timer = whether to actually run the timer, versus just configuring it + Returns actual PWM rate. */ +uint32_t pwm_init_ex(int timer_num, uint32_t rate, uint32_t duty, int enable_timer); + +/* Initialize PWM output, helper macros + timer = TMR0, TMR1, TMR2, TMR2 + rate = desired rate in Hz, + duty = desired duty cycle. 0=always off, 65536=always on. + Returns actual PWM rate. */ +#define pwm_init(timer,rate,duty) pwm_init_ex(TMR_NUM(timer), rate, duty, 1) +#define pwm_init_stopped(timer,rate,duty) pwm_init_ex(TMR_NUM(timer), rate, duty, 0) + +/* Change duty cycle. Safe to call at any time. + timer_num = 0, 1, 2, 3 + duty = desired duty cycle. 0=always off, 65536=always on. +*/ +void pwm_duty_ex(int timer_num, uint32_t duty); + +/* Change duty cycle. Safe to call at any time. + timer = TMR0, TMR1, TMR2, TMR2 + duty = desired duty cycle. 0=always off, 65536=always on. +*/ +#define pwm_duty(timer,duty) pwm_duty_ex(TMR_NUM(timer), duty) + +#endif diff --git a/cpu/mc1322x/lib/include/rtc.h b/cpu/mc1322x/lib/include/rtc.h new file mode 100644 index 000000000..cda1d60cb --- /dev/null +++ b/cpu/mc1322x/lib/include/rtc.h @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2010, Mariano Alvira and other contributors + * to the MC1322x project (http://mc1322x.devl.org) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This file is part of libmc1322x: see http://mc1322x.devl.org + * for details. + * + * + */ + +#ifndef RTC_H +#define RTC_H + +/* Init RTC (and calibrate, if using ring oscillator) */ +void rtc_init_osc(int use_32khz); + +#ifdef USE_32KHZ +#define rtc_init() rtc_init_osc(USE_32KHZ) +#else +#define rtc_init() rtc_init_osc(0) +#endif + +/* Calibrate the ring oscillator */ +void rtc_calibrate(void); + +/* Delay for the specified number of milliseconds by polling RTC */ +void rtc_delay_ms(uint32_t msec); + +/* Calibrated frequency of the RTC, in Hz */ +extern int rtc_freq; + +#endif diff --git a/cpu/mc1322x/lib/maca.c b/cpu/mc1322x/lib/maca.c index e039062c3..d68b5a394 100644 --- a/cpu/mc1322x/lib/maca.c +++ b/cpu/mc1322x/lib/maca.c @@ -184,7 +184,7 @@ void maca_init(void) { /* nop, promiscuous, no cca */ *MACA_CONTROL = (prm_mode << PRM) | - (NO_CCA << MODE); + (NO_CCA << MACA_MODE); enable_irq(MACA); *INTFRC = (1 << INT_NUM_MACA); @@ -368,7 +368,9 @@ void post_receive(void) { ( 4 << PRECOUNT) | ( fcs_mode << NOFC ) | ( prm_mode << PRM) | +#if 0 //dak says removing ctrl auto fixes the autoack checksum error --- doesn't cause a performance issue either (1 << maca_ctrl_auto) | +#endif (maca_ctrl_seq_rx)); /* status bit 10 is set immediately */ /* then 11, 10, and 9 get set */ diff --git a/cpu/mc1322x/lib/pwm.c b/cpu/mc1322x/lib/pwm.c new file mode 100644 index 000000000..8ee8f2eb1 --- /dev/null +++ b/cpu/mc1322x/lib/pwm.c @@ -0,0 +1,254 @@ +/* + * Copyright (c) 2010, Mariano Alvira and other contributors + * to the MC1322x project (http://mc1322x.devl.org) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This file is part of libmc1322x: see http://mc1322x.devl.org + * for details. + * + * + */ + +#include +#include +#include "pwm.h" + +static struct { + uint32_t period; + uint32_t guard; + uint32_t pad_forced; +} pwm_info[4]; + +static inline void pad_set_output(int timer_num) { // set to output (when in GPIO mode) + switch (timer_num) { + case 0: GPIO->DATA_SEL.TMR0_PIN = 1; GPIO->PAD_DIR.TMR0_PIN = 1; break; + case 1: GPIO->DATA_SEL.TMR1_PIN = 1; GPIO->PAD_DIR.TMR1_PIN = 1; break; + case 2: GPIO->DATA_SEL.TMR2_PIN = 1; GPIO->PAD_DIR.TMR2_PIN = 1; break; + case 3: GPIO->DATA_SEL.TMR3_PIN = 1; GPIO->PAD_DIR.TMR3_PIN = 1; break; + default: break; + } +} + +static inline void pad_set_zero(int timer_num) { // set to zero in GPIO mode + switch (timer_num) { + case 0: GPIO->DATA_RESET.TMR0_PIN = 1; GPIO->FUNC_SEL.TMR0_PIN = 0; break; + case 1: GPIO->DATA_RESET.TMR1_PIN = 1; GPIO->FUNC_SEL.TMR1_PIN = 0; break; + case 2: GPIO->DATA_RESET.TMR2_PIN = 1; GPIO->FUNC_SEL.TMR2_PIN = 0; break; + case 3: GPIO->DATA_RESET.TMR3_PIN = 1; GPIO->FUNC_SEL.TMR3_PIN = 0; break; + default: break; + } +} + +static inline void pad_set_one(int timer_num) { // set to one in GPIO mode + switch (timer_num) { + case 0: GPIO->DATA_SET.TMR0_PIN = 1; GPIO->FUNC_SEL.TMR0_PIN = 0; break; + case 1: GPIO->DATA_SET.TMR1_PIN = 1; GPIO->FUNC_SEL.TMR1_PIN = 0; break; + case 2: GPIO->DATA_SET.TMR2_PIN = 1; GPIO->FUNC_SEL.TMR2_PIN = 0; break; + case 3: GPIO->DATA_SET.TMR3_PIN = 1; GPIO->FUNC_SEL.TMR3_PIN = 0; break; + default: break; + } +} + +static inline void pad_set_normal(int timer_num) { // set to TMR OFLAG output + switch (timer_num) { + case 0: GPIO->FUNC_SEL.TMR0_PIN = 1; break; + case 1: GPIO->FUNC_SEL.TMR1_PIN = 1; break; + case 2: GPIO->FUNC_SEL.TMR2_PIN = 1; break; + case 3: GPIO->FUNC_SEL.TMR3_PIN = 1; break; + default: break; + } +} + +/* Initialize PWM output. + timer_num = 0, 1, 2, 3 + rate = desired rate in Hz, + duty = desired duty cycle. 0=always off, 65536=always on. + enable_timer = whether to actually run the timer, versus just configuring it + Returns actual PWM rate. */ +uint32_t pwm_init_ex(int timer_num, uint32_t rate, uint32_t duty, int enable_timer) +{ + uint32_t actual_rate; + volatile struct TMR_struct *timer = TMR_ADDR(timer_num); + int log_divisor = 0; + uint32_t period, guard; + + /* Turn timer off */ + TMR0->ENBL &= ~(1 << timer_num); + + /* Calculate optimal rate */ + for (log_divisor = 0; log_divisor < 8; log_divisor++) + { + int denom = (rate * (1 << log_divisor)); + period = (REF_OSC + denom/2) / denom; + if (period <= 65535) + break; + } + if (log_divisor >= 8) + { + period = 65535; + log_divisor = 7; + } + + /* Guard value (for safely changing duty cycle) should be + about 32 CPU clocks. Calculate how many timer counts that + is, based on prescaler */ + guard = 32 >> log_divisor; + if (guard < 2) guard = 2; + + /* Period should be about 50% longer than guard */ + if (period < ((guard * 3) / 2)) + period = guard + 4; + + /* Store period, guard, actual rate */ + pwm_info[timer_num].period = period; + pwm_info[timer_num].guard = guard; + actual_rate = REF_OSC / (period * (1 << log_divisor)); + + /* Set up timer */ + pwm_duty_ex(timer_num, duty); // sets CMPLD1, LOAD + timer->SCTRLbits = (struct TMR_SCTRL) { + .OEN = 1, // drive OFLAG + }; + timer->CSCTRLbits = (struct TMR_CSCTRL) { + .CL1 = 0x01, // Reload COMP1 when COMP1 matches + }; + timer->COMP1 = timer->CMPLD1; + timer->CNTR = timer->LOAD; + timer->CTRLbits = (struct TMR_CTRL) { + .COUNT_MODE = 1, // Count rising edge of primary source + .PRIMARY_CNT_SOURCE = 8 + log_divisor, // Peripheral clock divided by (divisor) + .LENGTH = 1, // At compare, reset to LOAD + .OUTPUT_MODE = 6, // Set on COMP1, clear on rollover + }; + + pad_set_output(timer_num); + pad_set_normal(timer_num); + + if (enable_timer) { + TMR0->ENBL |= (1 << timer_num); + } + +// printf("pwm timer %d, addr %p, requested rate %d, actual rate: %d, period %d, guard %d, divisor %d\r\n", +// timer_num, timer, rate, actual_rate, period, guard, 1 << log_divisor); + + return actual_rate; +} + +/* Change duty cycle. Safe to call at any time. + timer_num = 0, 1, 2, 3 + duty = desired duty cycle. 0=always off, 65536=always on. +*/ +void pwm_duty_ex(int timer_num, uint32_t duty) +{ + uint16_t comp1, load; + volatile struct TMR_struct *timer = TMR_ADDR(timer_num); + uint32_t period = pwm_info[timer_num].period; + + duty = (duty * period + 32767) / 65536; + + /* We don't use the "variable PWM" mode described in the datasheet because + there's no way to reliably change the duty cycle without potentially + changing the period for one cycle, which will cause phase drifts. + + Instead, we use the "Set on compare, clear on rollover" output mode: + + waveform: |_________| |----------| + counter: 0 COMP1 LOAD 65535 + + The low portion of the wave is COMP1 cycles long. The + compare changes the counter to LOAD, and so the high + portion is (65536 - LOAD) cycles long. + + Now, we just have to make sure we're not about to hit COMP1 + before we change LOAD and COMPLD1. If (COMP1 - CNTR) is less + than GUARD cycles, we wait for it to reload before changing. + */ + + if (duty == 0) { + pad_set_zero(timer_num); + pwm_info[timer_num].pad_forced = 1; + return; + } + + if (duty >= period) { + pad_set_one(timer_num); + pwm_info[timer_num].pad_forced = 1; + return; + } + + if (pwm_info[timer_num].pad_forced) { + pad_set_normal(timer_num); + pwm_info[timer_num].pad_forced = 0; + } + + comp1 = (period - duty) - 1; + load = (65536 - duty); + + /* Disable interrupts */ + uint32_t old_INTCNTL = ITC->INTCNTL; + ITC->INTCNTL = 0; + + if (TMR0->ENBL & (1 << timer_num)) + { + /* Timer is enabled, so use the careful approach. + Implemented in ASM so we can be sure of the cycle + count */ + uint32_t tmp1, tmp2; + asm volatile (//".arm \n\t" + "1: \n\t" + "ldrh %[tmp1], %[comp] \n\t" // load COMP1 + "ldrh %[tmp2], %[count] \n\t" // load CNTR + "sub %[tmp1], %[tmp1], %[tmp2] \n\t" // subtract + "lsl %[tmp1], %[tmp1], #16 \n\t" // clear high bits + "lsr %[tmp1], %[tmp1], #16 \n\t" + "cmp %[tmp1], %[guard] \n\t" // compare to GUARD + "bls 1b \n\t" // if less, goto 1 + + "strh %[ld1], %[cmpld] \n\t" // store CMPLD1 + "strh %[ld2], %[load] \n\t" // store LOAD + : /* out */ + [tmp1] "=&l" (tmp1), + [tmp2] "=&l" (tmp2), + [cmpld] "=m" (timer->CMPLD1), + [load] "=m" (timer->LOAD) + : /* in */ + [comp] "m" (timer->COMP1), + [count] "m" (timer->CNTR), + [ld1] "l" (comp1), + [ld2] "l" (load), + [guard] "l" (pwm_info[timer_num].guard) + : "memory" + ); + } else { + /* Just set it directly, timer isn't running */ + timer->CMPLD1 = comp1; + timer->LOAD = load; + } + + /* Re-enable interrupts */ + ITC->INTCNTL = old_INTCNTL; +} diff --git a/cpu/mc1322x/lib/rtc.c b/cpu/mc1322x/lib/rtc.c new file mode 100644 index 000000000..383384c38 --- /dev/null +++ b/cpu/mc1322x/lib/rtc.c @@ -0,0 +1,202 @@ +/* + * Copyright (c) 2010, Mariano Alvira and other contributors + * to the MC1322x project (http://mc1322x.devl.org) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This file is part of libmc1322x: see http://mc1322x.devl.org + * for details. + * + * + */ + +#include +#include +#include "rtc.h" + +/* Define USE_32KHZ in board.h to start and use the 32 KHz + oscillator, otherwise the 2 KHz ring oscillator is used. */ + +int rtc_freq = 0; +static int __use_32khz = 0; + +/* Init RTC */ +void rtc_init_osc(int use_32khz) +{ + __use_32khz = use_32khz; + + if (use_32khz) + { + uint32_t old; + + /* You have to hold its hand with this one */ + /* once you start the 32KHz crystal it can only be + * stopped with a reset (hard or soft). */ + + /* first, disable the ring osc */ + CRM->RINGOSC_CNTLbits.ROSC_EN = 0; + + /* enable the 32kHZ crystal */ + CRM->XTAL32_CNTLbits.XTAL32_EN = 1; + + /* set the XTAL32_EXISTS bit */ + /* the datasheet says to do this after you check that RTC_COUNT + is changing, but it is not correct; it needs to be set first */ + CRM->SYS_CNTLbits.XTAL32_EXISTS = 1; + + old = CRM->RTC_COUNT; + while (CRM->RTC_COUNT == old) + continue; + + /* RTC has started up */ + rtc_freq = 32000; + } + else + { + /* Enable ring osc */ + CRM->RINGOSC_CNTLbits.ROSC_EN = 1; + CRM->XTAL32_CNTLbits.XTAL32_EN = 0; + + /* Set default tune values from datasheet */ + CRM->RINGOSC_CNTLbits.ROSC_CTUNE = 0x6; + CRM->RINGOSC_CNTLbits.ROSC_FTUNE = 0x17; + + /* Trigger calibration */ + rtc_calibrate(); + } +} + +uint32_t __rtc_try(int loading, int timeout) +{ + /* Total loading is + ctune * 1000 fF + ftune * 160 fF + ctune = 0-15 + ftune = 0-31 + max = 19960 fF + */ + +#define RTC_LOADING_MIN 0 +#define RTC_LOADING_MAX 19960 + + /* The fine tune covers a range larger than a single coarse + step. Check all coarse steps within the fine tune range to + find the optimal CTUNE, FTUNE pairs. */ +#define CTUNE_MAX 15 +#define FTUNE_MAX 31 +#define CSTEP 1000 +#define FSTEP 160 +#define MAX_F (FSTEP*FTUNE_MAX) /* actually lcm(CSTEP,FSTEP) would be better, + but in this case it's basically the same */ + int ctune; + int ftune; + int ctune_start = (loading - MAX_F) / CSTEP; + int ctune_end = loading / CSTEP; + int best_err = loading, best_ctune = 0, best_ftune = 0; + + uint32_t count; + + if (ctune_start < 0) ctune_start = 0; + if (ctune_end > CTUNE_MAX) ctune_end = CTUNE_MAX; + + for (ctune = ctune_start; ctune <= ctune_end; ctune++) + { + int this_loading, this_err; + + ftune = ((loading - (ctune * CSTEP)) + (FSTEP / 2)) / FSTEP; + if (ftune < 0) ftune = 0; + if (ftune > FTUNE_MAX) ftune = FTUNE_MAX; + + this_loading = ctune * CSTEP + ftune * FSTEP; + this_err = abs(this_loading - loading); + if (this_err < best_err) { + best_err = this_err; + best_ctune = ctune; + best_ftune = ftune; + } + } + +// printf("requested loading %d, actual loading %d\r\n", loading, +// best_ctune * CSTEP + best_ftune * FSTEP); + + /* Run the calibration */ + CRM->RINGOSC_CNTLbits.ROSC_CTUNE = best_ctune; + CRM->RINGOSC_CNTLbits.ROSC_FTUNE = best_ftune; + CRM->CAL_CNTLbits.CAL_TIMEOUT = timeout; + CRM->STATUSbits.CAL_DONE = 1; + CRM->CAL_CNTLbits.CAL_EN = 1; + while (CRM->STATUSbits.CAL_DONE == 0) + continue; + + /* Result should ideally be close to (REF_OSC * (timeout / 2000)) */ + count = CRM->CAL_COUNT; + if (count == 0) count = 1; /* avoid divide by zero problems */ + return count; +} + +/* Calibrate the ring oscillator */ +void rtc_calibrate(void) +{ + /* Just bisect a few times. Our best tuning accuracy is about + 1/500 of the full scale, so doing this 8-9 times is about + as accurate as we can get */ + int i; + int low = RTC_LOADING_MIN, high = RTC_LOADING_MAX; + int mid; + uint32_t count; + + if (__use_32khz) { + rtc_freq = 32000; + return; + } + +#define TIMEOUT 100 /* 50 msec per attempt */ + + for (i = 0; i < 9; i++) + { + mid = (low + high) / 2; + count = __rtc_try(mid, TIMEOUT); + // careful about overflow + rtc_freq = REF_OSC / ((count + TIMEOUT/2) / TIMEOUT); + + if (rtc_freq > 2000) + low = mid; // increase loading + else + high = mid; // decrease loading + } + +// printf("RTC calibrated to %d Hz\r\n", rtc_freq); +} + + +/* Delay for the specified number of milliseconds by polling RTC */ +void rtc_delay_ms(uint32_t msec) +{ + uint32_t start; + + start = CRM->RTC_COUNT; + while ((CRM->RTC_COUNT - start) < ((msec * rtc_freq) / 1000)) + continue; +} diff --git a/cpu/mc1322x/mc1322x.lds b/cpu/mc1322x/mc1322x.lds index df3ca8895..95fcb2665 100644 --- a/cpu/mc1322x/mc1322x.lds +++ b/cpu/mc1322x/mc1322x.lds @@ -18,7 +18,7 @@ FIQ_STACK_SIZE = 256; SVC_STACK_SIZE = 256; ABT_STACK_SIZE = 16; UND_STACK_SIZE = 16; -HEAP_SIZE = 1024; +HEAP_SIZE = 4096; /* Read-only sections, merged into text segment: */ PROVIDE (__executable_start = 0x00400000); . = 0x00400000; diff --git a/cpu/mc1322x/src/isr.c b/cpu/mc1322x/src/isr.c index daf998dbd..2fbb406a2 100644 --- a/cpu/mc1322x/src/isr.c +++ b/cpu/mc1322x/src/isr.c @@ -87,6 +87,9 @@ void irq(void) cal_isr(); } } + if(bit_is_set(pending, INT_NUM_ASM)) { + if(asm_isr != 0) { asm_isr(); } + } *INTFRC = 0; /* stop forcing interrupts */ diff --git a/cpu/mc1322x/tests/Makefile b/cpu/mc1322x/tests/Makefile index b664694da..ef4b6c287 100644 --- a/cpu/mc1322x/tests/Makefile +++ b/cpu/mc1322x/tests/Makefile @@ -10,7 +10,11 @@ TARGETS := blink-red blink-green blink-blue blink-white blink-allio \ uart1-loopback \ tmr tmr-ints \ sleep \ - printf + printf \ + asm \ + adc \ + pwm \ + wdt # these targets are built with space reserved for variables needed by ROM services # this space is initialized with a rom call to rom_data_init diff --git a/cpu/mc1322x/tests/adc.c b/cpu/mc1322x/tests/adc.c new file mode 100644 index 000000000..28a98ce75 --- /dev/null +++ b/cpu/mc1322x/tests/adc.c @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2010, Mariano Alvira and other contributors + * to the MC1322x project (http://mc1322x.devl.org) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This file is part of libmc1322x: see http://mc1322x.devl.org + * for details. + * + * + */ + +#include +#include +#include + +#include "config.h" +#include "adc.h" + +int main(void) +{ + uint8_t c; + + trim_xtal(); + uart1_init(INC,MOD,SAMP); + adc_init(); + + printf("adc test\r\n"); + + printf("\x1B[2J"); // clear screen + + for(;;) { + printf("\x1B[H"); // cursor home + printf("# Value\r\n"); + for (c=0; c and other contributors + * to the MC1322x project (http://mc1322x.devl.org) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This file is part of libmc1322x: see http://mc1322x.devl.org + * for details. + * + * + */ + +#include +#include +#include + +#include "tests.h" +#include "config.h" + +void asm_isr(void) { + printf("asm isr\n\r"); + ASM->CONTROL0bits.CLEAR_IRQ = 1; +} + + +void main(void) { + volatile int i; + + /* trim the reference osc. to 24MHz */ + trim_xtal(); + + uart_init(INC, MOD, SAMP); + + vreg_init(); + + enable_irq(ASM); + + print_welcome("asm"); + + printf("ASM Control 0: %08x\n\r", (unsigned int)ASM->CONTROL0); + printf("ASM Control 1: %08x\n\r", (unsigned int)ASM->CONTROL1); + printf("ASM Status: %08x\n\r", (unsigned int)ASM->STATUS); + printf("ASM Test pass: %d\n\r", ASM->STATUSbits.TEST_PASS); + + /* ASM module is disabled until self-test passes */ + printf("\n\r*** ASM self-test ***\n\r"); + + ASM->CONTROL1bits.ON = 1; + ASM->CONTROL1bits.SELF_TEST = 1; + ASM->CONTROL0bits.START = 1; + + /* Self test takes 3330 periph. clocks (default 24Mhz) */ + /* to complete. This doesn't wait 3330 exactly, but should be long enough */ + + for(i = 0; i < 3330; i++) { continue; } + + printf("ASM Test pass: %d\n\r", ASM->STATUSbits.TEST_PASS); + + /* must clear the self test bit when done */ + ASM->CONTROL1bits.SELF_TEST = 0; + + + /* ASM starts in "BOOT" mode which uses an internal secret key + * to load encrypted data from an external source */ + /* must set to NORMAL mode */ + ASM->CONTROL1bits.NORMAL_MODE = 1; + + /* setting the bypass bit will disable the encryption */ + /* bypass defaults to off */ + ASM->CONTROL1bits.BYPASS = 0; + + printf("\n\r*** set ASM key ***\n\r"); + ASM->KEY0 = 0xccddeeff; + ASM->KEY1 = 0x8899aabb; + ASM->KEY2 = 0x44556677; + ASM->KEY3 = 0x00112233; + + /* KEY registers appear to be write-only (which is a good thing) */ + /* even though the datasheet says you can read them */ + printf("ASM Key [3,2,1,0] : 0x%08x%08x%08x%08x\n", + (unsigned int) ASM->KEY3, + (unsigned int) ASM->KEY2, + (unsigned int) ASM->KEY1, + (unsigned int) ASM->KEY0); + + printf("\n\r*** CTR test ***\n\r"); + printf("Encrypt\n\r"); + ASM->CONTROL1bits.CTR = 1; + + ASM->DATA0 = 0xdeaddead; + ASM->DATA1 = 0xbeefbeef; + ASM->DATA2 = 0xfaceface; + ASM->DATA3 = 0x01234567; + + printf("ASM Data [3,2,1,0] : 0x%08x%08x%08x%08x\n", + (unsigned int) ASM->DATA3, + (unsigned int) ASM->DATA2, + (unsigned int) ASM->DATA1, + (unsigned int) ASM->DATA0); + + ASM->CTR0 = 0x33333333; + ASM->CTR1 = 0x22222222; + ASM->CTR2 = 0x11111111; + ASM->CTR3 = 0x00000000; + + printf("ASM CTR [3,2,1,0] : 0x%08x%08x%08x%08x\n", + (unsigned int) ASM->CTR3, + (unsigned int) ASM->CTR2, + (unsigned int) ASM->CTR1, + (unsigned int) ASM->CTR0); + + ASM->CONTROL0bits.START = 1; + while(ASM->STATUSbits.DONE == 0) { continue; } + + printf("ASM CTR RESULT [3,2,1,0]: 0x%08x%08x%08x%08x\n", + (unsigned int) ASM->CTR3_RESULT, + (unsigned int) ASM->CTR2_RESULT, + (unsigned int) ASM->CTR1_RESULT, + (unsigned int) ASM->CTR0_RESULT); + + printf("Decrypt\n\r"); + + ASM->DATA0 = ASM->CTR0_RESULT; + ASM->DATA1 = ASM->CTR1_RESULT; + ASM->DATA2 = ASM->CTR2_RESULT; + ASM->DATA3 = ASM->CTR3_RESULT; + + ASM->CONTROL0bits.START = 1; + while(ASM->STATUSbits.DONE == 0) { continue; } + + printf("ASM CTR RESULT [3,2,1,0]: 0x%08x%08x%08x%08x\n", + (unsigned int) ASM->CTR3_RESULT, + (unsigned int) ASM->CTR2_RESULT, + (unsigned int) ASM->CTR1_RESULT, + (unsigned int) ASM->CTR0_RESULT); + + printf("\n\r*** CBC MAC generation ***\n\r"); + + ASM->CONTROL1bits.CTR = 0; + ASM->CONTROL1bits.CBC = 1; + + /* CBC is like a hash */ + /* it doesn't use the CTR data */ + /* the accumulated MAC is in the MAC registers */ + /* you must use the CLEAR bit to reset the MAC state */ + + ASM->DATA0 = 0xdeaddead; + ASM->DATA1 = 0xbeefbeef; + ASM->DATA2 = 0xfaceface; + ASM->DATA3 = 0x01234567; + + ASM->CONTROL0bits.CLEAR = 1; + + ASM->CONTROL0bits.START = 1; + while(ASM->STATUSbits.DONE == 0) { continue; } + + printf("ASM CBC RESULT [3,2,1,0]: 0x%08x%08x%08x%08x\n", + (unsigned int) ASM->CBC3_RESULT, + (unsigned int) ASM->CBC2_RESULT, + (unsigned int) ASM->CBC1_RESULT, + (unsigned int) ASM->CBC0_RESULT); + + printf("\n\r*** CCM (CTR+CBC) ***\n\r"); + + ASM->CONTROL1bits.CTR = 1; + ASM->CONTROL1bits.CBC = 1; + ASM->CONTROL0bits.CLEAR = 1; + + ASM->CONTROL0bits.START = 1; + while(ASM->STATUSbits.DONE == 0) { continue; } + + printf("ASM CTR RESULT [3,2,1,0]: 0x%08x%08x%08x%08x\n", + (unsigned int) ASM->CTR3_RESULT, + (unsigned int) ASM->CTR2_RESULT, + (unsigned int) ASM->CTR1_RESULT, + (unsigned int) ASM->CTR0_RESULT); + + printf("ASM CBC RESULT [3,2,1,0]: 0x%08x%08x%08x%08x\n", + (unsigned int) ASM->CBC3_RESULT, + (unsigned int) ASM->CBC2_RESULT, + (unsigned int) ASM->CBC1_RESULT, + (unsigned int) ASM->CBC0_RESULT); + + while(1) { + } +} diff --git a/cpu/mc1322x/tests/pwm.c b/cpu/mc1322x/tests/pwm.c new file mode 100644 index 000000000..324913d54 --- /dev/null +++ b/cpu/mc1322x/tests/pwm.c @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2010, Mariano Alvira and other contributors + * to the MC1322x project (http://mc1322x.devl.org) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This file is part of libmc1322x: see http://mc1322x.devl.org + * for details. + * + * + */ + +#include +#include +#include + +#include "config.h" +#include "pwm.h" +#include "rtc.h" + +int main(void) +{ + int x = 32768; + + trim_xtal(); + uart1_init(INC,MOD,SAMP); + rtc_init(); + + printf("pwm test\r\n"); + pwm_init_stopped(TMR0, 12000000, x); + pwm_init_stopped(TMR1, 12000000, x); + TMR0->ENBL |= TMR_ENABLE_BIT(TMR0) | TMR_ENABLE_BIT(TMR1); + + for(;;) { + printf("duty %d = %d%%\r\n", x, ((x * 100 + 32768) / 65536)); + switch(uart1_getc()) { + case '[': x -= 1; break; + case ']': x += 1; break; + case '-': x -= 32; break; + case '=': x += 32; break; + case '_': x -= 512; break; + case '+': x += 512; break; + + case '`': x = 65535 * 0/10; break; + case '1': x = 65535 * 1/10; break; + case '2': x = 65535 * 2/10; break; + case '3': x = 65535 * 3/10; break; + case '4': x = 65535 * 4/10; break; + case '5': x = 65535 * 5/10; break; + case '6': x = 65535 * 6/10; break; + case '7': x = 65535 * 7/10; break; + case '8': x = 65535 * 8/10; break; + case '9': x = 65535 * 9/10; break; + case '0': x = 65535 * 10/10; break; + + } + x &= 65535; + pwm_duty(TMR0, x); + } +} + + diff --git a/cpu/mc1322x/tests/wdt.c b/cpu/mc1322x/tests/wdt.c new file mode 100644 index 000000000..d1281959a --- /dev/null +++ b/cpu/mc1322x/tests/wdt.c @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2010, Mariano Alvira and other contributors + * to the MC1322x project (http://mc1322x.devl.org) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This file is part of libmc1322x: see http://mc1322x.devl.org + * for details. + * + * + */ + +#include +#include +#include + +#include "config.h" + +#define DELAY 400000 + +#define LED GPIO_LED_RED + +void main(void) { + volatile uint32_t i; + + uart1_init(INC,MOD,SAMP); + + printf("reset\n\r"); + + /* set the watchdog timer timeout to 1 sec */ + cop_timeout_ms(1000); + + /* enable the watchdog timer */ + CRM->COP_CNTLbits.COP_EN = 1; + + GPIO->PAD_DIR.LED = 1; + + while(1) { + /* uncomment cop_service for normal operation */ + //cop_service(); + + GPIO->DATA.LED = 1; + + for(i=0; iDATA.LED = 0; + + for(i=0; i \$iab, + 'oui=s' => \$oui, + ) or die 'bad options'; + +my $address = shift; +my $infile = shift; +my $outfile = shift; + +if (!defined($address) || !defined($infile)) { + print "Usage: $0 [--iab=a8c | --oui=abcdef ] address infile [outfile]\n"; + print " iab is 12-bit and address is 28-bit e.g. --iab=a8c 1234567\n"; + print " oui is 24-bit and address is 40-bit e.g. --oui=abcdef 123456789a\n"; + print "\n"; + print " if outfile is not specified, for infile foo.bin outfile will be\n"; + print " foo-[macaddress].bin e.g:\n"; + print " for --iab=a8c 1234567 foo.bin -> foo-0050c2a8c1234567.bin\n"; + print " for --oui=abcdef 123456789a foo.bin -> foo-abcdef123456789a.bin\n"; + exit; +} + +my $mac_h; +my $mac_l; + +if(defined($iab)) { + $iab = hex($iab); + $address = hex($address); + $mac_h = 0x0050C200 | ($iab >> 4); + $mac_l = (($iab & 0xf) << 28) | $address; +} else { + $address =~ /(.*?)(.{0,8})$/; + my ($addr_h, $addr_l) = ($1, $2); + if(!$addr_h) { $addr_h = 0 }; + $oui = hex($oui); + $addr_l = hex($addr_l); + $addr_h = hex($addr_h); + $mac_h = ($oui << 8) | $addr_h; + $mac_l = $addr_l; +} + +printf("mach %x macl %x\n", $mac_h, $mac_l); + +my @words; +for(my $i=0; $i<4; $i++) { + push @words, ($mac_l >> ($i * 8)) & 0xff; +} +for(my $i=0; $i<4; $i++) { + push @words, ($mac_h >> ($i * 8)) & 0xff; +} +reverse @words; +#foreach my $byte (@words) { +# printf("%02X",$byte); +#} +#print "\n"; + +if(!defined($outfile)) +{ + my $basename = basename($infile,(".bin")); + $outfile = sprintf("-%08x%08x.bin",$mac_h, $mac_l); + $outfile = $basename . $outfile; + print "outfile $outfile\n"; +} + +copy($infile, $outfile) or die("Couldn't copy $infile to $outfile"); +$cmd = sprintf("echo -n -e '\\x%02X\\x%02X\\x%02X\\x%02X\\x%02X\\x%02X\\x%02X\\x%02X' | dd of=$outfile bs=1 seek=122872 conv=notrunc", + $words[7],$words[6],$words[5],$words[4], + $words[3],$words[2],$words[1],$words[0]); + +print "$cmd\n"; +system("bash -c \"$cmd\""); + + diff --git a/cpu/mc1322x/tools/burn-mac.pl b/cpu/mc1322x/tools/burn-mac.pl new file mode 100755 index 000000000..6ea201309 --- /dev/null +++ b/cpu/mc1322x/tools/burn-mac.pl @@ -0,0 +1,65 @@ +#!/usr/bin/perl +use strict; +use Getopt::Long; + +my $oui; +my $addr = "0x1e000"; +my $iab; +my $term = "/dev/ttyUSB1"; + +GetOptions ('iab=s' => \$iab, + 'oui=s' => \$oui, + 'term=s' => \$term, + ) or die 'bad options'; + +my $bin = shift; +my $address = shift; + +if (!defined($address) || !defined($bin)) { + print "Usage: $0 [--iab=a8c | --oui=abcdef | --term device] flasher.bin address\n"; + print " iab is 12-bit and address is 28-bit e.g. --iab=a8c 1234567\n"; + print " oui is 24-bit and address is 40-bit e.g. --oui=abcdef 123456789a\n"; + exit; +} + +my $mac_h; +my $mac_l; + +if(defined($iab)) { + $iab = hex($iab); + $address = hex($address); + $mac_h = 0x0050C200 | ($iab >> 4); + $mac_l = (($iab & 0xf) << 28) | $address; +} else { + $address =~ /(.*?)(.{0,8})$/; + my ($addr_h, $addr_l) = ($1, $2); + if(!$addr_h) { $addr_h = 0 }; + $oui = hex($oui); + $addr_l = hex($addr_l); + $addr_h = hex($addr_h); + $mac_h = ($oui << 8) | $addr_h; + $mac_l = $addr_l; +} + +printf("mach %x macl %x\n", $mac_h, $mac_l); + +my @words; +for(my $i=0; $i<4; $i++) { + push @words, ($mac_l >> ($i * 8)) & 0xff; +} +for(my $i=0; $i<4; $i++) { + push @words, ($mac_h >> ($i * 8)) & 0xff; +} +reverse @words; +#foreach my $byte (@words) { +# printf("%02X",$byte); +#} +#print "\n"; + +my $word1 = sprintf("%02X%02X%02X%02X",$words[4],$words[5],$words[6],$words[7]); +my $word2 = sprintf("%02X%02X%02X%02X",$words[0],$words[1],$words[2],$words[3]); + +my $cmd = "mc1322x-load.pl -e -f $bin -z -t $term -c 'bbmc -l redbee-econotag reset' $addr,0x$word1,0x$word2 &"; +print "$cmd\n"; +system($cmd); + diff --git a/cpu/mc1322x/tools/mc1322x-load.pl b/cpu/mc1322x/tools/mc1322x-load.pl index df3c2b22e..40a171b9a 100755 --- a/cpu/mc1322x/tools/mc1322x-load.pl +++ b/cpu/mc1322x/tools/mc1322x-load.pl @@ -24,7 +24,7 @@ GetOptions ('file=s' => \$filename, 'zerolen' => \$zerolen, 'terminal=s' => \$term, 'verbose' => \$verbose, - 'baud=s' => \$baud, + 'u|baud=s' => \$baud, 'rts=s' => \$rts, 'command=s' => \$command, 'a=s' => \$first_delay, @@ -41,8 +41,8 @@ if($filename eq '') { print " -f required: binary file to load\n"; print " -s optional: secondary binary file to send\n"; print " -z optional: send a zero length file as secondary\n"; - print " -t terminal default: /dev/ttyUSB0\n"; - print " -b baud rate default: 115200\n"; + print " -t, terminal default: /dev/ttyUSB0\n"; + print " -u, --baud baud rate default: 115200\n"; print " -r [none|rts] flow control default: rts\n"; print " -c command to run for autoreset: \n"; print " e.g. -c 'bbmc -l redbee-econotag -i 0 reset'\n"; diff --git a/cpu/mc1322x/tools/test-grid/burn-macs.pl b/cpu/mc1322x/tools/test-grid/burn-macs.pl index 8434f2fb4..311bac768 100755 --- a/cpu/mc1322x/tools/test-grid/burn-macs.pl +++ b/cpu/mc1322x/tools/test-grid/burn-macs.pl @@ -5,11 +5,14 @@ my $bin = shift; my $terms = shift; my $addr = "0x1e000"; -my $company_id; -my $iab = 0xabc; # Redwire, LLC's IAB +my $iab = 0xa8c; # Redwire, LLC's IAB + +my $mac_h; +my $mac_l; if(defined($iab)) { - $company_id = (0x0050C2 << 12) | $iab; + $mac_h = 0x0050C200 | ($iab >> 4); + $mac_l = ($iab & 0xf) << 28; } if (! $terms) { @@ -19,15 +22,17 @@ if (! $terms) { for (my $t=0; $t<$terms; $t++) { my $dev_num = 2 * $t + 1; + $mac_l |= $dev_num; + #stupid 32-bit thing... my $mac; - if(defined($iab)) { - $mac = ($company_id << 28) | $dev_num; - } else { - $mac = ($company_id << 40) | $dev_num; - } + printf("mac_h %x\n", $mac_h); + printf("mac_l %x\n", $mac_l); my @words; - for(my $i=0; $i<8; $i++) { - push @words, ($mac >> ($i * 8)) & 0xff; + for(my $i=0; $i<4; $i++) { + push @words, ($mac_h >> ($i * 8)) & 0xff; + } + for(my $i=0; $i<4; $i++) { + push @words, ($mac_l >> ($i * 8)) & 0xff; } reverse @words; foreach my $byte (@words) { diff --git a/cpu/msp430/loader-arch.c b/cpu/msp430/loader-arch.c index 224d8d28b..b05166101 100644 --- a/cpu/msp430/loader-arch.c +++ b/cpu/msp430/loader-arch.c @@ -111,7 +111,7 @@ loader_arch_load(unsigned short startaddr) /* If the checksum was wrong, we beep. The number of beeps indicate the numerival value of the calculated checksum. */ if(sum != 0xff) { - leds_red(LEDS_ON); + leds_on(LEDS_RED); for(i = 0; i < (sum >> 4); ++i) { beep_beep(200); @@ -131,23 +131,23 @@ loader_arch_load(unsigned short startaddr) } } - leds_red(LEDS_OFF); + leds_off(LEDS_RED); return; } else { - leds_green(LEDS_ON); + leds_on(LEDS_GREEN); for(i = 0; i < 4; ++i) { beep_beep(200); for(j = 0; j < 2; ++j) { clock_delay(60000); } } - leds_green(LEDS_OFF); + leds_off(LEDS_GREEN); } - leds_yellow(LEDS_ON); + leds_on(LEDS_YELLOW); startaddr += 2; /* Read the size of the code segment from the next two bytes in EEPROM. */ @@ -185,9 +185,9 @@ loader_arch_load(unsigned short startaddr) flash_done(); - leds_yellow(LEDS_OFF); + leds_off(LEDS_YELLOW); - leds_green(LEDS_ON); + leds_on(LEDS_GREEN); /* Read the size of the code segment from the first two bytes in EEPROM. */ eeprom_read(startaddr + 2 + codelen, (char *)&datalen, 2); @@ -205,7 +205,7 @@ loader_arch_load(unsigned short startaddr) clock_delay(20000); } - leds_green(LEDS_OFF); + leds_off(LEDS_GREEN); /* Execute the loaded program. */ init = ((void (*)(void *))FLASHADDR); diff --git a/cpu/stm32w108/Makefile.stm32w108 b/cpu/stm32w108/Makefile.stm32w108 index 56fd72891..247b00595 100644 --- a/cpu/stm32w108/Makefile.stm32w108 +++ b/cpu/stm32w108/Makefile.stm32w108 @@ -45,9 +45,9 @@ ifdef IAR TARGET_LIBFILES = $(CONTIKI_CPU)/simplemac/library/simplemac-library.a else ifdef PRINTF_FLOAT - TARGET_LIBFILES = $(CONTIKI_CPU)/simplemac/library/simplemac-library.a $(CONTIKI_CPU)/hal/micro/cortexm3/e_stdio_thumb2.a + TARGET_LIBFILES = $(CONTIKI_CPU)/simplemac/library/simplemac-library-gnu.a $(CONTIKI_CPU)/hal/micro/cortexm3/e_stdio_thumb2.a else - TARGET_LIBFILES = $(CONTIKI_CPU)/simplemac/library/simplemac-library.a $(CONTIKI_CPU)/hal/micro/cortexm3/e_stdio_intonly_thumb2.a + TARGET_LIBFILES = $(CONTIKI_CPU)/simplemac/library/simplemac-library-gnu.a $(CONTIKI_CPU)/lib/e_stdio_intonly_thumb2.a endif endif # `$(CC) -print-file-name=thumb2/libc.a` `$(CC) -print-file-name=thumb2/libgcc.a` @@ -74,7 +74,7 @@ AROPTS = --create ASFLAGS = -s+ -w+ --cpu Cortex-M3 -L$(OBJECTDIR) LDFLAGS += --redirect _Printf=_PrintfSmall --redirect _Scanf=_ScanfSmall --map=contiki-$(TARGET).map ifndef COFFEE - LDFLAGS+= --config $(CONTIKI_CPU)/hal/micro/cortexm3/stm32w108/iar-cfg.icf + LDFLAGS+= --config $(CONTIKI_CPU)/iar-cfg.icf endif OBJOPTS = --bin @@ -101,7 +101,7 @@ ASFLAGS = -mthumb -mcpu=cortex-m3 -fsigned-char -c -g -Wall -Os -ffunction-secti -mlittle-endian -fshort-enums -x assembler-with-cpp -Wa,-EL LDFLAGS += -mcpu=cortex-m3 \ -mthumb \ - -Wl,-T -Xlinker $(CONTIKI_CPU)/hal/micro/cortexm3/stm32w108/gnu.ld \ + -Wl,-T -Xlinker $(CONTIKI_CPU)/gnu.ld \ -Wl,-static \ -u Default_Handler \ -nostartfiles \ @@ -118,8 +118,6 @@ OBJOPTS = -O binary endif -ifndef IAR - ifdef COFFEE_ADDRESS COFFEE = 1 endif @@ -147,15 +145,18 @@ ifeq ($(COFFEE),1) else # Coffee starts at the end of the flash, before NVM section. - COFFEE_ADDRESS = 0x801F400 + COFFEE_ADDRESS = 0x801F800 endif + +ifndef IAR + LDFLAGS+= -Wl,--section-start=.coffee=$(COFFEE_ADDRESS) else #IAR ifeq ($(COFFEE),1) - LDFLAGS+= --config $(CONTIKI_CPU)/hal/micro/cortexm3/stm32w108/iar-cfg-coffee.icf + LDFLAGS+= --config $(CONTIKI_CPU)/iar-cfg-coffee.icf endif endif diff --git a/cpu/stm32w108/cfs-coffee-arch.h b/cpu/stm32w108/cfs-coffee-arch.h index 51cba54cd..e529b0123 100644 --- a/cpu/stm32w108/cfs-coffee-arch.h +++ b/cpu/stm32w108/cfs-coffee-arch.h @@ -67,7 +67,7 @@ /* If using IAR, COFFEE_ADDRESS reflects the static value in the linker script iar-cfg-coffee.icf, so it can't be passed as a parameter for Make.*/ #ifdef __ICCARM__ -#define COFFEE_ADDRESS 0x8010000 +#define COFFEE_ADDRESS 0x8010c00 #endif #if (COFFEE_ADDRESS & 0x3FF) !=0 #error "COFFEE_ADDRESS not aligned to a 1024-bytes page boundary." @@ -96,9 +96,10 @@ #define COFFEE_LOG_SIZE 128 // COFFEE_MICRO_LOGS is 0. -#if COFFEE_PAGES <= 0x100 -#define coffee_page_t uint8_t -#elif COFFEE_PAGES <= 0x10000 +#if COFFEE_PAGES <= 127 +#define coffee_page_t int8_t +#elif COFFEE_PAGES <= 0x7FFF +#define coffee_page_t int16_t #endif diff --git a/cpu/stm32w108/dev/stm32w_conf.h b/cpu/stm32w108/dev/stm32w_conf.h index c7b64e64c..84aa3d6ec 100644 --- a/cpu/stm32w108/dev/stm32w_conf.h +++ b/cpu/stm32w108/dev/stm32w_conf.h @@ -1,5 +1,5 @@ /******************** (C) COPYRIGHT 2008 STMicroelectronics ******************** -* File Name : stm32f10x_conf.h +* File Name : stm32w_conf.h * Author : MCD Application Team * Version : V2.0.3 * Date : 09/22/2008 @@ -18,7 +18,7 @@ #define __STM32F10x_CONF_H /* Includes ------------------------------------------------------------------*/ -#include "stm32w_type.h" +#include "stm32w108_type.h" /* Exported types ------------------------------------------------------------*/ /* Exported constants --------------------------------------------------------*/ diff --git a/cpu/stm32w108/dev/stm32w_systick.c b/cpu/stm32w108/dev/stm32w_systick.c index 11c3a2f6a..de34f8c44 100644 --- a/cpu/stm32w108/dev/stm32w_systick.c +++ b/cpu/stm32w108/dev/stm32w_systick.c @@ -1,5 +1,5 @@ /******************** (C) COPYRIGHT 2008 STMicroelectronics ******************** -* File Name : stm32f10x_systick.c +* File Name : stm32w108_systick.c * Author : MCD Application Team * Version : V2.0.3 * Date : 09/22/2008 diff --git a/cpu/stm32w108/dev/stm32w_systick.h b/cpu/stm32w108/dev/stm32w_systick.h index c9ca99176..415be6429 100644 --- a/cpu/stm32w108/dev/stm32w_systick.h +++ b/cpu/stm32w108/dev/stm32w_systick.h @@ -18,7 +18,7 @@ #ifndef __STM32W_SYSTICK_H #define __STM32W_SYSTICK_H -#include "stm32w_type.h" +#include "stm32w108_type.h" #include "stm32w_conf.h" #ifndef EXT diff --git a/cpu/stm32w108/dev/stm32w_type.h b/cpu/stm32w108/dev/stm32w_type.h deleted file mode 100644 index e3a5fda06..000000000 --- a/cpu/stm32w108/dev/stm32w_type.h +++ /dev/null @@ -1,80 +0,0 @@ -/******************** (C) COPYRIGHT 2008 STMicroelectronics ******************** -* File Name : stm32f10x_type.h -* Author : MCD Application Team -* Version : V2.0.3 -* Date : 09/22/2008 -* Description : This file contains all the common data types used for the -* STM32F10x firmware library. -******************************************************************************** -* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS -* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME. -* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT, -* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE -* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING -* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. -*******************************************************************************/ - -/* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __STM32F10x_TYPE_H -#define __STM32F10x_TYPE_H - -/* Includes ------------------------------------------------------------------*/ -/* Exported types ------------------------------------------------------------*/ -typedef signed long s32; -typedef signed short s16; -typedef signed char s8; - -typedef signed long const sc32; /* Read Only */ -typedef signed short const sc16; /* Read Only */ -typedef signed char const sc8; /* Read Only */ - -typedef volatile signed long vs32; -typedef volatile signed short vs16; -typedef volatile signed char vs8; - -typedef volatile signed long const vsc32; /* Read Only */ -typedef volatile signed short const vsc16; /* Read Only */ -typedef volatile signed char const vsc8; /* Read Only */ - -typedef unsigned long u32; -typedef unsigned short u16; -typedef unsigned char u8; - -typedef unsigned long const uc32; /* Read Only */ -typedef unsigned short const uc16; /* Read Only */ -typedef unsigned char const uc8; /* Read Only */ - -typedef volatile unsigned long vu32; -typedef volatile unsigned short vu16; -typedef volatile unsigned char vu8; - -typedef volatile unsigned long const vuc32; /* Read Only */ -typedef volatile unsigned short const vuc16; /* Read Only */ -typedef volatile unsigned char const vuc8; /* Read Only */ - -//typedef enum {FALSE = 0, TRUE = !FALSE} bool; - -typedef enum {RESET = 0, SET = !RESET} FlagStatus, ITStatus; - -typedef enum {DISABLE = 0, ENABLE = !DISABLE} FunctionalState; -#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE)) - -typedef enum {ERROR = 0, SUCCESS = !ERROR} ErrorStatus; - -#define U8_MAX ((u8)255) -#define S8_MAX ((s8)127) -#define S8_MIN ((s8)-128) -#define U16_MAX ((u16)65535u) -#define S16_MAX ((s16)32767) -#define S16_MIN ((s16)-32768) -#define U32_MAX ((u32)4294967295uL) -#define S32_MAX ((s32)2147483647) -#define S32_MIN ((s32)-2147483648) - -/* Exported constants --------------------------------------------------------*/ -/* Exported macro ------------------------------------------------------------*/ -/* Exported functions ------------------------------------------------------- */ - -#endif /* __STM32F10x_TYPE_H */ - -/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/ diff --git a/cpu/stm32w108/dev/uart1.h.bak b/cpu/stm32w108/dev/uart1.h.bak new file mode 100644 index 000000000..22f741290 --- /dev/null +++ b/cpu/stm32w108/dev/uart1.h.bak @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2007, Swedish Institute of Computer Science. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This file is part of the Contiki operating system. + * + * $Id: uart1.h,v 1.1 2010/10/25 09:03:39 salvopitru Exp $ + */ + +/** + * \file + * A brief description of what this file is. + * \author + * Adam Dunkels + */ + +#ifndef __UART1_H__ +#define __UART1_H__ + +//#include "msp430.h" +// +//#define UART1_BAUD2UBR(baud) ((MSP430_CPU_SPEED)/(baud)) + +void uart1_set_input(int (*input)(unsigned char c)); +void uart1_writeb(unsigned char c); +void uart1_init(unsigned long ubr); +//uint8_t uart1_active(void); + +#endif /* __UART1_H__ */ diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/Makefile b/cpu/stm32w108/e_stdio/Makefile similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/Makefile rename to cpu/stm32w108/e_stdio/Makefile diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/_SP_printf.c b/cpu/stm32w108/e_stdio/src/_SP_printf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/_SP_printf.c rename to cpu/stm32w108/e_stdio/src/_SP_printf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/_SP_puts.c b/cpu/stm32w108/e_stdio/src/_SP_puts.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/_SP_puts.c rename to cpu/stm32w108/e_stdio/src/_SP_puts.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/_SP_snprintf.c b/cpu/stm32w108/e_stdio/src/_SP_snprintf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/_SP_snprintf.c rename to cpu/stm32w108/e_stdio/src/_SP_snprintf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/_SP_sprintf.c b/cpu/stm32w108/e_stdio/src/_SP_sprintf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/_SP_sprintf.c rename to cpu/stm32w108/e_stdio/src/_SP_sprintf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/_SP_vfprintf.c b/cpu/stm32w108/e_stdio/src/_SP_vfprintf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/_SP_vfprintf.c rename to cpu/stm32w108/e_stdio/src/_SP_vfprintf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/floatio.h b/cpu/stm32w108/e_stdio/src/floatio.h similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/floatio.h rename to cpu/stm32w108/e_stdio/src/floatio.h diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/fvwrite.h b/cpu/stm32w108/e_stdio/src/fvwrite.h similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/fvwrite.h rename to cpu/stm32w108/e_stdio/src/fvwrite.h diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/local.h b/cpu/stm32w108/e_stdio/src/local.h similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/local.h rename to cpu/stm32w108/e_stdio/src/local.h diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/mbctype.h b/cpu/stm32w108/e_stdio/src/mbctype.h similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/mbctype.h rename to cpu/stm32w108/e_stdio/src/mbctype.h diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/scanf.c b/cpu/stm32w108/e_stdio/src/scanf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/scanf.c rename to cpu/stm32w108/e_stdio/src/scanf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_dtoa.c b/cpu/stm32w108/e_stdio/src/small_dtoa.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_dtoa.c rename to cpu/stm32w108/e_stdio/src/small_dtoa.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_mprec.c b/cpu/stm32w108/e_stdio/src/small_mprec.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_mprec.c rename to cpu/stm32w108/e_stdio/src/small_mprec.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_mprec.h b/cpu/stm32w108/e_stdio/src/small_mprec.h similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_mprec.h rename to cpu/stm32w108/e_stdio/src/small_mprec.h diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_strtod.c b/cpu/stm32w108/e_stdio/src/small_strtod.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_strtod.c rename to cpu/stm32w108/e_stdio/src/small_strtod.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_vfsscanf.c b/cpu/stm32w108/e_stdio/src/small_vfsscanf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_vfsscanf.c rename to cpu/stm32w108/e_stdio/src/small_vfsscanf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_wcrtomb.c b/cpu/stm32w108/e_stdio/src/small_wcrtomb.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_wcrtomb.c rename to cpu/stm32w108/e_stdio/src/small_wcrtomb.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_wcsrtombs.c b/cpu/stm32w108/e_stdio/src/small_wcsrtombs.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_wcsrtombs.c rename to cpu/stm32w108/e_stdio/src/small_wcsrtombs.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_wctomb_r.c b/cpu/stm32w108/e_stdio/src/small_wctomb_r.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_wctomb_r.c rename to cpu/stm32w108/e_stdio/src/small_wctomb_r.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/sscanf.c b/cpu/stm32w108/e_stdio/src/sscanf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/sscanf.c rename to cpu/stm32w108/e_stdio/src/sscanf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/swi.h b/cpu/stm32w108/e_stdio/src/swi.h similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/swi.h rename to cpu/stm32w108/e_stdio/src/swi.h diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/syscalls.c b/cpu/stm32w108/e_stdio/src/syscalls.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/syscalls.c rename to cpu/stm32w108/e_stdio/src/syscalls.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/test.c b/cpu/stm32w108/e_stdio/src/test.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/test.c rename to cpu/stm32w108/e_stdio/src/test.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/test_mes.c b/cpu/stm32w108/e_stdio/src/test_mes.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/test_mes.c rename to cpu/stm32w108/e_stdio/src/test_mes.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/test_printf.c b/cpu/stm32w108/e_stdio/src/test_printf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/test_printf.c rename to cpu/stm32w108/e_stdio/src/test_printf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/test_scanf.c b/cpu/stm32w108/e_stdio/src/test_scanf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/test_scanf.c rename to cpu/stm32w108/e_stdio/src/test_scanf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/vfieeefp.h b/cpu/stm32w108/e_stdio/src/vfieeefp.h similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/vfieeefp.h rename to cpu/stm32w108/e_stdio/src/vfieeefp.h diff --git a/cpu/stm32w108/gnu.ld b/cpu/stm32w108/gnu.ld new file mode 100644 index 000000000..58d9df2b8 --- /dev/null +++ b/cpu/stm32w108/gnu.ld @@ -0,0 +1,236 @@ +/*SEARCH_DIR("C:\Program Files\Raisonance\Ride\Lib\ARM") +EXTERN( __io_putchar ) +EXTERN( _write ) +GROUP( +"std_sbrk_thumb.lib" +"smallprintf_thumb.a" +"libc.a" +"libm.a" +) +*/ +/* default stack sizes. + +These are used by the startup in order to allocate stacks for the different modes. +*/ + +__Stack_Size = 0x500 ; + +PROVIDE ( _Stack_Size = __Stack_Size ) ; + +__Stack_Init = 0x20000000; + +_estack = __Stack_Init + __Stack_Size; + + +/*"PROVIDE" allows to easily override these values from an object file or the commmand line.*/ +PROVIDE ( _Stack_Init = __Stack_Init ) ; + +/* +this sends all unreferenced IRQHandlers to a Default_Handler or a reset. +*/ + +PROVIDE(Default_Handler = 0 ); +PROVIDE(NMI_Handler = Default_Handler ); +PROVIDE(HardFault_Handler = Default_Handler ); +PROVIDE(MemManage_Handler = Default_Handler ); +PROVIDE(BusFault_Handler = Default_Handler ); +PROVIDE(UsageFault_Handler = Default_Handler ); +PROVIDE(SVC_Handler = Default_Handler ); +PROVIDE(DebugMonitor_Handler = Default_Handler ); +PROVIDE(PendSV_Handler = Default_Handler ); +PROVIDE(SysTick_Handler = Default_Handler ); +PROVIDE(halTimer1Isr = Default_Handler ); +PROVIDE(halTimer2Isr = Default_Handler ); +PROVIDE(halManagementIsr = Default_Handler ); +PROVIDE(halBaseBandIsr = Default_Handler ); +PROVIDE(halSleepTimerIsr = Default_Handler ); +PROVIDE(halSc1Isr = Default_Handler ); +PROVIDE(halSc2Isr = Default_Handler ); +PROVIDE(halSecurityIsr = Default_Handler ); +PROVIDE(halStackMacTimerIsr = Default_Handler ); +PROVIDE(stmRadioTransmitIsr = Default_Handler ); +PROVIDE(stmRadioReceiveIsr = Default_Handler ); +PROVIDE(halAdcIsr = Default_Handler ); +PROVIDE(halIrqAIsr = Default_Handler ); +PROVIDE(halIrqBIsr = Default_Handler ); +PROVIDE(halIrqCIsr = Default_Handler ); +PROVIDE(halIrqDIsr = Default_Handler ); +PROVIDE(halDebugIsr = Default_Handler ); + +/******************************************************************************/ +/* Peripheral memory map */ +/******************************************************************************/ +/*this allows to compile the ST lib in "non-debug" mode*/ +_BOOTLOADER_SIZE = 0x3000 ; +_ROM_base = DEFINED(ST_BTL) ? (0x08000000 + _BOOTLOADER_SIZE) : 0x08000000 ; +/* include the memory spaces definitions sub-script */ +MEMORY +{ + RAM_region (xrw) : ORIGIN = 0x20000000, LENGTH = 8K + ROM_region (rx) : ORIGIN = 0x08000000, LENGTH = 128K-2K + NVM_region (rx) : ORIGIN = 0x0801F800, LENGTH = 2K + FIB_region (ra) : ORIGIN = 0x08040000, LENGTH = 2K +} + + +/* Sections management for FLASH mode */ + +/* Sections Definitions */ + +SECTIONS +{ + + /* for Cortex devices, the beginning of the startup code is stored in the .isr_vector section, which goes to FLASH */ + + .isr_vector (DEFINED(ST_BTL) ? (0x08000000 + _BOOTLOADER_SIZE) : 0x08000000) : + { + . = ALIGN(4); + __ApplicationFlashStart = . ; + /* . = . + _ROM_base ;*/ + KEEP(*(.isr_vector)) /* Startup code */ + . = ALIGN(4); + } >ROM_region + + /* for some STRx devices, the beginning of the startup code is stored in the .flashtext section, which goes to FLASH */ + .flashtext : + { + . = ALIGN(4); + *(.flashtext) /* Startup code */ + . = ALIGN(4); + } >ROM_region + + /* the program code is stored in the .text section, which goes to Flash */ + .text : + { + . = ALIGN(4); + + *(.text) /* remaining code */ + *(.text.*) /* remaining code */ + *(.rodata) /* read-only data (constants) */ + *(.rodata*) + *(.glue_7) + *(.glue_7t) + . = (DEFINED(ELF_LOADER) ? ALIGN(1024) : .); + *(.elf_text) + . = (DEFINED(ELF_LOADER) ? ALIGN(1024) : .); + + . = ALIGN(4); + _etext = .; + /* This is used by the startup in order to initialize the .data section */ + _sidata = _etext; + } >ROM_region + + /* Section start can be overridden via command line. */ + .coffee 0x08010c0 : + { + _coffee_start = ABSOLUTE(.); + . = ALIGN(1024); + *(.coffeefiles) + . = ORIGIN(NVM_region) - _coffee_start; + } > ROM_region = 0x00 + + + NVM (NOLOAD): + { + . = ALIGN(1024); + KEEP(*(NVM)) + . = ALIGN(4); + } > NVM_region + + + FAT (NOLOAD) : + { + . = ALIGN(4); + KEEP(*(FAT)) + . = ALIGN(4); + } > FIB_region + + /* after that it's only debugging information. */ + + + /* This is the initialized data section + The program executes knowing that the data is in the RAM + but the loader puts the initial values in the FLASH (inidata). + It is one task of the startup to copy the initial values from FLASH to RAM. */ + .data _estack : AT ( _sidata ) + { + . = ALIGN(4); + /* This is used by the startup in order to initialize the .data section */ + _sdata = . ; + + *(.data) + *(.data.*) + + . = ALIGN(4); + /* This is used by the startup in order to initialize the .data secion */ + _edata = . ; + ASSERT(_sidata + SIZEOF(.data) < LOADADDR(.coffee), ".data section overflow in ROM"); + } >RAM_region + + + /* This is the uninitialized data section */ + .bss : + { + . = ALIGN(4); + /* This is used by the startup in order to initialize the .bss secion */ + _sbss = .; + + *(.bss) + *(.bss.*) + *(COMMON) + + . = ALIGN(4); + /* This is used by the startup in order to initialize the .bss secion */ + _ebss = . ; + } >RAM_region + + PROVIDE ( end = _ebss ); + PROVIDE ( _end = _ebss ); + + __exidx_start = .; + __exidx_end = .; + + /* remove the debugging information from the standard libraries */ + /DISCARD/ : + { + libc.a ( * ) + libm.a ( * ) + libgcc.a ( * ) + } + + /* Stabs debugging sections. */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + .stab.excl 0 : { *(.stab.excl) } + .stab.exclstr 0 : { *(.stab.exclstr) } + .stab.index 0 : { *(.stab.index) } + .stab.indexstr 0 : { *(.stab.indexstr) } + .comment 0 : { *(.comment) } + /* DWARF debug sections. + Symbols in the DWARF debugging sections are relative to the beginning + of the section so we begin them at 0. */ + /* DWARF 1 */ + .debug 0 : { *(.debug) } + .line 0 : { *(.line) } + /* GNU DWARF 1 extensions */ + .debug_srcinfo 0 : { *(.debug_srcinfo) } + .debug_sfnames 0 : { *(.debug_sfnames) } + /* DWARF 1.1 and DWARF 2 */ + .debug_aranges 0 : { *(.debug_aranges) } + .debug_pubnames 0 : { *(.debug_pubnames) } + /* DWARF 2 */ + .debug_info 0 : { *(.debug_info .gnu.linkonce.wi.*) } + .debug_abbrev 0 : { *(.debug_abbrev) } + .debug_line 0 : { *(.debug_line) } + .debug_frame 0 : { *(.debug_frame) } + .debug_str 0 : { *(.debug_str) } + .debug_loc 0 : { *(.debug_loc) } + .debug_macinfo 0 : { *(.debug_macinfo) } + /* SGI/MIPS DWARF 2 extensions */ + .debug_weaknames 0 : { *(.debug_weaknames) } + .debug_funcnames 0 : { *(.debug_funcnames) } + .debug_typenames 0 : { *(.debug_typenames) } + .debug_varnames 0 : { *(.debug_varnames) } +} + +__ApplicationFlashEnd = _sidata + (_edata - _sdata); diff --git a/cpu/stm32w108/hal/doxygen/Doxygen_Release b/cpu/stm32w108/hal/doxygen/Doxygen_Release deleted file mode 100644 index bd72919f3..000000000 --- a/cpu/stm32w108/hal/doxygen/Doxygen_Release +++ /dev/null @@ -1,1557 +0,0 @@ -# Doxyfile 1.6.1 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project -# -# All text after a hash (#) is considered a comment and will be ignored -# The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all -# text before the first occurrence of this tag. Doxygen uses libiconv (or the -# iconv built into libc) for the transcoding. See -# http://www.gnu.org/software/libiconv for the list of possible encodings. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. - -PROJECT_NAME = "Hardware Abstraction Layer" - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. - -PROJECT_NUMBER = 1.0.0 - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. - -OUTPUT_DIRECTORY = . - -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would -# otherwise cause performance problems for the file system. - -CREATE_SUBDIRS = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, -# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English -# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, -# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, -# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. - -OUTPUT_LANGUAGE = English - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" -# "represents" "a" "an" "the" - -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief -# description. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. - -FULL_PATH_NAMES = NO - -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. - -STRIP_FROM_PATH = /Users/dimitri/doxygen/mail/1.5.7/doxywizard/ - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that -# are normally passed to the compiler using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems -# doesn't support long names like on DOS, Mac, or CD-ROM. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments -# (thus requiring an explicit @brief command for a brief description.) - -JAVADOC_AUTOBRIEF = NO - -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring -# an explicit \brief command for a brief description.) - -QT_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# re-implements. - -INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will -# be part of the file/class/namespace that contains it. - -SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. - -TAB_SIZE = 8 - -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. - -ALIASES = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for -# Java. For instance, namespaces will be presented as packages, qualified -# scopes will look different, etc. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources only. Doxygen will then generate output that is more tailored for -# Fortran. - -OPTIMIZE_FOR_FORTRAN = NO - -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for -# VHDL. - -OPTIMIZE_OUTPUT_VHDL = NO - -# Doxygen selects the parser to use depending on the extension of the files it parses. -# With this tag you can assign which parser to use for a given extension. -# Doxygen has a built-in mapping, but you can override or extend it using this tag. -# The format is ext=language, where ext is a file extension, and language is one of -# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, -# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat -# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), -# use: inc=Fortran f=C. Note that for custom extensions you also need to set -# FILE_PATTERNS otherwise the files are not read by doxygen. - -EXTENSION_MAPPING = - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration -# diagrams that involve STL classes more complete and accurate. - -BUILTIN_STL_SUPPORT = NO - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. - -CPP_CLI_SUPPORT = NO - -# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. -# Doxygen will parse them like normal C++ but will assume all classes use public -# instead of private inheritance when no explicit protection keyword is present. - -SIP_SUPPORT = NO - -# For Microsoft's IDL there are propget and propput attributes to indicate getter -# and setter methods for a property. Setting this option to YES (the default) -# will make doxygen to replace the get and set methods by a property in the -# documentation. This will only work if the methods are indeed getting or -# setting a simple type. If this is not the case, or you want to show the -# methods anyway, you should set this option to NO. - -IDL_PROPERTY_SUPPORT = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. - -DISTRIBUTE_GROUP_DOC = NO - -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. - -SUBGROUPING = YES - -# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum -# is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically -# be useful for C code in case the coding convention dictates that all compound -# types are typedef'ed and only the typedef is referenced, never the tag name. - -TYPEDEF_HIDES_STRUCT = NO - -# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to -# determine which symbols to keep in memory and which to flush to disk. -# When the cache is full, less often used symbols will be written to disk. -# For small to medium size projects (<1000 input files) the default value is -# probably good enough. For larger projects a too small cache size can cause -# doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penality. -# If the system has enough physical memory increasing the cache will improve the -# performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the -# memory usage. The cache size is given by this formula: -# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, -# corresponding to a cache size of 2^16 = 65536 symbols - -SYMBOL_CACHE_SIZE = 0 - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES - -EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - -EXTRACT_PRIVATE = NO - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - -EXTRACT_STATIC = NO - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. - -EXTRACT_LOCAL_METHODS = NO - -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base -# name of the file that contains the anonymous namespace. By default -# anonymous namespace are hidden. - -EXTRACT_ANON_NSPACES = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. - -CASE_SENSE_NAMES = NO - -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. - -HIDE_SCOPE_NAMES = NO - -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. - -SHOW_INCLUDE_FILES = YES - -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. - -SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in -# declaration order. - -SORT_BRIEF_DOCS = NO - -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen -# will sort the (brief and detailed) documentation of class members so that -# constructors and destructors are listed first. If set to NO (the default) -# the constructors will appear in the respective orders defined by -# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. -# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO -# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. - -SORT_MEMBERS_CTORS_1ST = NO - -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the -# hierarchy of group names into alphabetical order. If set to NO (the default) -# the group names will appear in their defined order. - -SORT_GROUP_NAMES = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the -# alphabetical list. - -SORT_BY_SCOPE_NAME = NO - -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the -# list will mention the files that were used to generate the documentation. - -SHOW_USED_FILES = YES - -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. The default is NO. - -SHOW_DIRECTORIES = NO - -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. -# This will remove the Files entry from the Quick Index and from the -# Folder Tree View (if specified). The default is YES. - -SHOW_FILES = YES - -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the -# Namespaces page. This will remove the Namespaces entry from the Quick Index -# and from the Folder Tree View (if specified). The default is YES. - -SHOW_NAMESPACES = YES - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output -# is used as the file version. See the manual for examples. - -FILE_VERSION_FILTER = - -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by -# doxygen. The layout file controls the global structure of the generated output files -# in an output format independent way. The create the layout file that represents -# doxygen's defaults, run doxygen with the -l option. You can optionally specify a -# file name after the option, if omitted DoxygenLayout.xml will be used as the name -# of the layout file. - -LAYOUT_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. - -WARNINGS = YES - -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. - -WARN_IF_UNDOCUMENTED = YES - -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. - -WARN_IF_DOC_ERROR = YES - -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of -# documentation. - -WARN_NO_PARAMDOC = NO - -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could -# be obtained via FILE_VERSION_FILTER) - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. - -INPUT = ../ - -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -# also the default input encoding. Doxygen uses libiconv (or the iconv built -# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for -# the list of possible encodings. - -INPUT_ENCODING = UTF-8 - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 - -FILE_PATTERNS = *.c \ - *.cc \ - *.cxx \ - *.cpp \ - *.c++ \ - *.d \ - *.java \ - *.ii \ - *.ixx \ - *.ipp \ - *.i++ \ - *.inl \ - *.h \ - *.hh \ - *.hxx \ - *.hpp \ - *.h++ \ - *.idl \ - *.odl \ - *.cs \ - *.php \ - *.php3 \ - *.inc \ - *.m \ - *.mm \ - *.dox \ - *.py \ - *.f90 \ - *.f \ - *.vhd \ - *.vhdl - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. - -RECURSIVE = YES - -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. - -EXCLUDE = - -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded -# from the input. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories -# for example use the pattern */test/* - -EXCLUDE_PATTERNS = */hal_test/* - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test - -EXCLUDE_SYMBOLS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. - -EXAMPLE_PATTERNS = * - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be -# ignored. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER -# is applied to all files. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). - -FILTER_SOURCE_FILES = NO - -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. - -SOURCE_BROWSER = YES - -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES -# then for each documented function all documented -# functions referencing it will be listed. - -REFERENCED_BY_RELATION = NO - -# If the REFERENCES_RELATION tag is set to YES -# then for each documented function all documented entities -# called/used by that function will be listed. - -REFERENCES_RELATION = NO - -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. Otherwise they will link to the documentation. - -REFERENCES_LINK_SOURCE = YES - -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You -# will need version 4.8.6 or higher. - -USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. - -VERBATIM_HEADERS = YES - -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. - -ALPHABETICAL_INDEX = NO - -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. - -HTML_HEADER = STHeaderHTML.html - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. - -HTML_FOOTER = STFooterHTML.html - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own -# stylesheet in the HTML output directory as well, or it will be erased! - -HTML_STYLESHEET = - -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. For this to work a browser that supports -# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox -# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). - -HTML_DYNAMIC_SECTIONS = NO - -# If the GENERATE_DOCSET tag is set to YES, additional index files -# will be generated that can be used as input for Apple's Xcode 3 -# integrated development environment, introduced with OSX 10.5 (Leopard). -# To create a documentation set, doxygen will generate a Makefile in the -# HTML output directory. Running make will produce the docset in that -# directory and running "make install" will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find -# it at startup. -# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. - -GENERATE_DOCSET = NO - -# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the -# feed. A documentation feed provides an umbrella under which multiple -# documentation sets from a single provider (such as a company or product suite) -# can be grouped. - -DOCSET_FEEDNAME = "Doxygen generated docs" - -# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that -# should uniquely identify the documentation set bundle. This should be a -# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen -# will append .docset to the name. - -DOCSET_BUNDLE_ID = org.doxygen.Project - -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be -# written to the html output directory. - -CHM_FILE = - -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. - -HHC_LOCATION = - -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). - -GENERATE_CHI = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING -# is used to encode HtmlHelp index (hhk), content (hhc) and project file -# content. - -CHM_INDEX_ENCODING = - -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. - -TOC_EXPAND = NO - -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER -# are set, an additional index file will be generated that can be used as input for -# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated -# HTML documentation. - -GENERATE_QHP = NO - -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can -# be used to specify the file name of the resulting .qch file. -# The path specified is relative to the HTML output folder. - -QCH_FILE = - -# The QHP_NAMESPACE tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#namespace - -QHP_NAMESPACE = - -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#virtual-folders - -QHP_VIRTUAL_FOLDER = doc - -# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. -# For more information please see -# http://doc.trolltech.com/qthelpproject.html#custom-filters - -QHP_CUST_FILTER_NAME = - -# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see -# Qt Help Project / Custom Filters. - -QHP_CUST_FILTER_ATTRS = - -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's -# filter section matches. -# Qt Help Project / Filter Attributes. - -QHP_SECT_FILTER_ATTRS = - -# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can -# be used to specify the location of Qt's qhelpgenerator. -# If non-empty doxygen will try to run qhelpgenerator on the generated -# .qhp file. - -QHG_LOCATION = - -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. - -DISABLE_INDEX = NO - -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. - -ENUM_VALUES_PER_LINE = 4 - -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. -# If the tag value is set to YES, a side panel will be generated -# containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). -# Windows users are probably better off using the HTML help feature. - -GENERATE_TREEVIEW = NO - -# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, -# and Class Hierarchy pages using a tree view instead of an ordered list. - -USE_INLINE_TREES = NO - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. - -TREEVIEW_WIDTH = 250 - -# Use this tag to change the font size of Latex formulas included -# as images in the HTML documentation. The default is 10. Note that -# when you change the font size after a successful doxygen run you need -# to manually remove any form_*.png images from the HTML output directory -# to force them to be regenerated. - -FORMULA_FONTSIZE = 10 - -# When the SEARCHENGINE tag is enable doxygen will generate a search box -# for the HTML output. The underlying search engine uses javascript -# and DHTML and should work on any modern browser. Note that when using -# HTML help (GENERATE_HTMLHELP) or Qt help (GENERATE_QHP) -# there is already a search function so this one should typically -# be disabled. - -SEARCHENGINE = NO - -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- - -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will -# generate Latex output. - -GENERATE_LATEX = NO - -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `latex' will be used as the default path. - -LATEX_OUTPUT = latex - -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. - -LATEX_CMD_NAME = latex - -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the -# default command name. - -MAKEINDEX_CMD_NAME = makeindex - -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_LATEX = NO - -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and -# executive. If left blank a4wide will be used. - -PAPER_TYPE = a4wide - -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX -# packages that should be included in the LaTeX output. - -EXTRA_PACKAGES = - -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a -# standard header. Notice: only use this tag if you know what you are doing! - -LATEX_HEADER = - -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references -# This makes the output suitable for online browsing using a pdf viewer. - -PDF_HYPERLINKS = YES - -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a -# higher quality PDF documentation. - -USE_PDFLATEX = YES - -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. -# This option is also used when generating formulas in HTML. - -LATEX_BATCHMODE = NO - -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) -# in the output. - -LATEX_HIDE_INDICES = NO - -# If LATEX_SOURCE_CODE is set to YES then doxygen will include -# source code with syntax highlighting in the LaTeX output. -# Note that which sources are shown also depends on other settings -# such as SOURCE_BROWSER. - -LATEX_SOURCE_CODE = NO - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with -# other RTF readers or editors. - -GENERATE_RTF = NO - -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `rtf' will be used as the default path. - -RTF_OUTPUT = rtf - -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_RTF = NO - -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. -# Note: wordpad (write) and others do not support links. - -RTF_HYPERLINKS = NO - -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide -# replacements, missing definitions are set to their default value. - -RTF_STYLESHEET_FILE = - -# Set optional variables used in the generation of an rtf document. -# Syntax is similar to doxygen's config file. - -RTF_EXTENSIONS_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- - -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will -# generate man pages - -GENERATE_MAN = NO - -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `man' will be used as the default path. - -MAN_OUTPUT = man - -# The MAN_EXTENSION tag determines the extension that is added to -# the generated man pages (default is the subroutine's section .3) - -MAN_EXTENSION = .3 - -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command -# would be unable to find the correct page. The default is NO. - -MAN_LINKS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- - -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of -# the code including all documentation. - -GENERATE_XML = NO - -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `xml' will be used as the default path. - -XML_OUTPUT = xml - -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that -# enabling this will significantly increase the size of the XML output. - -XML_PROGRAMLISTING = YES - -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- - -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental -# and incomplete at the moment. - -GENERATE_AUTOGEN_DEF = NO - -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- - -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. - -GENERATE_PERLMOD = NO - -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able -# to generate PDF and DVI output from the Perl module output. - -PERLMOD_LATEX = NO - -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller -# and Perl will parse it just the same. - -PERLMOD_PRETTY = YES - -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same -# Makefile don't overwrite each other's variables. - -PERLMOD_MAKEVAR_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- - -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include -# files. - -ENABLE_PREPROCESSING = YES - -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled -# way by setting EXPAND_ONLY_PREDEF to YES. - -MACRO_EXPANSION = NO - -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_DEFINED tags. - -EXPAND_ONLY_PREDEF = NO - -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. - -SEARCH_INCLUDES = YES - -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by -# the preprocessor. - -INCLUDE_PATH = - -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will -# be used. - -INCLUDE_FILE_PATTERNS = - -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator -# instead of the = operator. - -PREDEFINED = - -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. - -EXPAND_AS_DEFINED = - -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse -# the parser if not removed. - -SKIP_FUNCTION_MACROS = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- - -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen -# is run, you must also specify the path to the tagfile here. - -TAGFILES = - -# When a file name is specified after GENERATE_TAGFILE, doxygen will create -# a tag file that is based on the input files it reads. - -GENERATE_TAGFILE = - -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes -# will be listed. - -ALLEXTERNALS = NO - -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will -# be listed. - -EXTERNAL_GROUPS = YES - -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). - -PERL_PATH = /usr/bin/perl - -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- - -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more -# powerful graphs. - -CLASS_DIAGRAMS = YES - -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see -# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the -# documentation. The MSCGEN_PATH tag allows you to specify the directory where -# the mscgen tool resides. If left empty the tool is assumed to be found in the -# default search path. - -MSCGEN_PATH = - -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented -# or is not a class. - -HIDE_UNDOC_RELATIONS = YES - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section -# have no effect if this option is set to NO (the default) - -HAVE_DOT = NO - -# By default doxygen will write a font called FreeSans.ttf to the output -# directory and reference it in all dot files that doxygen generates. This -# font does not include all possible unicode characters however, so when you need -# these (or just want a differently looking font) you can specify the font name -# using DOT_FONTNAME. You need need to make sure dot is able to find the font, -# which can be done by putting it in a standard location or by setting the -# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory -# containing the font. - -DOT_FONTNAME = FreeSans - -# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. -# The default size is 10pt. - -DOT_FONTSIZE = 10 - -# By default doxygen will tell dot to use the output directory to look for the -# FreeSans.ttf font (which doxygen will put there itself). If you specify a -# different font using DOT_FONTNAME you can set the path where dot -# can find it using this tag. - -DOT_FONTPATH = - -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the -# the CLASS_DIAGRAMS tag to NO. - -CLASS_GRAPH = YES - -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and -# class references variables) of the class with other documented classes. - -COLLABORATION_GRAPH = YES - -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for groups, showing the direct groups dependencies - -GROUP_GRAPHS = YES - -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling -# Language. - -UML_LOOK = NO - -# If set to YES, the inheritance and collaboration graphs will show the -# relations between templates and their instances. - -TEMPLATE_RELATIONS = NO - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with -# other documented files. - -INCLUDE_GRAPH = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or -# indirectly include this file. - -INCLUDED_BY_GRAPH = YES - -# If the CALL_GRAPH and HAVE_DOT options are set to YES then -# doxygen will generate a call dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable call graphs -# for selected functions only using the \callgraph command. - -CALL_GRAPH = NO - -# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then -# doxygen will generate a caller dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable caller -# graphs for selected functions only using the \callergraph command. - -CALLER_GRAPH = NO - -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. - -GRAPHICAL_HIERARCHY = YES - -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories -# in a graphical way. The dependency relations are determined by the #include -# relations between the files in the directories. - -DIRECTORY_GRAPH = YES - -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif -# If left blank png will be used. - -DOT_IMAGE_FORMAT = png - -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found in the path. - -DOT_PATH = - -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the -# \dotfile command). - -DOTFILE_DIRS = - -# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen if the -# number of direct children of the root node in a graph is already larger than -# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note -# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. - -DOT_GRAPH_MAX_NODES = 50 - -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes -# that lay further from the root node will be omitted. Note that setting this -# option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that the size of a graph can be further restricted by -# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. - -MAX_DOT_GRAPH_DEPTH = 0 - -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not -# seem to support this out of the box. Warning: Depending on the platform used, -# enabling this option may lead to badly anti-aliased labels on the edges of -# a graph (i.e. they become hard to read). - -DOT_TRANSPARENT = NO - -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) -# support this, this feature is disabled by default. - -DOT_MULTI_TARGETS = NO - -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and -# arrows in the dot generated graphs. - -GENERATE_LEGEND = YES - -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate -# the various graphs. - -DOT_CLEANUP = YES diff --git a/cpu/stm32w108/hal/doxygen/STFooterHTML.html b/cpu/stm32w108/hal/doxygen/STFooterHTML.html deleted file mode 100644 index 4f4cad439..000000000 --- a/cpu/stm32w108/hal/doxygen/STFooterHTML.html +++ /dev/null @@ -1,18 +0,0 @@ -
- - - - - -
-$projectname.
-$projectnumber. -
-		 -
-Copyright © 2009 by STMicrolectronics. All rights reserved.
-Generated $datetime with Doxygen $doxygenversion. -
-
- - \ No newline at end of file diff --git a/cpu/stm32w108/hal/doxygen/STHeaderHTML.html b/cpu/stm32w108/hal/doxygen/STHeaderHTML.html deleted file mode 100644 index 76acc6ee9..000000000 --- a/cpu/stm32w108/hal/doxygen/STHeaderHTML.html +++ /dev/null @@ -1,16 +0,0 @@ - - -$title - - - - - - -
-Home  - |  Modules  - |  Data Structures  - |  File List  - |  Index
-
diff --git a/cpu/stm32w108/hal/doxygen/ST_Logo.gif b/cpu/stm32w108/hal/doxygen/ST_Logo.gif deleted file mode 100644 index 1b401a59c..000000000 Binary files a/cpu/stm32w108/hal/doxygen/ST_Logo.gif and /dev/null differ diff --git a/cpu/stm32w108/hal/doxygen/makefile b/cpu/stm32w108/hal/doxygen/makefile deleted file mode 100644 index 931ea9071..000000000 --- a/cpu/stm32w108/hal/doxygen/makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: - doxygen Doxygen_Release - cp ST_Logo.gif html -clean: - - rm -fr html diff --git a/cpu/stm32w108/hal/error-def.h b/cpu/stm32w108/hal/error-def.h index 8a995cf9e..15360085c 100644 --- a/cpu/stm32w108/hal/error-def.h +++ b/cpu/stm32w108/hal/error-def.h @@ -1,6 +1,6 @@ /** * @file error-def.h - * @brief Return-code definitions for StZNet stack API functions. + * @brief Return-code definitions for API functions. * * See @ref status_codes for documentation. * diff --git a/cpu/stm32w108/hal/hal.h b/cpu/stm32w108/hal/hal.h index e0fb7bbe7..e0161af3a 100644 --- a/cpu/stm32w108/hal/hal.h +++ b/cpu/stm32w108/hal/hal.h @@ -31,13 +31,12 @@ // Keep micro first for specifics used by other headers #include "micro/micro-common.h" -#include "micro/cortexm3/micro-common.h" - #include "micro/led.h" #include "micro/button.h" #include "micro/system-timer.h" #include "micro/cortexm3/nvm.h" #include "hal/micro/cortexm3/uart.h" +#include "hal/micro/adc.h" #endif //__HAL_H__ diff --git a/cpu/stm32w108/hal/micro/adc.h b/cpu/stm32w108/hal/micro/adc.h index 76fe07de4..9f690c58a 100644 --- a/cpu/stm32w108/hal/micro/adc.h +++ b/cpu/stm32w108/hal/micro/adc.h @@ -15,8 +15,7 @@ * * To use the ADC system, include this file and ensure that * ::halInternalInitAdc() is called whenever the microcontroller is - * started. Call ::halInternalSleepAdc() to sleep the module and - * ::halInternalInitAdc() to wake up the module. + * started. * * A "user" is a separate thread of execution and usage. That is, * internal St code is one user and clients are a different user. @@ -171,13 +170,6 @@ typedef int8u ADCChannelType; */ void halInternalInitAdc(void); - -/** @brief Shuts down the voltage reference and ADC system to - * minimize power consumption in sleep. - */ -void halInternalSleepAdc(void); - - /** @brief Starts an ADC conversion for the user specified by \c id. * * @appusage The application must set \c reference to the voltage diff --git a/cpu/stm32w108/hal/micro/cortexm3/adc.c b/cpu/stm32w108/hal/micro/cortexm3/adc.c index 79e017f6c..9185ecd4f 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/adc.c +++ b/cpu/stm32w108/hal/micro/cortexm3/adc.c @@ -117,6 +117,7 @@ ADCUser startNextConversion() ADC_CFG = adcConfig[i]; // set the configuration to desired INT_ADCFLAG = 0xFFFF; INT_CFGSET = INT_ADC; + break; //see DDTS MBTst38936 } } } else { diff --git a/cpu/stm32w108/hal/micro/cortexm3/board.c b/cpu/stm32w108/hal/micro/cortexm3/board.c new file mode 100644 index 000000000..d127f0370 --- /dev/null +++ b/cpu/stm32w108/hal/micro/cortexm3/board.c @@ -0,0 +1,453 @@ +/** @file board.c + * @brief Board file x STM32W108 Kits boards + * + * This file implements a software layer to support all the ST kits boards + * and deal with the difference in leds, buttons and sensors connected to the board. + * This a bit too complex for customer boards adaptation and customer can simplify it + * to adapt it to their hardware environment as they normally don't need to have the software + * running on several boards. + * The boards supported are: + * - MB851 A + * - MB851 B + * - MB851 C + * - MB954 A + * - MB954 B + * - MB950 A + * - MB951 A + * + */ +#include PLATFORM_HEADER +#include BOARD_HEADER +#ifdef EMBERZNET_HAL +#include "stack/include/ember.h" +#include "stack/include/error.h" +#include "hal/hal.h" +#define PORTA (0 << 3) +#define PORTB (1 << 3) +#define PORTC (2 << 3) +#else +#include "error.h" +#include "hal/hal.h" +#include "hal/micro/cortexm3/mfg-token.h" +#endif +#include + +const LedResourceType LedsMB851A[] = { + { + "D1", /* Green LED */ + PORTB, + 6 + }, + { + "D3", /* Yellow LED */ + PORTB, + 5 + } +}; + +const InfraRedLedResourceType infraRedLedMB851A = { + "D5", /* Infrared LED */ + PORTB, + 4 +}; + + +const LedResourceType LedsMB954A[] = { + { + "D1", /* Green LED */ + PORTA, + 5 + }, + { + "D3", /* Yellow LED */ + PORTA, + 0 + } +}; + +const ButtonResourceType ButtonsMB851A[] = { + { + "S1", + PORTA, + 7 + } +}; + +const ButtonResourceType ButtonsMB954A[] = { + { + "S1", + PORTB, + 3 + } +}; + +const ButtonResourceType ButtonsMB950A[] = { + { + "S1", + PORTB, + 3 + }, + { + "S2", + PORTA, + 7 + }, + { + "S3", + PORTB, + 7 + }, + { + "S4", + PORTB, + 0 + }, + { + "S5", + PORTB, + 6 + } +}; + +const TempSensorResourceType tempSensorMB851A = { + "STLM20", + PORTB, + 7, + FALSE +}; + +const TempSensorResourceType tempSensorMB954A = { + "STLM20", + PORTA, + 4, + TRUE +}; + +const MemsResourceType memsSensor = { + "LIS302", + 0 +}; + +const BoardIOType ioMB851A = { + LedsMB851A, + ButtonsMB851A, +}; + +const BoardIOType ioMB954A = { + LedsMB954A, + ButtonsMB954A, +}; + +const BoardIOType ioMB950A = { + LedsMB954A, + ButtonsMB950A, +}; + +const BoardResourcesType MB851A = { + "MB851 A", + (BOARD_HAS_MEMS | BOARD_HAS_TEMP_SENSOR | BOARD_HAS_FTDI), + BUTTONS_MB851A, + LEDS_MB851A, + &ioMB851A, + &infraRedLedMB851A, + &memsSensor, + &tempSensorMB851A, +}; + +const BoardResourcesType MB851B = { + "MB851 B", + (BOARD_HAS_MEMS | BOARD_HAS_TEMP_SENSOR | BOARD_HAS_FTDI), + BUTTONS_MB851B, + LEDS_MB851B, + &ioMB851A, + &infraRedLedMB851A, + &memsSensor, + &tempSensorMB851A, +}; + +const BoardResourcesType MB851C = { + "MB851 C", + (BOARD_HAS_MEMS | BOARD_HAS_TEMP_SENSOR | BOARD_HAS_STM32F | BOARD_HAS_EEPROM), + BUTTONS_MB851C, + LEDS_MB851C, + &ioMB954A, + &infraRedLedMB851A, + &memsSensor, + &tempSensorMB954A, +}; + +const BoardResourcesType MB954A = { + "MB954 A", + (BOARD_HAS_MEMS | BOARD_HAS_TEMP_SENSOR | BOARD_HAS_FTDI | BOARD_HAS_PA), + BUTTONS_MB954A, + LEDS_MB954A, + &ioMB954A, + &infraRedLedMB851A, + &memsSensor, + &tempSensorMB954A, +}; + +const BoardResourcesType MB954B = { + "MB954 B", + (BOARD_HAS_MEMS | BOARD_HAS_TEMP_SENSOR | BOARD_HAS_STM32F | BOARD_HAS_EEPROM | BOARD_HAS_PA), + BUTTONS_MB954B, + LEDS_MB954B, + &ioMB954A, + &infraRedLedMB851A, + &memsSensor, + &tempSensorMB954A, +}; + +const BoardResourcesType MB950A = { + "MB950 A", + (BOARD_HAS_MEMS | BOARD_HAS_TEMP_SENSOR | BOARD_HAS_STM32F), + BUTTONS_MB950A, + LEDS_MB950A, + &ioMB950A, + &infraRedLedMB851A, + &memsSensor, + &tempSensorMB954A, +}; + +const BoardResourcesType MB951A = { + "MB951 A", + (BOARD_HAS_STM32F), + BUTTONS_MB951A, + LEDS_MB951A, + &ioMB954A, + NULL, + NULL, + NULL, +}; + +static const BoardResourcesType *boardList [] = { + &MB851A, + &MB851B, + &MB851C, + &MB954A, + &MB954B, + &MB950A, + &MB951A +}; + +BoardResourcesType const *boardDescription = NULL; + +#define PORT_NAME(x) ((x == PORTA) ? "A": ((x == PORTB) ? "B" : ((x == PORTC) ? "C": "?"))) + +void halBoardInit(void) +{ + char boardName[16]; + int8s i; + boardDescription = NULL; +#ifdef EMBERZNET_HAL + halCommonGetToken(boardName, TOKEN_MFG_BOARD_NAME); +#else + halCommonGetMfgToken(boardName, TOKEN_MFG_BOARD_NAME); +#endif + + i = 15; + while ((i >= 0) && (boardName[i] == 0xFF)) { + boardName[i] = 0; + i--; + } + + for (i = 0; i < (sizeof(boardList)/4) ; i++) + if (strcmp(boardName, (boardList[i])->name) == 0) { + boardDescription = (BoardResourcesType *) boardList[i]; + break; + } + + if (boardDescription == NULL) { + /* Board type not identified default to MB851A also to support legacy boards */ + boardDescription = (BoardResourcesType *) &MB851A; + } + return; +} +BoardResourcesType const *halBoardGetDescription(void) +{ + return boardDescription; +} + +void halBoardPowerDown(void) +{ + /* Set everything to input value */ + GPIO_PACFGL = (GPIOCFG_IN <io->buttons; + int8u i; + for (i = 0; i < boardDescription->buttons; i++) { + halGpioConfig(PORTx_PIN(buttons[i].gpioPort, buttons[i].gpioPin), GPIOCFG_IN_PUD); + halGpioSet(PORTx_PIN(buttons[i].gpioPort, buttons[i].gpioPin), GPIOOUT_PULLUP); + } + } +#endif + /* Configure GPIO for power amplifier */ + if (boardDescription->flags & BOARD_HAS_PA) { + /* SiGe Standby */ + halGpioConfig(PORTB_PIN(6), GPIOCFG_OUT); + halGpioSet(PORTB_PIN(6), 0); + } + +} +void halBoardPowerUp(void) +{ + /* Set everything to input value */ + GPIO_PACFGL = (GPIOCFG_IN <flags & BOARD_HAS_MEMS) || (boardDescription->flags & BOARD_HAS_EEPROM)) { + halGpioConfig(PORTA_PIN(1), GPIOCFG_OUT_ALT_OD); + halGpioConfig(PORTA_PIN(2), GPIOCFG_OUT_ALT_OD); + } + /* Configure GPIO for ADC access (temp sensor) */ + if (boardDescription->flags & BOARD_HAS_TEMP_SENSOR) { + halGpioConfig(PORTx_PIN(boardDescription->temperatureSensor->gpioPort, + boardDescription->temperatureSensor->gpioPin), + GPIOCFG_ANALOG); + } + /* Configure GPIO for LEDs */ + { + LedResourceType *leds = (LedResourceType *) boardDescription->io->leds; + int8u i; + for (i = 0; i < boardDescription->leds; i++) { + /* LED default off */ + halGpioConfig(PORTx_PIN(leds[i].gpioPort, leds[i].gpioPin), GPIOCFG_OUT); + halGpioSet(PORTx_PIN(leds[i].gpioPort, leds[i].gpioPin), 1); + } + } + /* Configure GPIO for BUTTONSs */ + { + ButtonResourceType *buttons = (ButtonResourceType *) boardDescription->io->buttons; + int8u i; + for (i = 0; i < boardDescription->buttons; i++) { + halGpioConfig(PORTx_PIN(buttons[i].gpioPort, buttons[i].gpioPin), GPIOCFG_IN_PUD); + halGpioSet(PORTx_PIN(buttons[i].gpioPort, buttons[i].gpioPin), GPIOOUT_PULLUP); + } + } + + /* Configure GPIO for power amplifier */ + if (boardDescription->flags & BOARD_HAS_PA) { + /* SiGe Ant Sel (default ceramic antenna) */ + halGpioConfig(PORTB_PIN(5), GPIOCFG_OUT); + halGpioSet(PORTB_PIN(5), 1); + /* SiGe Standby (default out of standby) */ + halGpioConfig(PORTB_PIN(6), GPIOCFG_OUT); + halGpioSet(PORTB_PIN(6), 1); + /* SiGe LNA (default LNA off )*/ + halGpioConfig(PORTB_PIN(7), GPIOCFG_OUT); + halGpioSet(PORTB_PIN(7), 0); + /* SiGe nTX Active */ + halGpioConfig(PORTC_PIN(5), GPIOCFG_OUT_ALT); + } + +} + +#ifdef TEST_COMMANDS +#include +void printLeds (LedResourceType *leds) +{ + while (leds->name != NULL) { + printf ("Led %s (port:%s, bit:%d)\r\n", leds->name, PORT_NAME(leds->gpioPort), leds->gpioPin); + leds++; + } +} + +void printButtons (ButtonResourceType *buttons) +{ + while (buttons->name != NULL) { + printf ("Button %s (port:%s, bit:%d)\r\n", buttons->name, PORT_NAME(buttons->gpioPort), buttons->gpioPin); + buttons++; + } +} + +void boardPrintStringDescription(void) +{ + int8u i = 0; + + while (boardList[i] != NULL) { + if ((boardDescription == boardList[i]) || (boardDescription == NULL)) { + BoardResourcesType *ptr = boardList[i]; + printf ("*************************************\r\n"); + printf ("Board name = %s\r\n", ptr->name); + printf ("*************************************\r\n"); + printLeds(ptr->leds); + printButtons(ptr->buttons); + if (ptr->mems) { + printf ("MEMS = %s\r\n", ptr->mems->name); + } + if (ptr->temperatureSensor) { + printf ("Temp sensor = %s, port:%s, pin:%d, adcFix:%s\r\n", + ptr->temperatureSensor->name, + PORT_NAME(ptr->temperatureSensor->gpioPort), + ptr->temperatureSensor->gpioPin, + ptr->temperatureSensor->adcFix ? "Yes" : "No" + ); + } + printf ("EEProm:%s\r\n", ptr->EEProm ? "Yes" : "No"); + printf ("PC i/f:%s\r\n", ptr->FTDInotSTM32 ? "FTDI" : "STM32F"); + printf ("Power Amplifier:%s\r\n", ptr->PowerAmplifier ? "Yes" : "No"); + } + i++; + } + return NULL; +} +#endif diff --git a/cpu/stm32w108/hal/micro/cortexm3/button.c b/cpu/stm32w108/hal/micro/cortexm3/button.c index 3b8f2297e..0cbae3aab 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/button.c +++ b/cpu/stm32w108/hal/micro/cortexm3/button.c @@ -12,18 +12,25 @@ void halInitButton(void) { - /* Set GPIO pin to PUD (input pull-up or pull-down) for button S1 */ - halGpioConfig(BUTTON_S1,GPIOCFG_IN_PUD); - /* Set the button S1 gpio pin to pull-up */ - BUTTON_S1_OUTPUT_GPIO |= GPIOOUT_PULLUP << BUTTON_S1_GPIO_PIN; + int8u i; + /* Configure GPIO for BUTTONSs */ + ButtonResourceType *buttons = (ButtonResourceType *) boardDescription->io->buttons; + for (i = 0; i < boardDescription->buttons; i++) { + halGpioConfig(PORTx_PIN(buttons[i].gpioPort, buttons[i].gpioPin), GPIOCFG_IN_PUD); + halGpioSet(PORTx_PIN(buttons[i].gpioPort, buttons[i].gpioPin), GPIOOUT_PULLUP); + } }/* end halInitButton() */ int8u halGetButtonStatus(HalBoardButton button) { - if (button == BUTTON_S1) - return (BUTTON_S1_INPUT_GPIO & (1<> 3) & 0xf; + int8u pin = button & 0x7; + + if (button != DUMMY_BUTTON) + { + return (BUTTON_INPUT_GPIO(port) & (1 << pin)) ? BUTTON_RELEASED : BUTTON_PRESSED; + } + return BUTTON_UNKNOWN; }/* end halGetButtonStatus()*/ diff --git a/cpu/stm32w108/hal/micro/cortexm3/compiler/gnu.h b/cpu/stm32w108/hal/micro/cortexm3/compiler/gnu.h index 3030fdeba..2ed3edbf2 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/compiler/gnu.h +++ b/cpu/stm32w108/hal/micro/cortexm3/compiler/gnu.h @@ -22,13 +22,17 @@ #error Improper PLATFORM_HEADER #endif -#define GCC_VERSION (__GNUC__ * 10000 \ - + __GNUC_MINOR__ * 100 \ - + __GNUC_PATCHLEVEL__) - -#if GCC_VERSION < 40302 -#error Only GNU C version later than 4.3.2 are supported -#endif +#if (__GNUC__ < 4) + #error Only GNU C versions later than 4.3.2 are supported +#elif (__GNUC__ == 4) + #if (__GNUC_MINOR__ < 3) + #error Only GNU C versions later than 4.3.2 are supported + #elif (__GNUC_MINOR__ == 3) + #if (__GNUC_PATCHLEVEL__ < 2) + #error Only GNU C versions later than 4.3.2 are supported + #endif + #endif +#endif // __GNUC__ #ifndef DOXYGEN_SHOULD_SKIP_THIS @@ -36,6 +40,7 @@ #include #if defined (CORTEXM3_STM32W108) #include "micro/cortexm3/stm32w108/regs.h" + #include "micro/cortexm3/stm32w108/stm32w108_type.h" #else #error Unknown CORTEXM3 micro #endif @@ -169,6 +174,16 @@ typedef unsigned int PointerType; #endif #endif +/** + * @brief Set the application start and end address. + * This are useful to detect whether an image is for bootloader mode or not. + * This can be used also to clone image to another node via bootloader. + */ +#define APPLICATION_IMAGE_START ((u32) &__ApplicationFlashStart) +#define APPLICATION_IMAGE_END ((u32) &__ApplicationFlashEnd) +extern char __ApplicationFlashStart; +extern char __ApplicationFlashEnd; + /** * @brief Macro to reset the watchdog timer. Note: be very very * careful when using this as you can easily get into an infinite loop if you @@ -252,6 +267,9 @@ void halInternalResetWatchDog(void); #define VAR_AT_SEGMENT(__variableDeclaration, __segmentName) \ __variableDeclaration __attribute__ ((section (__segmentName))) +#define ALIGN_VAR(__variableDeclaration, alignment) \ + __variableDeclaration __attribute__ ((aligned(alignment))) + //////////////////////////////////////////////////////////////////////////////// //@} // end of Miscellaneous Macros //////////////////////////////////////////////////////////////////////////////// diff --git a/cpu/stm32w108/hal/micro/cortexm3/compiler/iar.h b/cpu/stm32w108/hal/micro/cortexm3/compiler/iar.h index 796188544..69e4a05b5 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/compiler/iar.h +++ b/cpu/stm32w108/hal/micro/cortexm3/compiler/iar.h @@ -33,6 +33,9 @@ #include #if defined (CORTEXM3_STM32W108) #include "micro/cortexm3/stm32w108/regs.h" + #include "micro/cortexm3/stm32w108/stm32w108_type.h" + #elif defined (CORTEXM3_STM32F103) + #include "stm32f10x.h" #else #error Unknown CORTEXM3 micro #endif @@ -163,6 +166,15 @@ typedef unsigned int PointerType; #endif #endif +/** + * @brief Set the application start and end address. + * This are useful to detect whether an image is for bootloader mode or not. + * This can be used also to clone image to another node via bootloader. + */ +#define APPLICATION_IMAGE_START ((u32) __section_begin("FLASH_IMAGE")) +#define APPLICATION_IMAGE_END ((u32) __section_end ("FLASH_IMAGE")) + + /** * @brief Macro to reset the watchdog timer. Note: be very very * careful when using this as you can easily get into an infinite loop if you @@ -247,6 +259,11 @@ void halInternalResetWatchDog(void); #define VAR_AT_SEGMENT(__variableDeclaration, __segmentName) \ __variableDeclaration @ __segmentName +#define _QUOTEME(a) #a +#define QUOTEME(a) _QUOTEME(a) +#define ALIGN_VAR(__variableDeclaration, alignment) _Pragma(QUOTEME(data_alignment=alignment)) \ + __variableDeclaration + //////////////////////////////////////////////////////////////////////////////// //@} // end of Miscellaneous Macros //////////////////////////////////////////////////////////////////////////////// @@ -290,6 +307,8 @@ void halInternalResetWatchDog(void); #pragma segment=__TEXTRW__ #pragma segment=__FAT__ #pragma segment=__NVM__ +// Special pragma to get the application image start and end address +#pragma segment="FLASH_IMAGE" /**@} */ //A utility function for inserting barrier instructions. These diff --git a/cpu/stm32w108/hal/micro/cortexm3/iap_bootloader.h b/cpu/stm32w108/hal/micro/cortexm3/iap_bootloader.h new file mode 100644 index 000000000..a119a2357 --- /dev/null +++ b/cpu/stm32w108/hal/micro/cortexm3/iap_bootloader.h @@ -0,0 +1,34 @@ +/** @file iap_bootloader.h + * @brief IAP bootloader specific definitions + * + */ + +/** + * @brief Application start address + */ +#define IAP_BOOTLOADER_APPLICATION_ADDRESS 0x08003000 + +/** + * @brief Radio PAN ID for OTA bootloader + */ +#define IAP_BOOTLOADER_PAN_ID 0xb00b + +/** + * @brief Signature used for switch to application + */ +#define IAP_BOOTLOADER_APP_SWITCH_SIGNATURE 0xb001204d + +/** + * @brief Radio default channel for OTA bootloader + */ +#define IAP_BOOTLOADER_DEFAULT_CHANNEL 0x0F + +/** + * @brief IAP bootloader uart mode + */ +#define IAP_BOOTLOADER_MODE_UART 0 + +/** + * @brief IAP bootloader OTA mode + */ +#define IAP_BOOTLOADER_MODE_OTA 1 diff --git a/cpu/stm32w108/hal/micro/cortexm3/led.c b/cpu/stm32w108/hal/micro/cortexm3/led.c index 9bdb2f0c7..dd0d5f58f 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/led.c +++ b/cpu/stm32w108/hal/micro/cortexm3/led.c @@ -10,12 +10,6 @@ #include "hal/micro/micro-common.h" #include "hal/micro/cortexm3/micro-common.h" -#define GPIO_PxCLR_BASE (GPIO_PACLR_ADDR) -#define GPIO_PxSET_BASE (GPIO_PASET_ADDR) -#define GPIO_PxOUT_BASE (GPIO_PAOUT_ADDR) -// Each port is offset from the previous port by the same amount -#define GPIO_Px_OFFSET (GPIO_PBCFGL_ADDR-GPIO_PACFGL_ADDR) - void halInitLed(void) { /* Set GPIO pins for Led D1 and Led D3 */ @@ -28,16 +22,12 @@ void halInitLed(void) void halSetLed(HalBoardLed led) { - if(led/8 < 3) { - *((volatile int32u *)(GPIO_PxCLR_BASE+(GPIO_Px_OFFSET*(led/8)))) = BIT(led&7); - } + halGpioSet(led, 0); } void halClearLed(HalBoardLed led) { - if(led/8 < 3) { - *((volatile int32u *)(GPIO_PxSET_BASE+(GPIO_Px_OFFSET*(led/8)))) = BIT(led&7); - } + halGpioSet(led, 1); } void halToggleLed(HalBoardLed led) diff --git a/cpu/stm32w108/hal/micro/cortexm3/memmap.h b/cpu/stm32w108/hal/micro/cortexm3/memmap.h index 801cb1290..8feb1b997 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/memmap.h +++ b/cpu/stm32w108/hal/micro/cortexm3/memmap.h @@ -10,6 +10,8 @@ #ifndef LOADER #if defined (CORTEXM3_STM32W108) #include "hal/micro/cortexm3/stm32w108/memmap.h" + #elif defined (CORTEXM3_STM32F103) + #include "hal/micro/cortexm3/stm32f103ret/memmap.h" #else #error no appropriate micro defined #endif diff --git a/cpu/stm32w108/hal/micro/cortexm3/micro-common-internal.c b/cpu/stm32w108/hal/micro/cortexm3/micro-common-internal.c index a0d0537f4..a7cbc5c76 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/micro-common-internal.c +++ b/cpu/stm32w108/hal/micro/cortexm3/micro-common-internal.c @@ -250,7 +250,7 @@ void halInternalSetRegTrim(boolean boostMode) // the accuracy of OSCHF (much lower than XTAL). void halCommonDelayMicroseconds(int16u us) { - int32u beginTime = MAC_TIMER; + int32u beginTime = ReadRegister(MAC_TIMER); //If we're not using the XTAL, the MAC Timer is running off OSCHF, //that means the clock is half speed, 6MHz. We need to halve our delay diff --git a/cpu/stm32w108/hal/micro/cortexm3/micro-common.c b/cpu/stm32w108/hal/micro/cortexm3/micro-common.c index 1afd82c41..965b25c58 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/micro-common.c +++ b/cpu/stm32w108/hal/micro/cortexm3/micro-common.c @@ -9,6 +9,7 @@ #include PLATFORM_HEADER +#include BOARD_HEADER #include "error.h" #include "hal/micro/micro-common.h" #include "hal/micro/cortexm3/micro-common.h" @@ -59,11 +60,16 @@ void halGpioConfig(int32u io, int32u config) *configRegs[io/4] = portcfg | (config <<((io&3)*4)); } - - - - - +void halGpioSet(int32u gpio, boolean value) +{ + if(gpio/8 < 3) { + if (value) { + *((volatile int32u *)(GPIO_PxSET_BASE+(GPIO_Px_OFFSET*(gpio/8)))) = BIT(gpio&7); + } else { + *((volatile int32u *)(GPIO_PxCLR_BASE+(GPIO_Px_OFFSET*(gpio/8)))) = BIT(gpio&7); + } + } +} int16u halInternalStartSystemTimer(void) { diff --git a/cpu/stm32w108/hal/micro/cortexm3/micro-common.h b/cpu/stm32w108/hal/micro/cortexm3/micro-common.h index 1a146df6e..b538e6f08 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/micro-common.h +++ b/cpu/stm32w108/hal/micro/cortexm3/micro-common.h @@ -24,24 +24,35 @@ #endif //__STSTATUS_TYPE__ #endif // DOXYGEN_SHOULD_SKIP_THIS +#define PORTA (0 << 3) +#define PORTB (1 << 3) +#define PORTC (2 << 3) + /** * @brief Some registers and variables require indentifying GPIO by * a single number instead of the port and pin. This macro converts * Port A pins into a single number. */ -#define PORTA_PIN(y) ((0<<3)|y) +#define PORTA_PIN(y) (PORTA|y) /** * @brief Some registers and variables require indentifying GPIO by * a single number instead of the port and pin. This macro converts * Port B pins into a single number. */ -#define PORTB_PIN(y) ((1<<3)|y) +#define PORTB_PIN(y) (PORTB|y) /** * @brief Some registers and variables require indentifying GPIO by * a single number instead of the port and pin. This macro converts * Port C pins into a single number. */ -#define PORTC_PIN(y) ((2<<3)|y) +#define PORTC_PIN(y) (PORTC|y) + +/** + * @brief Some registers and variables require indentifying GPIO by + * a single number instead of the port and pin. This macro converts + * Port C pins into a single number. + */ +#define PORTx_PIN(x, y) (x|y) /** * @brief Resets the watchdog timer. This function is pointed @@ -62,6 +73,16 @@ void halInternalResetWatchDog( void ); */ void halGpioConfig(int32u io, int32u config); +/** + * @brief Set/Clear single GPIO bit + * + * @param io The io pin to use, can be specified with the convenience macros + * PORTA_PIN(), PORTB_PIN(), PORTC_PIN() + * @param value A flag indicating whether to set or clear the io. + * + */ +void halGpioSet(int32u io, boolean value); + /** * @brief Calibrates the internal SlowRC to generate a 1024 Hz (1kHz) clock. diff --git a/cpu/stm32w108/hal/micro/cortexm3/micro.c b/cpu/stm32w108/hal/micro/cortexm3/micro.c index b464ce0ce..34cbf0957 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/micro.c +++ b/cpu/stm32w108/hal/micro/cortexm3/micro.c @@ -6,15 +6,19 @@ */ #include PLATFORM_HEADER +#include BOARD_HEADER #include "error.h" #include "hal/micro/micro-common.h" #include "hal/micro/cortexm3/micro-common.h" #include "micro/system-timer.h" #include "micro/adc.h" +#include "micro/cortexm3/memmap.h" +#include "micro/cortexm3/iap_bootloader.h" #include #include +extern void halBoardInit(void); void halInit(void) { @@ -24,6 +28,7 @@ void halInit(void) //be deleted. GPIO_DBGCFG &= ~GPIO_EXTREGEN; halInternalSetRegTrim(FALSE); + halBoardInit(); halPowerUp(); halInternalCalibrateFastRc(); @@ -54,6 +59,7 @@ void halReboot(void) void halPowerDown(void) { + halBoardPowerDown(); } void halPowerUp(void) @@ -61,6 +67,7 @@ void halPowerUp(void) halInternalInitAdc(); halCommonCalibratePads(); halInternalSwitchToXtal(); + halBoardPowerUp(); } static int16u seed0 = 0xbeef; @@ -106,3 +113,43 @@ void halCommonMemSet(void *dest, int8u val, int16u bytes) { memset(dest, val, bytes); } + +#pragma pack(1) +typedef struct appSwitchStruct { + int32u signature; + int8u mode; + int8u channel; + union { + int16u panID; + int16u offset; + } param; +} appSwitchStructType; +#pragma pack() +static appSwitchStructType *appSwitch = (appSwitchStructType *) RAM_BOTTOM; + +StStatus halBootloaderStart(int8u mode, int8u channel, int16u panID) +{ + if (mode == IAP_BOOTLOADER_MODE_UART) { + int8u cut = *(volatile int8u *) 0x08040798; + if (!( (halFixedAddressTable.baseTable.type == FIXED_ADDRESS_TABLE_TYPE) && + ( ( (halFixedAddressTable.baseTable.version & FAT_MAJOR_VERSION_MASK) + == 0x0000 ) && + (halFixedAddressTable.baseTable.version == 0x0003) //checking presence of valid version + ) && (cut >= 2) && (cut <= 3))) + /* Cut not supported */ + return ST_ERR_FATAL; + } else { + /* Check that OTA bootloader is at the base of the flash */ + if (*((int32u *) (MFB_BOTTOM + 28)) == IAP_BOOTLOADER_APP_SWITCH_SIGNATURE) { + appSwitch->channel = ((channel >= 11) && (channel <= 26)) ? channel :IAP_BOOTLOADER_DEFAULT_CHANNEL; + appSwitch->param.panID = panID; + } else { + return ST_ERR_FATAL; + } + } + appSwitch->signature = IAP_BOOTLOADER_APP_SWITCH_SIGNATURE; + appSwitch->mode = mode; + halReboot(); + + return (mode <= IAP_BOOTLOADER_MODE_OTA) ? ST_ERR_FATAL: ST_BAD_ARGUMENT; +} diff --git a/cpu/stm32w108/hal/micro/cortexm3/nvm.c b/cpu/stm32w108/hal/micro/cortexm3/nvm.c index 0b14257a5..2aff89c99 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/nvm.c +++ b/cpu/stm32w108/hal/micro/cortexm3/nvm.c @@ -10,6 +10,30 @@ #include PLATFORM_HEADER #include "error.h" + +#ifdef NVM_RAM_EMULATION + +static int16u calibrationData[32+2]={ + 0xFFFF, 0xFFFF, + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, +}; + +int8u halCommonReadFromNvm(void *data, int32u offset, int16u length) +{ + halCommonMemCopy(data, ((int8u *) calibrationData) + offset, length); + return ST_SUCCESS; +} +int8u halCommonWriteToNvm(const void *data, int32u offset, int16u length) +{ + halCommonMemCopy(((int8u *) calibrationData) + offset, data, length); + return ST_SUCCESS; +} + +#else + //flash.h gives access to halInternalFlashErase and halInternalFlashWrite. #include "hal/micro/cortexm3/flash.h" //nvm.h includes memmap.h. These two headers define the key parameters: @@ -375,3 +399,4 @@ int8u halCommonWriteToNvm(const void *data, int32u offset, int16u length) } } +#endif // NVM_RAM_EMULATION diff --git a/cpu/stm32w108/hal/micro/cortexm3/spmr.s79 b/cpu/stm32w108/hal/micro/cortexm3/spmr.s79 index 804282d6d..76360196c 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/spmr.s79 +++ b/cpu/stm32w108/hal/micro/cortexm3/spmr.s79 @@ -99,9 +99,9 @@ _disableBasePri: _basePriIsDisabled: MRS R0, BASEPRI // read current BASEPRI CMP R0, #INTERRUPTS_DISABLED_PRIORITY - ITE le - LDRLE R0, =1 - LDRGT R0, =0 + ITE lt + LDRLT R0, =0 + LDRGE R0, =1 BX LR __CFI__(EndBlock cfiBlock3) diff --git a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/board.h b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/board.h index 003cd1ca4..dd9f5d338 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/board.h +++ b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/board.h @@ -1,24 +1,221 @@ /** @file board.h - * @brief Header file x STM32W108 Kits boards + * @brief Header file x STM32W108 Kits boards abstraction. + * See @ref board for documentation. + * + * + * See hal/micro/cortexm3/stm32w108/board.h for source code. * * */ #ifndef _BOARD_H_ #define _BOARD_H_ -#ifdef BOARD_MB851 +/** @addtogroup board + * @brief ST board abstraction layer + * + * This header defines API and data structures to handle ST boards with thei associated resources + * on algorithm behavior. + * See hal/micro/cortexm3/stm32w108/board.h for source code. + *@{ + */ + +/** + * @brief Define the number of LEDs in the specific board revision + */ +#define LEDS_MB851A 2 +/** + * @brief Define the number of LEDs in the specific board revision + */ +#define LEDS_MB851B 2 +/** + * @brief Define the number of LEDs in the specific board revision + */ +#define LEDS_MB851C 2 +/** + * @brief Define the number of LEDs in the specific board revision + */ +#define LEDS_MB954A 2 +/** + * @brief Define the number of LEDs in the specific board revision + */ +#define LEDS_MB954B 2 +/** + * @brief Define the number of LEDs in the specific board revision + */ +#define LEDS_MB950A 2 +/** + * @brief Define the number of LEDs in the specific board revision + */ +#define LEDS_MB951A 2 + +/** + * @brief Define the number of user buttons in the specific board revision + */ +#define BUTTONS_MB851A 1 +/** + * @brief Define the number of user buttons in the specific board revision + */ +#define BUTTONS_MB851B 1 +/** + * @brief Define the number of user buttons in the specific board revision + */ +#define BUTTONS_MB851C 1 +/** + * @brief Define the number of user buttons in the specific board revision + */ +#define BUTTONS_MB954A 1 +/** + * @brief Define the number of user buttons in the specific board revision + */ +#define BUTTONS_MB954B 1 +/** + * @brief Define the number of user buttons in the specific board revision + */ +#define BUTTONS_MB950A 5 +/** + * @brief Define the number of user buttons in the specific board revision + */ +#define BUTTONS_MB951A 0 + +/** + * @brief Data structure for led description + */ +typedef struct LedResourceStruct { + /** Name of the LED as printed in the board */ + char *name; + /** GPIO port associated with the LED */ + int8u gpioPort; + /** GPIO pin associated with the LED */ + int8u gpioPin; +} LedResourceType; + +typedef LedResourceType InfraRedLedResourceType; + +/** + * @brief Data structure for button description + */ +typedef struct ButtonResourceStruct { + /** Name of the button as printed in the board */ + char *name; + /** GPIO port associated with the button */ + int8u gpioPort; + /** GPIO pin associated with the button */ + int8u gpioPin; +} ButtonResourceType; + +/** + * @brief Data structure for MEMS description + */ +typedef struct MemsResourceStruct { + /** Name of the MEMS device */ + char *name; + /** Serial communication port associated with the MEMS */ + int8u scPort; +} MemsResourceType; + +/** + * @brief Data structure for temperature sensor description + */ +typedef struct TempSensorResourceStruct { + /** Name of the temperature sensor device */ + char *name; + /** GPIO port associated with the sensor */ + int8u gpioPort; + /** GPIO pin associated with the sensor */ + int8u gpioPin; + /** Flag to indicate whether the ADC range extension bug fix is implemented */ + boolean adcFix; +} TempSensorResourceType; + +/** + * @brief Data structure for board user I/O + */ +typedef struct BoardIOStruct { + /** Pointer to LED resources */ + const LedResourceType *leds; + /** Pointer to button resources */ + const ButtonResourceType *buttons; +} BoardIOType; + +/** + * @brief Flag to indicate if MEMS is present + */ +#define BOARD_HAS_MEMS (1 << 0) +/** + * @brief Flag to indicate if temeprature sensor is present + */ +#define BOARD_HAS_TEMP_SENSOR (1 << 1) +/** + * @brief Flag to indicate if external power amplifier is present + */ +#define BOARD_HAS_PA (1 << 2) +/** + * @brief Flag to indicate if EEPROM is present + */ +#define BOARD_HAS_EEPROM (1 << 3) +/** + * @brief Flag to indicate if FTDI is used as PC interface + */ +#define BOARD_HAS_FTDI (1 << 4) +/** + * @brief Flag to indicate if STM32F is used as PC interface + */ +#define BOARD_HAS_STM32F (1 << 5) + +/** + * @brief Data structure describing board features + */ +typedef struct BoardResourcesStruct { + const char *name; + const int32u flags; + /** Number of buttons */ + int8u buttons; + /** Number of leds */ + int8u leds; + /** Board I/O description */ + const BoardIOType *io; + /** Board infrared led description */ + const InfraRedLedResourceType* infraredLed; + /** Board infrared MEMS description */ + const MemsResourceType *mems; + /** Board infrared temeprature sensor description */ + const TempSensorResourceType *temperatureSensor; +} BoardResourcesType; + +extern BoardResourcesType const *boardDescription; + +// Generic definitions +#define GPIO_PxCLR_BASE (GPIO_PACLR_ADDR) +#define GPIO_PxSET_BASE (GPIO_PASET_ADDR) +#define GPIO_PxOUT_BASE (GPIO_PAOUT_ADDR) +#define GPIO_PxIN_BASE (GPIO_PAIN_ADDR) +// Each port is offset from the previous port by the same amount +#define GPIO_Px_OFFSET (GPIO_PBCFGL_ADDR-GPIO_PACFGL_ADDR) + /* leds definitions */ -#define LED_D1 PORTB_PIN(6) -#define LED_D3 PORTB_PIN(5) +#define LED_D1 PORTx_PIN(boardDescription->io->leds[0].gpioPort, boardDescription->io->leds[0].gpioPin) //PORTB_PIN(6) +#define LED_D3 PORTx_PIN(boardDescription->io->leds[1].gpioPort, boardDescription->io->leds[1].gpioPin) // PORTB_PIN(5) +#define DUMMY_LED 0xff /** Description buttons definition */ -#define BUTTON_S1 PORTA_PIN(7) -#define BUTTON_S1_INPUT_GPIO GPIO_PAIN -#define BUTTON_S1_OUTPUT_GPIO GPIO_PAOUT -#define BUTTON_S1_GPIO_PIN PA7_BIT -#define BUTTON_S1_WAKE_SOURCE 0x00000080 +#define BUTTON_Sn(n) (PORTx_PIN(boardDescription->io->buttons[n].gpioPort, boardDescription->io->buttons[n].gpioPin)) +#define BUTTON_Sn_WAKE_SOURCE(n) (1 << ((boardDescription->io->buttons[n].gpioPin) + (8 * (boardDescription->io->buttons[n].gpioPort >> 3)))) +#define BUTTON_INPUT_GPIO(port) *((volatile int32u *) (GPIO_PxIN_BASE + GPIO_Px_OFFSET * port)) +#define DUMMY_BUTTON 0xff + +#define BUTTON_S1 (boardDescription->buttons>0 ? BUTTON_Sn(0): DUMMY_BUTTON) +#define BUTTON_S2 (boardDescription->buttons>1 ? BUTTON_Sn(1): DUMMY_BUTTON) +#define BUTTON_S3 (boardDescription->buttons>2 ? BUTTON_Sn(2): DUMMY_BUTTON) +#define BUTTON_S4 (boardDescription->buttons>3 ? BUTTON_Sn(3): DUMMY_BUTTON) +#define BUTTON_S5 (boardDescription->buttons>4 ? BUTTON_Sn(4): DUMMY_BUTTON) + +#define BUTTON_S1_WAKE_SOURCE (boardDescription->buttons>0 ? BUTTON_Sn_WAKE_SOURCE(0): 0) +#define BUTTON_S2_WAKE_SOURCE (boardDescription->buttons>1 ? BUTTON_Sn_WAKE_SOURCE(1): 0) +#define BUTTON_S3_WAKE_SOURCE (boardDescription->buttons>2 ? BUTTON_Sn_WAKE_SOURCE(2): 0) +#define BUTTON_S4_WAKE_SOURCE (boardDescription->buttons>3 ? BUTTON_Sn_WAKE_SOURCE(3): 0) +#define BUTTON_S5_WAKE_SOURCE (boardDescription->buttons>4 ? BUTTON_Sn_WAKE_SOURCE(4): 0) /** Description uart definition */ #define UART_TX PORTB_PIN(1) @@ -26,8 +223,37 @@ #define UART_RX_WAKE_SOURCE 0x00000400 /** Description temperature sensor GPIO */ -#define TEMPERATURE_SENSOR_GPIO PORTB_PIN(7) -#endif /* BOARD_MB851 */ +#define TEMPERATURE_SENSOR_GPIO PORTx_PIN(boardDescription->temperatureSensor->gpioPort, boardDescription->temperatureSensor->gpioPin) // PORTB_PIN(7) + +/** @brief Return pointer to board description structure + * + * + * @return Pointer to board description structure + */ +BoardResourcesType const *halBoardGetDescription(void); +/** + * @brief Initialize the board description data structure after + * autodetect of the boards based on the CIB Board name field + * content. In case of invalid CIB data it will default to MB851A. + * Customer normally needs to modify this file to adapt it to their specific board. + */ +void halBoardInit(void); +/** + * @brief Perform board specific action to power up the system. + * This code depends on the actual board features and configure + * the stm32w and on board devices for proper operation. + * Customer normally needs to modify this file to adapt it to their specific board. + */ +void halBoardPowerUp(void); +/** + * @brief Perform board specific action to power down the system, usually before going to deep sleep. + * This code depends on the actual board features and configure + * the stm32w and on board devices for minimal power consumption. + * Customer normally needs to modify this file to adapt it to their specific board. + */ +void halBoardPowerDown(void); #endif /* _BOARD_H_ */ +/** @} // END addtogroup + */ diff --git a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/crt_stm32w108.c b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/crt_stm32w108.c index 6be646583..4807c28ec 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/crt_stm32w108.c +++ b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/crt_stm32w108.c @@ -20,8 +20,8 @@ #include #include #define RESERVED 0 -//#define DUMMY_MALLOC - +#define IAP_BOOTLOADER_APP_SWITCH_SIGNATURE 0xb001204d +#define IAP_BOOTLOADER_MODE_UART 0 /* Includes ----------------------------------------------------------------------*/ #include PLATFORM_HEADER void NMI_Handler(void); @@ -72,7 +72,7 @@ VAR_AT_SEGMENT(const HalFixedAddressTableType halFixedAddressTable, __FAT__); /* function prototypes ------------------------------------------------------*/ void Reset_Handler(void) __attribute__((__interrupt__)); extern int main(void); - +extern void halInternalSwitchToXtal(void); /****************************************************************************** * @@ -121,6 +121,20 @@ void (* const g_pfnVectors[])(void) = halDebugIsr, // 32 }; +static void setStackPointer(int32u address) __attribute__((noinline)); +static void setStackPointer(int32u address) +{ + // This code is needed to generate the instruction below + // that GNU ASM is refusing to add + // asm("MOVS SP, r0"); + asm(".short 0x4685"); +} + +static const int16u blOffset[] = { + 0x0715 - 0x03ad - 0x68, + 0x0719 - 0x03ad - 0x6C +}; + /******************************************************************************* * Function Name : Reset_Handler * Description : This is the code that gets called when the processor first starts execution @@ -244,6 +258,21 @@ void Reset_Handler(void) while(1) { ; } } + //USART bootloader software activation check + if ((*((int32u *)RAM_BOTTOM) == IAP_BOOTLOADER_APP_SWITCH_SIGNATURE) && (*((int8u *)(RAM_BOTTOM+4)) == IAP_BOOTLOADER_MODE_UART)){ + int8u cut = *(volatile int8u *) 0x08040798; + int16u offset = 0; + typedef void (*EntryPoint)(void); + offset = (halFixedAddressTable.baseTable.version == 3) ? blOffset[cut - 2] : 0; + *((int32u *)RAM_BOTTOM) = 0; + if (offset) { + halInternalSwitchToXtal(); + } + EntryPoint entryPoint = (EntryPoint)(*(int32u *)(FIB_BOTTOM+4) - offset); + setStackPointer(*(int32u *)FIB_BOTTOM); + entryPoint(); + } + INTERRUPTS_OFF(); asm("CPSIE i"); @@ -302,12 +331,10 @@ caddr_t _sbrk ( int incr ) return (caddr_t) prev_heap; } #else -# ifdef DUMMY_MALLOC caddr_t _sbrk ( int incr ) { return NULL; } -# endif #endif int _lseek (int file, int ptr, diff --git a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/gnu.ld b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/gnu.ld index ad7042027..ed63358a9 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/gnu.ld +++ b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/gnu.ld @@ -13,71 +13,65 @@ GROUP( These are used by the startup in order to allocate stacks for the different modes. */ -__Stack_Size = 0x500 ; +__Stack_Size = 0x400 ; PROVIDE ( _Stack_Size = __Stack_Size ) ; -__Stack_Init = _estack - __Stack_Size ; +__Stack_Init = 0x20000000; + +_estack = __Stack_Init + __Stack_Size; + /*"PROVIDE" allows to easily override these values from an object file or the commmand line.*/ PROVIDE ( _Stack_Init = __Stack_Init ) ; -/* -There will be a link error if there is not this amount of RAM free at the end. -*/ -_Minimum_Stack_Size = 0x500 ; - /* this sends all unreferenced IRQHandlers to reset */ -PROVIDE(Default_Handler = 0 ); -PROVIDE(NMI_Handler = Default_Handler ); -PROVIDE(HardFault_Handler = Default_Handler ); -PROVIDE(MemManage_Handler = Default_Handler ); -PROVIDE(BusFault_Handler = Default_Handler ); -PROVIDE(UsageFault_Handler = Default_Handler ); -PROVIDE(SVC_Handler = Default_Handler ); -PROVIDE(DebugMonitor_Handler = Default_Handler ); -PROVIDE(PendSV_Handler = Default_Handler ); -PROVIDE(SysTick_Handler = Default_Handler ); -PROVIDE(halTimer1Isr = Default_Handler ); -PROVIDE(halTimer2Isr = Default_Handler ); -PROVIDE(halManagementIsr = Default_Handler ); -PROVIDE(halBaseBandIsr = Default_Handler ); -PROVIDE(halSleepTimerIsr = Default_Handler ); -PROVIDE(halSc1Isr = Default_Handler ); -PROVIDE(halSc2Isr = Default_Handler ); -PROVIDE(halSecurityIsr = Default_Handler ); -PROVIDE(halStackMacTimerIsr = Default_Handler ); -PROVIDE(stmRadioTransmitIsr = Default_Handler ); -PROVIDE(stmRadioReceiveIsr = Default_Handler ); -PROVIDE(halAdcIsr = Default_Handler ); -PROVIDE(halIrqAIsr = Default_Handler ); -PROVIDE(halIrqBIsr = Default_Handler ); -PROVIDE(halIrqCIsr = Default_Handler ); -PROVIDE(halIrqDIsr = Default_Handler ); -PROVIDE(halDebugIsr = Default_Handler ); -/*PROVIDE(stSerialPrintf = printf );*/ +PROVIDE(NMI_Handler = 0 ); +PROVIDE(HardFault_Handler = 0 ); +PROVIDE(MemManage_Handler = 0 ); +PROVIDE(BusFault_Handler = 0 ); +PROVIDE(UsageFault_Handler = 0 ); +PROVIDE(SVC_Handler = 0 ); +PROVIDE(DebugMonitor_Handler = 0 ); +PROVIDE(PendSV_Handler = 0 ); +PROVIDE(SysTick_Handler = 0 ); +PROVIDE(halTimer1Isr = 0 ); +PROVIDE(halTimer2Isr = 0 ); +PROVIDE(halManagementIsr = 0 ); +PROVIDE(halBaseBandIsr = 0 ); +PROVIDE(halSleepTimerIsr = 0 ); +PROVIDE(halSc1Isr = 0 ); +PROVIDE(halSc2Isr = 0 ); +PROVIDE(halSecurityIsr = 0 ); +PROVIDE(halStackMacTimerIsr = 0 ); +PROVIDE(stmRadioTransmitIsr = 0 ); +PROVIDE(stmRadioReceiveIsr = 0 ); +PROVIDE(halAdcIsr = 0 ); +PROVIDE(halIrqAIsr = 0 ); +PROVIDE(halIrqBIsr = 0 ); +PROVIDE(halIrqCIsr = 0 ); +PROVIDE(halIrqDIsr = 0 ); +PROVIDE(halDebugIsr = 0 ); /******************************************************************************/ /* Peripheral memory map */ /******************************************************************************/ /*this allows to compile the ST lib in "non-debug" mode*/ - - +_BOOTLOADER_SIZE = 0x3000 ; +_ROM_base = DEFINED(ST_BTL) ? (0x08000000 + _BOOTLOADER_SIZE) : 0x08000000 ; /* include the memory spaces definitions sub-script */ MEMORY { RAM_region (xrw) : ORIGIN = 0x20000000, LENGTH = 8K - ROM_region (rx) : ORIGIN = 0x08000000, LENGTH = 128K-3K - NVM_region (rx) : ORIGIN = 0x0801F400, LENGTH = 3K + ROM_region (rx) : ORIGIN = 0x08000000, LENGTH = 128K-2K + NVM_region (rx) : ORIGIN = 0x0801F800, LENGTH = 2K FIB_region (ra) : ORIGIN = 0x08040000, LENGTH = 2K } -/* higher address of the user mode stack */ -_estack = 0x20002000; /* Sections management for FLASH mode */ @@ -87,9 +81,12 @@ SECTIONS { /* for Cortex devices, the beginning of the startup code is stored in the .isr_vector section, which goes to FLASH */ - .isr_vector : + + .isr_vector (DEFINED(ST_BTL) ? (0x08000000 + _BOOTLOADER_SIZE) : 0x08000000) : { . = ALIGN(4); + __ApplicationFlashStart = . ; + /* . = . + _ROM_base ;*/ KEEP(*(.isr_vector)) /* Startup code */ . = ALIGN(4); } >ROM_region @@ -113,24 +110,12 @@ SECTIONS *(.rodata*) *(.glue_7) *(.glue_7t) - . = ALIGN(1024); - *(.elf_text) - . = ALIGN(1024); - /*. = ALIGN(4);*/ + + . = ALIGN(4); _etext = .; - /* This is used by the startup in order to initialize the .data section */ + /* This is used by the startup in order to initialize the .data secion */ _sidata = _etext; } >ROM_region - - .coffee 0x08010000 : - { - _coffee_start = ABSOLUTE(.); - . = ALIGN(1024); - *(.coffeefiles) - . = ORIGIN(NVM_region) - _coffee_start; - } > ROM_region = 0x00 - - NVM (NOLOAD): { . = ALIGN(1024); @@ -146,6 +131,12 @@ SECTIONS . = ALIGN(4); } > FIB_region +/* + .FAT (NOLOAD): + { + KEEP(*(.FAT)) + } > FIB_region +*/ /* after that it's only debugging information. */ @@ -153,10 +144,10 @@ SECTIONS The program executes knowing that the data is in the RAM but the loader puts the initial values in the FLASH (inidata). It is one task of the startup to copy the initial values from FLASH to RAM. */ - .data : AT ( _sidata ) + .data _estack : AT ( _sidata ) { . = ALIGN(4); - /* This is used by the startup in order to initialize the .data section */ + /* This is used by the startup in order to initialize the .data secion */ _sdata = . ; *(.data) @@ -165,9 +156,9 @@ SECTIONS . = ALIGN(4); /* This is used by the startup in order to initialize the .data secion */ _edata = . ; - ASSERT(_sidata + SIZEOF(.data) < LOADADDR(.coffee), ".data section overflow in ROM"); } >RAM_region + /* This is the uninitialized data section */ .bss : @@ -177,6 +168,7 @@ SECTIONS _sbss = .; *(.bss) + *(.bss.*) *(COMMON) . = ALIGN(4); @@ -186,21 +178,6 @@ SECTIONS PROVIDE ( end = _ebss ); PROVIDE ( _end = _ebss ); - - /* This is the user stack section - This is just to check that there is enough RAM left for the User mode stack - It should generate an error if it's full. - */ - ._usrstack : - { - . = ALIGN(4); - _susrstack = . ; - - . = . + _Minimum_Stack_Size ; - - . = ALIGN(4); - _eusrstack = . ; - } >RAM_region __exidx_start = .; __exidx_end = .; @@ -247,3 +224,5 @@ SECTIONS .debug_typenames 0 : { *(.debug_typenames) } .debug_varnames 0 : { *(.debug_varnames) } } + +__ApplicationFlashEnd = _sidata + (_edata - _sdata); diff --git a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/iar-cfg.icf b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/iar-cfg.icf index 74124aac2..d8ed9ee43 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/iar-cfg.icf +++ b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/iar-cfg.icf @@ -1,13 +1,21 @@ + +if( isdefinedsymbol(ST_BTL) ) { +define symbol __ICFEDIT_intvec_start__ = 0x08003000; +define symbol __ICFEDIT_region_ROM_start__ = 0x08003000; +} else { define symbol __ICFEDIT_intvec_start__ = 0x08000000; -/*-Memory Regions-*/ define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; +} + +/*-Memory Regions-*/ define symbol __ICFEDIT_region_ROM_end__ = 0x0801FFFF; define symbol __ICFEDIT_region_FIB_start__ = 0x08040000; define symbol __ICFEDIT_region_FIB_end__ = 0x080407FF; define symbol __ICFEDIT_region_RAM_start__ = 0x20000000; define symbol __ICFEDIT_region_RAM_end__ = 0x20001FFF; /*-Sizes-*/ -define symbol __ICFEDIT_size_cstack__ = 0x500; +define symbol __ICFEDIT_size_cstack__ = 0x400; + define memory mem with size = 4G; @@ -15,16 +23,17 @@ define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFED define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; +define block FLASH_IMAGE with fixed order { readonly section .intvec, readonly } ; initialize by copy { readwrite }; do not initialize { section .noinit, section FAT, section NVM }; -place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; - place at address mem:__ICFEDIT_region_FIB_start__ { section FAT }; -place in ROM_region { readonly }; +place in ROM_region { block FLASH_IMAGE }; + place at end of ROM_region { section NVM }; place in RAM_region { readwrite, block CSTACK }; + diff --git a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/low_level_init.c b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/low_level_init.c index 1ab3d3324..790ef608e 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/low_level_init.c +++ b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/low_level_init.c @@ -31,10 +31,24 @@ extern "C" { __root __no_init const HalFixedAddressTableType halFixedAddressTable @ __FAT__; extern const HalVectorTableType __vector_table[]; +extern void halInternalSwitchToXtal(void); +#define IAP_BOOTLOADER_APP_SWITCH_SIGNATURE 0xb001204d +#define IAP_BOOTLOADER_MODE_UART 0 __interwork int __low_level_init(void); +static void setStackPointer(int32u address) +{ + asm("MOVS SP, r0"); +} + +static const int16u blOffset[] = { + 0x0715 - 0x03ad - 0x68, + 0x0719 - 0x03ad - 0x6C +}; + + __interwork int __low_level_init(void) { //Ensure there is enough margin on VREG_1V8 for stable RAM reads by @@ -154,6 +168,21 @@ __interwork int __low_level_init(void) while(1) { ; } } + //USART bootloader software activation check + if ((*((int32u *)RAM_BOTTOM) == IAP_BOOTLOADER_APP_SWITCH_SIGNATURE) && (*((int8u *)(RAM_BOTTOM+4)) == IAP_BOOTLOADER_MODE_UART)){ + int8u cut = *(volatile int8u *) 0x08040798; + int16u offset = 0; + typedef void (*EntryPoint)(void); + offset = (halFixedAddressTable.baseTable.version == 3) ? blOffset[cut - 2] : 0; + *((int32u *)RAM_BOTTOM) = 0; + if (offset) { + halInternalSwitchToXtal(); + } + EntryPoint entryPoint = (EntryPoint)(*(int32u *)(FIB_BOTTOM+4) - offset); + setStackPointer(*(int32u *)FIB_BOTTOM); + entryPoint(); + } + INTERRUPTS_OFF(); asm("CPSIE i"); diff --git a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/regs.h b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/regs.h index 31ab3b216..aa0572be2 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/regs.h +++ b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/regs.h @@ -2,6 +2,9 @@ #define __REGS_H__ 1 +#define ReadRegister(a) a +#define WriteRegister(a, b) a = b + /* FLASH_BASE block */ #define DATA_FLASH_BASE_BASE (0x00000000u) #define DATA_FLASH_BASE_END (0x0001FFFFu) diff --git a/cpu/stm32w108/hal/micro/cortexm3/temperature_sensor.c b/cpu/stm32w108/hal/micro/cortexm3/temperature_sensor.c index d8958abe8..dfc212ac4 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/temperature_sensor.c +++ b/cpu/stm32w108/hal/micro/cortexm3/temperature_sensor.c @@ -29,18 +29,17 @@ void temperatureSensor_Init(void) #endif /* ENABLE_ADC_EXTENDED_RANGE_BROKEN */ }/* end temperatureSensor_Init() */ -int32u temperatureSensor_GetValue(int8u type) +int32u temperatureSensor_GetValue(void) { static int16u ADCvalue; static int16s volts; - /* - NOTE: - The ADC extended range is inaccurate due to the high voltage mode bug of the general purpose ADC - (see STM32W108 errata). As consequence, it is not reccomended to use this ADC driver for getting - the temperature values. - */ -#ifdef ENABLE_ADC_EXTENDED_RANGE_BROKEN + /* + NOTE: + The ADC extended range is inaccurate due to the high voltage mode bug of the general purpose ADC + (see STM32W108 errata). As consequence, it is not reccomended to use this ADC driver for getting + the temperature values. + */ halStartAdcConversion(ADC_USER_APP, ADC_REF_INT, ADC_SOURCE_ADC2_VREF2, ADC_CONVERSION_TIME_US_4096); halReadAdcBlocking(ADC_USER_APP, &ADCvalue); // This blocks for a while, about 4ms. @@ -49,6 +48,5 @@ int32u temperatureSensor_GetValue(int8u type) volts = halConvertValueToVolts(ADCvalue); return ((18641 - (int32s)volts)*100)/1171; -#endif /* ENABLE_ADC_EXTENDED_RANGE_BROKEN */ }/* end temperatureSensor_GetValue() */ diff --git a/cpu/stm32w108/hal/micro/generic/compiler/platform-common.h b/cpu/stm32w108/hal/micro/generic/compiler/platform-common.h index c823c2d86..3e939cf0f 100644 --- a/cpu/stm32w108/hal/micro/generic/compiler/platform-common.h +++ b/cpu/stm32w108/hal/micro/generic/compiler/platform-common.h @@ -135,18 +135,6 @@ int8s halCommonMemCompare(const void *source0, const void *source1, int8u bytes); - /** - * @brief Works like C stdlib memcmp(), but takes a flash space source - * parameter. - */ - int8s halCommonMemPGMCompare(const void *source0, void PGM *source1, int8u bytes); - - /** - * @brief Same as the C stdlib memcpy(), but handles copying from const - * program space. - */ - void halCommonMemPGMCopy(void* dest, void PGM *source, int8u bytes); - /** * @brief Friendly convenience macro pointing to the full HAL function. */ diff --git a/cpu/stm32w108/hal/micro/led.h b/cpu/stm32w108/hal/micro/led.h index b0bd24a0d..f6dcd0cc9 100644 --- a/cpu/stm32w108/hal/micro/led.h +++ b/cpu/stm32w108/hal/micro/led.h @@ -49,16 +49,9 @@ void halSetLed(HalBoardLed led); */ void halClearLed(HalBoardLed led); -/** @brief Called by the stack to indicate activity over the radio (for - * both transmission and reception). It is called once with \c turnOn TRUE and - * shortly thereafter with \c turnOn FALSE. - * - * Typically does something interesting, such as change the state of - * an LED. - * - * @param turnOn See Usage. - */ -void halStackIndicateActivity(boolean turnOn); +#ifdef CORTEXM3_STM32F103 +#include "micro/cortexm3/stm32f103ret/led-specific.h" +#endif /** @} // END addtogroup */ diff --git a/cpu/stm32w108/hal/micro/micro-common.h b/cpu/stm32w108/hal/micro/micro-common.h index d187f4fd1..db4895361 100644 --- a/cpu/stm32w108/hal/micro/micro-common.h +++ b/cpu/stm32w108/hal/micro/micro-common.h @@ -15,6 +15,15 @@ #ifndef __MICRO_COMMON_H__ #define __MICRO_COMMON_H__ +#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef __STSTATUS_TYPE__ +#define __STSTATUS_TYPE__ + //This is necessary here because halSleepForQsWithOptions returns an + //StStatus and not adding this typedef to this file breaks a + //whole lot of builds. + typedef int8u StStatus; +#endif //__STSTATUS_TYPE__ +#endif // DOXYGEN_SHOULD_SKIP_THIS /** @brief Initializes microcontroller-specific peripherals. */ @@ -109,6 +118,28 @@ enum */ void halCommonDelayMicroseconds(int16u us); +/** @brief Request the appplication to enter in bootloader mode + * + * This function will check whwther the user flash contains the bootloader + * and if yes it will jump into it according to the user parameters. + * + * + * @param mode The bootloader mode, 0 UART mode, 1 RF mode. All other + * values are reserved + * @param channel The channel where the booloader will operate. 0 means + * default channel (only vaild for RF mode). + * @param panID The panID where the booloader will operate. 0xFFFF means + * default panID (only vaild for RF mode). + * @return An error code or it will never return. + */ +StStatus halBootloaderStart(int8u mode, int8u channel, int16u panId); + +#ifdef CORTEXM3_STM32F103 +#include "micro/cortexm3/stm32f103ret/micro-specific.h" +#endif +#ifdef CORTEXM3_STM32W108 +#include "micro/cortexm3/micro-common.h" +#endif #endif //__MICRO_COMMON_H__ diff --git a/cpu/stm32w108/hal/micro/system-timer.h b/cpu/stm32w108/hal/micro/system-timer.h index 0d4ba9591..3b18651ac 100644 --- a/cpu/stm32w108/hal/micro/system-timer.h +++ b/cpu/stm32w108/hal/micro/system-timer.h @@ -48,9 +48,9 @@ int16u halInternalStartSystemTimer(void); * @return The least significant 16 bits of the current system time, in system * ticks. */ -//#pragma pagezero_on // place this function in zero-page memory for xap +#pragma pagezero_on // place this function in zero-page memory for xap int16u halCommonGetInt16uMillisecondTick(void); -//#pragma pagezero_off +#pragma pagezero_off /** * @brief Returns the current system time in system ticks, as a 32-bit diff --git a/cpu/stm32w108/hal/micro/temperature_sensor.h b/cpu/stm32w108/hal/micro/temperature_sensor.h index 073bfc0ce..49aec4d86 100644 --- a/cpu/stm32w108/hal/micro/temperature_sensor.h +++ b/cpu/stm32w108/hal/micro/temperature_sensor.h @@ -21,7 +21,7 @@ void temperatureSensor_Init(void); /** @brief Get temperature sensor value */ -int32u temperatureSensor_GetValue(int8u type); +int32u temperatureSensor_GetValue(void); #endif /* _TEMP_SENSOR_H_ */ diff --git a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/iar-cfg-coffee.icf b/cpu/stm32w108/iar-cfg-coffee.icf similarity index 76% rename from cpu/stm32w108/hal/micro/cortexm3/stm32w108/iar-cfg-coffee.icf rename to cpu/stm32w108/iar-cfg-coffee.icf index 02531fe92..60f739572 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/iar-cfg-coffee.icf +++ b/cpu/stm32w108/iar-cfg-coffee.icf @@ -1,10 +1,17 @@ + +if( isdefinedsymbol(ST_BTL) ) { +define symbol __ICFEDIT_intvec_start__ = 0x08003000; +define symbol __ICFEDIT_region_ROM_start__ = 0x08003000; +} else { define symbol __ICFEDIT_intvec_start__ = 0x08000000; -/*-Memory Regions-*/ define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; -define symbol __ICFEDIT_region_ROM_end__ = 0x0800FFFF; -define symbol __ICFEDIT_region_CFS_start__ = 0x08010000; /* Reserved for contiki flash file system. COFFEE_ADDRESS must be changed also in cfs-coffee-arch.h */ +} + +/*-Memory Regions-*/ +define symbol __ICFEDIT_region_ROM_end__ = 0x0801FFFF; +define symbol __ICFEDIT_region_CFS_start__ = 0x08010c00; /* Reserved for contiki flash file system. COFFEE_ADDRESS must be changed also in cfs-coffee-arch.h */ define symbol __ICFEDIT_region_CFS_end__ = 0x0801F3FF; -define symbol __ICFEDIT_region_NVM_start__ = 0x0801F400; +define symbol __ICFEDIT_region_NVM_start__ = 0x0801F800; define symbol __ICFEDIT_region_NVM_end__ = 0x0801FFFF; define symbol __ICFEDIT_region_FIB_start__ = 0x08040000; define symbol __ICFEDIT_region_FIB_end__ = 0x080407FF; @@ -14,6 +21,7 @@ define symbol __ICFEDIT_region_RAM_end__ = 0x20001FFF; define symbol __ICFEDIT_size_cstack__ = 0x500; + define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region CFS_region = mem:[from __ICFEDIT_region_CFS_start__ to __ICFEDIT_region_CFS_end__]; @@ -21,17 +29,17 @@ define region NVM_region = mem:[from __ICFEDIT_region_NVM_start__ to __ICFED define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; +define block FLASH_IMAGE with fixed order { readonly section .intvec, readonly } ; initialize by copy { readwrite }; do not initialize { section .noinit, section FAT, section NVM }; -place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; - place at address mem:__ICFEDIT_region_FIB_start__ { section FAT }; -place in ROM_region { readonly }; +place in ROM_region { block FLASH_IMAGE }; place in CFS_region { section .coffeefiles }; place in NVM_region { section NVM }; place in RAM_region { readwrite, block CSTACK }; + diff --git a/cpu/stm32w108/iar-cfg.icf b/cpu/stm32w108/iar-cfg.icf new file mode 100644 index 000000000..46e67a7a3 --- /dev/null +++ b/cpu/stm32w108/iar-cfg.icf @@ -0,0 +1,39 @@ + +if( isdefinedsymbol(ST_BTL) ) { +define symbol __ICFEDIT_intvec_start__ = 0x08003000; +define symbol __ICFEDIT_region_ROM_start__ = 0x08003000; +} else { +define symbol __ICFEDIT_intvec_start__ = 0x08000000; +define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; +} + +/*-Memory Regions-*/ +define symbol __ICFEDIT_region_ROM_end__ = 0x0801FFFF; +define symbol __ICFEDIT_region_FIB_start__ = 0x08040000; +define symbol __ICFEDIT_region_FIB_end__ = 0x080407FF; +define symbol __ICFEDIT_region_RAM_start__ = 0x20000000; +define symbol __ICFEDIT_region_RAM_end__ = 0x20001FFF; +/*-Sizes-*/ +define symbol __ICFEDIT_size_cstack__ = 0x500; + + + +define memory mem with size = 4G; +define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; +define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; + +define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; +define block FLASH_IMAGE with fixed order { readonly section .intvec, readonly } ; + +initialize by copy { readwrite }; +do not initialize { section .noinit, + section FAT, + section NVM }; + +place at address mem:__ICFEDIT_region_FIB_start__ { section FAT }; +place in ROM_region { block FLASH_IMAGE }; + +place at end of ROM_region { section NVM }; +place in RAM_region { readwrite, + block CSTACK }; + diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio_intonly_thumb2.a b/cpu/stm32w108/lib/e_stdio_intonly_thumb2.a similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio_intonly_thumb2.a rename to cpu/stm32w108/lib/e_stdio_intonly_thumb2.a diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio_thumb2.a b/cpu/stm32w108/lib/e_stdio_thumb2.a similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio_thumb2.a rename to cpu/stm32w108/lib/e_stdio_thumb2.a diff --git a/cpu/stm32w108/hal/micro/cortexm3/smallprintf_thumb2.a b/cpu/stm32w108/lib/smallprintf_thumb2.a similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/smallprintf_thumb2.a rename to cpu/stm32w108/lib/smallprintf_thumb2.a diff --git a/cpu/stm32w108/simplemac/include/phy-library.h b/cpu/stm32w108/simplemac/include/phy-library.h index 7739811b7..ca21a83e6 100644 --- a/cpu/stm32w108/simplemac/include/phy-library.h +++ b/cpu/stm32w108/simplemac/include/phy-library.h @@ -5,7 +5,6 @@ * */ -#include "stm32w108_type.h" //--------------------------------------------------------------------------- // Definitions @@ -30,7 +29,7 @@ /** * @brief Version patch number */ -#define SIMPLEMAC_VERSION_PATCH 0 +#define SIMPLEMAC_VERSION_PATCH 2 /** * @brief Version qualifier diff --git a/cpu/stm32w108/simplemac/library/simplemac-library-gnu.a b/cpu/stm32w108/simplemac/library/simplemac-library-gnu.a new file mode 100644 index 000000000..0c18ab6c3 Binary files /dev/null and b/cpu/stm32w108/simplemac/library/simplemac-library-gnu.a differ diff --git a/cpu/stm32w108/simplemac/library/simplemac-library-iar.a b/cpu/stm32w108/simplemac/library/simplemac-library-iar.a deleted file mode 100644 index 0d53c5e41..000000000 Binary files a/cpu/stm32w108/simplemac/library/simplemac-library-iar.a and /dev/null differ diff --git a/cpu/stm32w108/simplemac/library/simplemac-library.a b/cpu/stm32w108/simplemac/library/simplemac-library.a index c7e2de988..b79d83a15 100644 Binary files a/cpu/stm32w108/simplemac/library/simplemac-library.a and b/cpu/stm32w108/simplemac/library/simplemac-library.a differ diff --git a/cpu/stm32w108/hal/micro/cortexm3/small_printf/Makefile b/cpu/stm32w108/small_printf/Makefile similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/small_printf/Makefile rename to cpu/stm32w108/small_printf/Makefile diff --git a/cpu/stm32w108/hal/micro/cortexm3/small_printf/_SP_printf.c b/cpu/stm32w108/small_printf/_SP_printf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/small_printf/_SP_printf.c rename to cpu/stm32w108/small_printf/_SP_printf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/small_printf/_SP_puts.c b/cpu/stm32w108/small_printf/_SP_puts.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/small_printf/_SP_puts.c rename to cpu/stm32w108/small_printf/_SP_puts.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/small_printf/_SP_snprintf.c b/cpu/stm32w108/small_printf/_SP_snprintf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/small_printf/_SP_snprintf.c rename to cpu/stm32w108/small_printf/_SP_snprintf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/small_printf/_SP_sprintf.c b/cpu/stm32w108/small_printf/_SP_sprintf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/small_printf/_SP_sprintf.c rename to cpu/stm32w108/small_printf/_SP_sprintf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/small_printf/_SP_vfprintf.c b/cpu/stm32w108/small_printf/_SP_vfprintf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/small_printf/_SP_vfprintf.c rename to cpu/stm32w108/small_printf/_SP_vfprintf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/small_printf/vfieeefp.h b/cpu/stm32w108/small_printf/vfieeefp.h similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/small_printf/vfieeefp.h rename to cpu/stm32w108/small_printf/vfieeefp.h diff --git a/examples/ipso-ipv6-raven/Makefile b/examples/ipso-ipv6-raven/Makefile old mode 100755 new mode 100644 diff --git a/examples/ipso-ipv6-raven/Makefile.ipso b/examples/ipso-ipv6-raven/Makefile.ipso old mode 100755 new mode 100644 diff --git a/examples/ipso-ipv6-raven/ipso.c b/examples/ipso-ipv6-raven/ipso.c old mode 100755 new mode 100644 diff --git a/examples/ipv6/rpl-border-router/Makefile b/examples/ipv6/rpl-border-router/Makefile index fe551f15b..3fd4c82b4 100644 --- a/examples/ipv6/rpl-border-router/Makefile +++ b/examples/ipv6/rpl-border-router/Makefile @@ -5,10 +5,17 @@ CONTIKI=../../.. WITH_UIP6=1 UIP_CONF_IPV6=1 -APPS += webserver +#Override inclusion of internal webserver with make WITH_WEBSERVER=0 +WITH_WEBSERVER=1 +ifeq ($(WITH_WEBSERVER), 0) CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" +PROJECT_SOURCEFILES += slip-bridge.c +else +APPS += webserver +CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" -DWEBSERVER PROJECT_SOURCEFILES += slip-bridge.c httpd-simple.c +endif include $(CONTIKI)/Makefile.include diff --git a/examples/ipv6/rpl-border-router/border-router.c b/examples/ipv6/rpl-border-router/border-router.c index 0a749dc71..a7a31f48e 100644 --- a/examples/ipv6/rpl-border-router/border-router.c +++ b/examples/ipv6/rpl-border-router/border-router.c @@ -45,8 +45,13 @@ #include "net/netstack.h" #include "dev/button-sensor.h" #include "dev/slip.h" + +/* For internal webserver Makefile must set APPS += webserver and PROJECT_SOURCEFILES += httpd-simple.c */ +#if WEBSERVER #include "webserver-nogui.h" #include "httpd-simple.h" +#endif + #include #include #include @@ -65,6 +70,8 @@ static uint8_t prefix_set; PROCESS(border_router_process, "Border router process"); AUTOSTART_PROCESSES(&border_router_process); + +#if WEBSERVER /*---------------------------------------------------------------------------*/ /* Only one single web request at time */ static const char *TOP = "ContikiRPL\n"; @@ -151,6 +158,9 @@ httpd_simple_get_script(const char *name) { return generate_routes; } + +#endif /* WEBSERVER */ + /*---------------------------------------------------------------------------*/ static void print_local_addresses(void) @@ -158,14 +168,14 @@ print_local_addresses(void) int i; uint8_t state; - PRINTF("Server IPv6 addresses:\n"); + PRINTA("Server IPv6 addresses:\n"); for(i = 0; i < UIP_DS6_ADDR_NB; i++) { state = uip_ds6_if.addr_list[i].state; if(uip_ds6_if.addr_list[i].isused && (state == ADDR_TENTATIVE || state == ADDR_PREFERRED)) { - blen = 0; - ipaddr_add(&uip_ds6_if.addr_list[i].ipaddr); - PRINTF(" %s\n", buf); + PRINTA(" "); + uip_debug_ipaddr_print(&uip_ds6_if.addr_list[i].ipaddr); + PRINTA("\n"); } } } @@ -174,7 +184,7 @@ void request_prefix(void) { /* mess up uip_buf with a dirty request... */ - uip_buf[0] = '!'; + uip_buf[0] = '?'; uip_buf[1] = 'P'; uip_len = 2; slip_send(); @@ -202,7 +212,10 @@ PROCESS_THREAD(border_router_process, ev, data) PROCESS_PAUSE(); +#if WEBSERVER process_start(&webserver_nogui_process, NULL); +#endif + SENSORS_ACTIVATE(button_sensor); PRINTF("RPL-Border router started\n"); @@ -220,7 +233,9 @@ PROCESS_THREAD(border_router_process, ev, data) PRINTF("created a new RPL dag\n"); } +#if DEBUG || 1 print_local_addresses(); +#endif /* The border router runs with a 100% duty cycle in order to ensure high packet reception rates. */ diff --git a/examples/ipv6/rpl-udp/rpl-udp.csc b/examples/ipv6/rpl-udp/rpl-udp.csc old mode 100755 new mode 100644 diff --git a/examples/ipv6/rpl-udp/udp-client.c b/examples/ipv6/rpl-udp/udp-client.c index f539b41aa..c7c425c7b 100644 --- a/examples/ipv6/rpl-udp/udp-client.c +++ b/examples/ipv6/rpl-udp/udp-client.c @@ -114,9 +114,27 @@ set_global_address(void) uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr); uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF); - /* set server address */ - uip_ip6addr(&server_ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 1); - +/* The choice of server address determines its 6LoPAN header compression. + * (Our address will be compressed Mode 3 since it is derived from our link-local address) + * Obviously the choice made here must also be selected in udp-server.c. + * + * For correct Wireshark decoding using a sniffer, add the /64 prefix to the 6LowPAN protocol preferences, + * e.g. set Context 0 to aaaa::. At present Wireshark copies Context/128 and then overwrites it. + * (Setting Context 0 to aaaa::1111:2222:3333:4444 will report a 16 bit compressed address of aaaa::1111:22ff:fe33:xxxx) + * + * Note the IPCMV6 checksum verification depends on the correct uncompressed addresses. + */ + +#if 0 +/* Mode 1 - 64 bits inline */ + uip_ip6addr(&server_ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 1); +#elif 1 +/* Mode 2 - 16 bits inline */ + uip_ip6addr(&server_ipaddr, 0xaaaa, 0, 0, 0, 0, 0x00ff, 0xfe00, 1); +#else +/* Mode 3 - derived from server link-local (MAC) address */ + uip_ip6addr(&server_ipaddr, 0xaaaa, 0, 0, 0, 0x0250, 0xc2ff, 0xfea8, 0xcd1a); //redbee-econotag +#endif } /*---------------------------------------------------------------------------*/ PROCESS_THREAD(udp_client_process, ev, data) diff --git a/examples/ipv6/rpl-udp/udp-server.c b/examples/ipv6/rpl-udp/udp-server.c index e9e98d346..0a5f83e93 100644 --- a/examples/ipv6/rpl-udp/udp-server.c +++ b/examples/ipv6/rpl-udp/udp-server.c @@ -108,8 +108,27 @@ PROCESS_THREAD(udp_server_process, ev, data) PRINTF("UDP server started\n"); #if UIP_CONF_ROUTER - uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 1); - /* uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr); */ +/* The choice of server address determines its 6LoPAN header compression. + * Obviously the choice made here must also be selected in udp-client.c. + * + * For correct Wireshark decoding using a sniffer, add the /64 prefix to the 6LowPAN protocol preferences, + * e.g. set Context 0 to aaaa::. At present Wireshark copies Context/128 and then overwrites it. + * (Setting Context 0 to aaaa::1111:2222:3333:4444 will report a 16 bit compressed address of aaaa::1111:22ff:fe33:xxxx) + * Note Wireshark's IPCMV6 checksum verification depends on the correct uncompressed addresses. + */ + +#if 0 +/* Mode 1 - 64 bits inline */ + uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 1); +#elif 1 +/* Mode 2 - 16 bits inline */ + uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0x00ff, 0xfe00, 1); +#else +/* Mode 3 - derived from link local (MAC) address */ + uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0); + uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr); +#endif + uip_ds6_addr_add(&ipaddr, 0, ADDR_MANUAL); root_if = uip_ds6_addr_lookup(&ipaddr); if(root_if != NULL) { diff --git a/examples/ipv6/sky-websense/websense-remote.c b/examples/ipv6/sky-websense/websense-remote.c index aad3022f7..a30da909f 100644 --- a/examples/ipv6/sky-websense/websense-remote.c +++ b/examples/ipv6/sky-websense/websense-remote.c @@ -46,13 +46,13 @@ #include /* The address of the server to register the services for this node */ -#define SERVER "aaaa::1" +#define SERVER "[aaaa::1]" /* This command registers two services (/0 and /1) to turn the leds on or off */ #define REGISTER_COMMAND "/r?p=0&d=Turn%20off%20leds&p=1&d=Turn%20on%20leds" /* The address of the other node to control */ -#define OTHER_NODE "aaaa::212:7403:3:303" +#define OTHER_NODE "[aaaa::1]" /* The commands to send to the other node */ #define SET_LEDS_ON "/1" diff --git a/examples/rest-example/Makefile b/examples/rest-example/Makefile index ea81c174e..d7d9590b7 100644 --- a/examples/rest-example/Makefile +++ b/examples/rest-example/Makefile @@ -1,4 +1,4 @@ -all: rest-server-example +all: rest-server-example coap-client-example ifndef TARGET TARGET=sky diff --git a/examples/rest-example/coap-client-example.c b/examples/rest-example/coap-client-example.c index b88b0ca2a..c9e6e3776 100644 --- a/examples/rest-example/coap-client-example.c +++ b/examples/rest-example/coap-client-example.c @@ -1,5 +1,6 @@ #include #include +#include #include "contiki.h" #include "contiki-net.h" #include "rest.h" diff --git a/examples/rest-example/project-conf.h b/examples/rest-example/project-conf.h index 43528a30c..e55e28419 100644 --- a/examples/rest-example/project-conf.h +++ b/examples/rest-example/project-conf.h @@ -26,22 +26,26 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: project-conf.h,v 1.1 2010/10/28 13:11:08 doganyazar Exp $ + * */ #ifndef __PROJECT_RPL_WEB_CONF_H__ #define __PROJECT_RPL_WEB_CONF_H__ -#undef QUEUEBUF_CONF_NUM +#ifndef QUEUEBUF_CONF_NUM #define QUEUEBUF_CONF_NUM 6 +#endif -#undef UIP_CONF_BUFFER_SIZE +#ifndef UIP_CONF_BUFFER_SIZE #define UIP_CONF_BUFFER_SIZE 140 +#endif -#undef UIP_CONF_RECEIVE_WINDOW +#ifndef UIP_CONF_RECEIVE_WINDOW #define UIP_CONF_RECEIVE_WINDOW 60 +#endif -#undef WEBSERVER_CONF_CFS_CONNS +#ifndef WEBSERVER_CONF_CFS_CONNS #define WEBSERVER_CONF_CFS_CONNS 2 +#endif #endif /* __PROJECT_RPL_WEB_CONF_H__ */ diff --git a/examples/sky/test-coffee.c b/examples/sky/test-coffee.c old mode 100755 new mode 100644 diff --git a/platform/avr-atmega128rfa1/Makefile.avr-atmega128rfa1 b/platform/avr-atmega128rfa1/Makefile.avr-atmega128rfa1 index 9e8b7ea75..d845dd61f 100644 --- a/platform/avr-atmega128rfa1/Makefile.avr-atmega128rfa1 +++ b/platform/avr-atmega128rfa1/Makefile.avr-atmega128rfa1 @@ -3,6 +3,8 @@ CONTIKI_TARGET_DIRS = . apps net loader CONTIKI_CORE=contiki-main CONTIKI_TARGET_MAIN = ${CONTIKI_CORE}.o CONTIKI_TARGET_SOURCEFILES += contiki-main.c +#Needed for slip +CONTIKI_TARGET_SOURCEFILES += button-sensor.c sensors.c slip_uart0.c slip.c CONTIKIAVR=$(CONTIKI)/cpu/avr CONTIKIBOARD=. diff --git a/platform/avr-atmega128rfa1/button-sensor.c b/platform/avr-atmega128rfa1/button-sensor.c new file mode 100644 index 000000000..4daf2237e --- /dev/null +++ b/platform/avr-atmega128rfa1/button-sensor.c @@ -0,0 +1,45 @@ +/* Dummy sensor routine */ + +#include "lib/sensors.h" +#include "dev/button-sensor.h" +const struct sensors_sensor button_sensor; +static int status(int type); +struct sensors_sensor *sensors[1]; +unsigned char sensors_flags[1]; + + +static int +value(int type) +{ + return 0; +} + +static int +configure(int type, int c) +{ + switch (type) { + case SENSORS_ACTIVE: + if (c) { + if(!status(SENSORS_ACTIVE)) { + } + } else { + } + return 1; + } + return 0; +} + +static int +status(int type) +{ + switch (type) { + case SENSORS_ACTIVE: + case SENSORS_READY: + return 1; + } + return 0; +} + +SENSORS_SENSOR(button_sensor, BUTTON_SENSOR, + value, configure, status); + diff --git a/platform/avr-atmega128rfa1/contiki-main.c b/platform/avr-atmega128rfa1/contiki-main.c index a607b6700..b20608adc 100644 --- a/platform/avr-atmega128rfa1/contiki-main.c +++ b/platform/avr-atmega128rfa1/contiki-main.c @@ -28,19 +28,14 @@ * * This file is part of the Contiki operating system. * - * @(#)$$ */ +#ifndef LED_ON_PORT1E +#define LED_ON_PORTE1 0 //for Michael Hartman's prototype board +#endif #define ANNOUNCE_BOOT 1 //adds about 600 bytes to program size -#define DEBUG 0 -#if DEBUG -#define PRINTF(FORMAT,args...) printf_P(PSTR(FORMAT),##args) -#define PRINTSHORT(FORMAT,args...) printf_P(PSTR(FORMAT),##args) - -#else -#define PRINTF(...) -#define PRINTSHORT(...) -#endif +#define DEBUG DEBUG_PRINT +#include "uip-debug.h" ////Does #define PRINTA(FORMAT,args...) printf_P(PSTR(FORMAT),##args) for AVR #include #include @@ -96,6 +91,21 @@ #include "net/rime.h" +/* Test rtimers, also for pings, stack monitor, neighbor/route printout and time stamps */ +#define TESTRTIMER 1 +#if TESTRTIMER +//#define PINGS 64 +#define ROUTES 64 +#define STAMPS 30 +#define STACKMONITOR 128 + +uint8_t rtimerflag=1; +uint16_t rtime; +struct rtimer rt; +void rtimercycle(void) {rtimerflag=1;} + +#endif /* TESTRTIMER */ + /*-------------------------------------------------------------------------*/ /*----------------------Configuration of the .elf file---------------------*/ typedef struct {unsigned char B2;unsigned char B1;unsigned char B0;} __signature_t; @@ -120,7 +130,7 @@ extern uint8_t mac_address[8]; //These are defined in httpd-fsdata.c via mak extern uint8_t server_name[16]; extern uint8_t domain_name[30]; #else -uint8_t mac_address[8] PROGMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55}; +uint8_t mac_address[8] EEMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55}; #endif @@ -171,15 +181,16 @@ extern uint8_t osccal_calibrated; /*------Done in a subroutine to keep main routine stack usage small--------*/ void initialize(void) { - watchdog_init(); - watchdog_start(); - -#ifdef RAVEN_LCD_INTERFACE +#if !LED_ON_PORTE1 //Conflicts with USART0 +#if RAVEN_LCD_INTERFACE /* First rs232 port for Raven 3290 port */ - //conflicts with led on Hartmann's board, so bypass for now -// rs232_init(RS232_PORT_0, USART_BAUD_38400,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8); + rs232_init(RS232_PORT_0, USART_BAUD_38400,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8); /* Set input handler for 3290 port */ -// rs232_set_input(0,raven_lcd_serial_input); + rs232_set_input(0,raven_lcd_serial_input); +#else + //Slip border router on uart0 + rs232_init(RS232_PORT_0, USART_BAUD_38400,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8); +#endif #endif /* Second rs232 port for debugging */ @@ -187,27 +198,55 @@ void initialize(void) /* Redirect stdout to second port */ rs232_redirect_stdout(RS232_PORT_1); clock_init(); + +#if 1 + if(MCUSR & (1< //#define delay_us( us ) ( _delay_loop_2(1+(us*F_CPU)/4000000UL) ) // delay_us(50000); } clock_init(); + watchdog_start(); } #endif #if ANNOUNCE_BOOT - printf_P(PSTR("\n*******Booting %s*******\n"),CONTIKI_VERSION_STRING); + PRINTA("\n*******Booting %s*******\n",CONTIKI_VERSION_STRING); #endif - watchdog_start(); + /* rtimers needed for radio cycling */ rtimer_init(); @@ -249,19 +288,19 @@ uint8_t i; NETSTACK_NETWORK.init(); #if ANNOUNCE_BOOT - printf_P(PSTR("%s %s, channel %u"),NETSTACK_MAC.name, NETSTACK_RDC.name,rf230_get_channel()); + PRINTA("%s %s, channel %u",NETSTACK_MAC.name, NETSTACK_RDC.name,rf230_get_channel()); if (NETSTACK_RDC.channel_check_interval) {//function pointer is zero for sicslowmac unsigned short tmp; tmp=CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval == 0 ? 1:\ NETSTACK_RDC.channel_check_interval()); - if (tmp<65535) printf_P(PSTR(", check rate %u Hz"),tmp); + if (tmp<65535) PRINTA(", check rate %u Hz",tmp); } - printf_P(PSTR("\n")); + PRINTA("\n"); #endif #if UIP_CONF_ROUTER #if ANNOUNCE_BOOT - printf_P(PSTR("Routing Enabled\n")); + PRINTA("Routing Enabled\n"); #endif // rime_init(rime_udp_init(NULL)); // uip_router_register(&rimeroute); @@ -289,13 +328,13 @@ uint8_t i; #if COFFEE_FILES int fa = cfs_open( "/index.html", CFS_READ); if (fa<0) { //Make some default web content - printf_P(PSTR("No index.html file found, creating upload.html!\n")); - printf_P(PSTR("Formatting FLASH file system for coffee...")); + PRINTF("No index.html file found, creating upload.html!\n"); + PRINTA("Formatting FLASH file system for coffee..."); cfs_coffee_format(); - printf_P(PSTR("Done!\n")); + PRINTA("Done!\n"); fa = cfs_open( "/index.html", CFS_WRITE); int r = cfs_write(fa, &"It works!", 9); - if (r<0) printf_P(PSTR("Can''t create /index.html!\n")); + if (r<0) PRINTF("Can''t create /index.html!\n"); cfs_close(fa); // fa = cfs_open("upload.html"), CFW_WRITE); //
@@ -323,29 +362,29 @@ uint8_t i; for (i=0;i>10); + PRINTA(".%s online with dynamic %u KB EEPROM file system\n",buf,size>>10); #elif COFFEE_FILES==3 - printf_P(PSTR(".%s online with static %u byte program memory file system\n"),buf,size); + PRINTA(".%s online with static %u byte program memory file system\n",buf,size); #elif COFFEE_FILES==4 - printf_P(PSTR(".%s online with dynamic %u KB program memory file system\n"),buf,size>>10); + PRINTA(".%s online with dynamic %u KB program memory file system\n",buf,size>>10); #endif /* COFFEE_FILES */ #else - printf_P(PSTR("Online\n")); + PRINTA("Online\n"); #endif /* WEBSERVER */ #endif /* ANNOUNCE_BOOT */ @@ -354,18 +393,8 @@ uint8_t i; /*---------------------------------------------------------------------------*/ void log_message(char *m1, char *m2) { - printf_P(PSTR("%s%s\n"), m1, m2); + PRINTA("%s%s\n", m1, m2); } -/* Test rtimers, also useful for pings and time stamps in simulator */ -#define TESTRTIMER 0 -#if TESTRTIMER -#define PINGS 60 -#define STAMPS 30 -uint8_t rtimerflag=1; -uint16_t rtime; -struct rtimer rt; -void rtimercycle(void) {rtimerflag=1;} -#endif /* TESTRTIMER */ #if RF230BB extern char rf230_interrupt_flag, rf230processflag; @@ -379,98 +408,152 @@ uint16_t ledtimer; int main(void) { -#define CONFIG_STACK_MONITOR 1 -#if CONFIG_STACK_MONITOR -extern uint16_t __bss_end; - __bss_end = 0x4242; - *(uint16_t *)(&__bss_end+100) = 0x4242; -#endif initialize(); +#if LED_ON_PORTE1 /* NB: PORTE1 conflicts with UART0 */ - DDRE|=(1<>16)); -#endif - } +#if STAMPS +if ((rtime%STAMPS)==0) { + PRINTA("%us ",rtime); +} #endif rtime+=1; + #if PINGS - if ((rtime%PINGS)==0) { - PRINTF("**Ping\n"); - raven_ping6(); - } +extern void raven_ping6(void); +if ((rtime%PINGS)==1) { + PRINTA("**Ping\n"); + raven_ping6(); +} #endif + +#if ROUTES +if ((rtime%ROUTES)==2) { + +extern uip_ds6_nbr_t uip_ds6_nbr_cache[]; +extern uip_ds6_route_t uip_ds6_routing_table[]; +extern uip_ds6_netif_t uip_ds6_if; + + uint8_t i,j; + PRINTA("\nAddresses [%u max]\n",UIP_DS6_ADDR_NB); + for (i=0;i"); + PRINTA("\nRoutes [%u max]\n",UIP_DS6_ROUTE_NB); + for(i = 0,j=1; i < UIP_DS6_ROUTE_NB; i++) { + if(uip_ds6_routing_table[i].isused) { + uip_debug_ipaddr_print(&uip_ds6_routing_table[i].ipaddr); + PRINTA("/%u (via ", uip_ds6_routing_table[i].length); + uip_debug_ipaddr_print(&uip_ds6_routing_table[i].nexthop); + // if(uip_ds6_routing_table[i].state.lifetime < 600) { + PRINTA(") %lus\n", uip_ds6_routing_table[i].state.lifetime); + // } else { + // PRINTA(")\n"); + // } + j=0; + } + } + if (j) PRINTA(" "); + PRINTA("\n---------\n"); +} #endif +#if STACKMONITOR +if ((rtime%STACKMONITOR)==3) { + extern uint16_t __bss_end; + uint16_t p=(uint16_t)&__bss_end; + do { + if (*(uint16_t *)p != 0x4242) { + PRINTA("Never-used stack > %d bytes\n",p-(uint16_t)&__bss_end); + break; + } + p+=10; + } while (p + */ + +#include +#include "contiki.h" +#include "dev/rs232.h" +#include "slip.h" + +/*---------------------------------------------------------------------------*/ +static int +slip_putchar(char c, FILE *stream) +{ +#define SLIP_END 0300 + static char debug_frame = 0; + + if (!debug_frame) { /* Start of debug output */ + slip_arch_writeb(SLIP_END); + slip_arch_writeb('\r'); /* Type debug line == '\r' */ + debug_frame = 1; + } + + slip_arch_writeb((unsigned char)c); + + /* + * Line buffered output, a newline marks the end of debug output and + * implicitly flushes debug output. + */ + if (c == '\n') { + slip_arch_writeb(SLIP_END); + debug_frame = 0; + } + + return c; +} +/*---------------------------------------------------------------------------*/ +static FILE slip_stdout = FDEV_SETUP_STREAM(slip_putchar, NULL, + _FDEV_SETUP_WRITE); +/*---------------------------------------------------------------------------*/ +void +slip_arch_init(unsigned long ubr) +{ + rs232_set_input(RS232_PORT_0, slip_input_byte); + stdout = &slip_stdout; +} +/*---------------------------------------------------------------------------*/ +/* + XXX: + Currently, the following function is in cpu/avr/dev/rs232.c file. this + should be moved to here from there hence this is a platform specific slip + related function. +void +slip_arch_writeb(unsigned char c) +{ + rs232_send(RS232_PORT_0, c); +} +*/ diff --git a/platform/avr-raven/Makefile.avr-raven b/platform/avr-raven/Makefile.avr-raven index 77750bcf3..4b26db519 100644 --- a/platform/avr-raven/Makefile.avr-raven +++ b/platform/avr-raven/Makefile.avr-raven @@ -3,6 +3,10 @@ CONTIKI_TARGET_DIRS = . apps net loader CONTIKI_CORE=contiki-raven-main CONTIKI_TARGET_MAIN = ${CONTIKI_CORE}.o CONTIKI_TARGET_SOURCEFILES += contiki-raven-main.c contiki-raven-default-init-net.c +#The avr cpu makefile will also add these files if COFFEE_FILES is specified. +#CONTIKI_TARGET_SOURCEFILES += cfs-coffee.c cfs-coffee-arch.c +#Needed for slip +CONTIKI_TARGET_SOURCEFILES += button-sensor.c sensors.c slip_uart0.c slip.c CONTIKIAVR=$(CONTIKI)/cpu/avr CONTIKIBOARD=. @@ -17,12 +21,14 @@ AVRDUDE_PROGRAMMER=jtag2 # # The example is for an JTAGICE mkII used to program an ATmega128: # avrdude -v -P usb:xxxx -c jtag2 -p atmega128 -AVRDUDE_PORT=usb:00B000000D79 +#AVRDUDE_PORT=usb:00B000000D79 +AVRDUDE_PORT=usb # Additional avrdude options # Verify off -AVRDUDE_OPTIONS=-V +#AVRDUDE_OPTIONS=-V +AVRDUDE_OPTIONS= include $(CONTIKIAVR)/Makefile.avr diff --git a/platform/avr-raven/apps/raven-lcd-interface/raven-lcd.c b/platform/avr-raven/apps/raven-lcd-interface/raven-lcd.c index 4fefba2ff..2b6d77386 100644 --- a/platform/avr-raven/apps/raven-lcd-interface/raven-lcd.c +++ b/platform/avr-raven/apps/raven-lcd-interface/raven-lcd.c @@ -65,8 +65,12 @@ #include "contiki.h" #include "contiki-lib.h" #include "contiki-net.h" + +#if WEBSERVER #include "webserver-nogui.h" #include "httpd-cgi.h" +#endif + #include "raven-lcd.h" #include @@ -302,12 +306,16 @@ raven_gui_loop(process_event_t ev, process_data_t data) raven_ping6(); break; case SEND_TEMP: +#if WEBSERVER /* Set temperature string in web server */ web_set_temp((char *)cmd.frame); +#endif break; case SEND_ADC2: +#if WEBSERVER /* Set ext voltage string in web server */ web_set_voltage((char *)cmd.frame); +#endif break; case SEND_SLEEP: /* Sleep radio and 1284p. */ @@ -316,7 +324,8 @@ raven_gui_loop(process_event_t ev, process_data_t data) } else { /* Sleep specified number of seconds (3290p "DOZE" mode) */ /* It sleeps a bit longer so we will be always be awake for the next sleep command. */ - /* Only sleep this cycle if no active TCP/IP connections */ +#if UIP_CONF_TCP + /* Only sleep this cycle if no active TCP/IP connections, for fast browser responsed */ activeconnections=0; for(i = 0; i < UIP_CONNS; ++i) { if((uip_conns[i].tcpstateflags & UIP_TS_MASK) != UIP_CLOSED) activeconnections++; @@ -325,6 +334,7 @@ raven_gui_loop(process_event_t ev, process_data_t data) PRINTF("\nWaiting for %d connections",activeconnections); break; } +#endif } radio_state = NETSTACK_RADIO.off(); PRINTF ("\nsleep %d radio state %d...",cmd.frame[0],radio_state); diff --git a/platform/avr-raven/button-sensor.c b/platform/avr-raven/button-sensor.c new file mode 100644 index 000000000..4daf2237e --- /dev/null +++ b/platform/avr-raven/button-sensor.c @@ -0,0 +1,45 @@ +/* Dummy sensor routine */ + +#include "lib/sensors.h" +#include "dev/button-sensor.h" +const struct sensors_sensor button_sensor; +static int status(int type); +struct sensors_sensor *sensors[1]; +unsigned char sensors_flags[1]; + + +static int +value(int type) +{ + return 0; +} + +static int +configure(int type, int c) +{ + switch (type) { + case SENSORS_ACTIVE: + if (c) { + if(!status(SENSORS_ACTIVE)) { + } + } else { + } + return 1; + } + return 0; +} + +static int +status(int type) +{ + switch (type) { + case SENSORS_ACTIVE: + case SENSORS_READY: + return 1; + } + return 0; +} + +SENSORS_SENSOR(button_sensor, BUTTON_SENSOR, + value, configure, status); + diff --git a/platform/avr-raven/cfs-coffee-arch.c b/platform/avr-raven/cfs-coffee-arch.c index 37d3e1992..86ce3b781 100644 --- a/platform/avr-raven/cfs-coffee-arch.c +++ b/platform/avr-raven/cfs-coffee-arch.c @@ -483,9 +483,9 @@ avr_flash_read(CFS_CONF_OFFSET_TYPE addr, uint8_t *buf, CFS_CONF_OFFSET_TYPE siz BOOTLOADER_SECTION void avr_flash_erase(coffee_page_t sector) { coffee_page_t i; - uint32_t addr32; #if FLASH_COMPLEMENT_DATA + uint32_t addr32; volatile uint8_t sreg; // Disable interrupts. diff --git a/platform/avr-raven/cfs-coffee-arch.h b/platform/avr-raven/cfs-coffee-arch.h index 163b9ec01..ab37f22e9 100644 --- a/platform/avr-raven/cfs-coffee-arch.h +++ b/platform/avr-raven/cfs-coffee-arch.h @@ -52,7 +52,7 @@ #define COFFEE_STATIC 1 #elif COFFEE_FILES==2 //2=eeprom for full file system #define COFFEE_AVR_EEPROM 1 -#elif COFFEE_FILES==2 //3=program flash for static file system +#elif COFFEE_FILES==3 //3=program flash for static file system #define COFFEE_AVR_FLASH 1 #define COFFEE_STATIC 1 #else //4=program flash with full file system diff --git a/platform/avr-raven/contiki-raven-main.c b/platform/avr-raven/contiki-raven-main.c index 2c336c44b..722d90bc8 100644 --- a/platform/avr-raven/contiki-raven-main.c +++ b/platform/avr-raven/contiki-raven-main.c @@ -31,15 +31,13 @@ * @(#)$$ */ #define ANNOUNCE_BOOT 1 //adds about 600 bytes to program size +#define PRINTF(FORMAT,args...) printf_P(PSTR(FORMAT),##args) #define DEBUG 0 #if DEBUG -#define PRINTF(FORMAT,args...) printf_P(PSTR(FORMAT),##args) -#define PRINTSHORT(FORMAT,args...) printf_P(PSTR(FORMAT),##args) - +#define PRINTFD(FORMAT,args...) printf_P(PSTR(FORMAT),##args) #else -#define PRINTF(...) -#define PRINTSHORT(...) +#define PRINTFD(...) #endif #include @@ -95,6 +93,22 @@ #include "net/rime.h" +/* Test rtimers, also for pings, stack monitor, neighbor/route printout and time stamps */ +#define TESTRTIMER 0 +#if TESTRTIMER +//#define PINGS 64 +#define ROUTES 64 +#define STAMPS 30 +#define STACKMONITOR 128 + +uint8_t rtimerflag=1; +uint16_t rtime; +struct rtimer rt; +void rtimercycle(void) {rtimerflag=1;} +static void ipaddr_add(const uip_ipaddr_t *addr); + +#endif /* TESTRTIMER */ + /*-------------------------------------------------------------------------*/ /*----------------------Configuration of the .elf file---------------------*/ typedef struct {unsigned char B2;unsigned char B1;unsigned char B0;} __signature_t; @@ -116,7 +130,7 @@ extern uint8_t mac_address[8]; //These are defined in httpd-fsdata.c via mak extern uint8_t server_name[16]; extern uint8_t domain_name[30]; #else -uint8_t mac_address[8] PROGMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55}; +uint8_t mac_address[8] EEMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55}; #endif @@ -166,13 +180,6 @@ void initialize(void) watchdog_init(); watchdog_start(); -#define CONFIG_STACK_MONITOR 1 -#if CONFIG_STACK_MONITOR -extern uint16_t __bss_end; - __bss_end = 0x4242; - *(uint16_t *)(&__bss_end+100) = 0x4242; -#endif - #ifdef RAVEN_LCD_INTERFACE /* First rs232 port for Raven 3290 port */ rs232_init(RS232_PORT_0, USART_BAUD_38400,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8); @@ -185,16 +192,31 @@ extern uint16_t __bss_end; /* Redirect stdout to second port */ rs232_redirect_stdout(RS232_PORT_1); clock_init(); + +#if STACKMONITOR + /* Simple stack pointer highwater monitor. Checks for magic numbers in the main + * loop. In conjuction with TESTRTIMER, never-used stack will be printed + * every STACKMONITOR seconds. + */ +{ +extern uint16_t __bss_end; +uint16_t p=(uint16_t)&__bss_end; + do { + *(uint16_t *)p = 0x4242; + p+=10; + } while (p //#define delay_us( us ) ( _delay_loop_2(1+(us*F_CPU)/4000000UL) ) // delay_us(50000); @@ -204,7 +226,7 @@ uint8_t i; #endif #if ANNOUNCE_BOOT - printf_P(PSTR("\n*******Booting %s*******\n"),CONTIKI_VERSION_STRING); + PRINTF("\n*******Booting %s*******\n",CONTIKI_VERSION_STRING); #endif /* rtimers needed for radio cycling */ @@ -239,7 +261,7 @@ uint8_t i; rimeaddr_set_node_addr(&addr); - PRINTF("MAC address %x:%x:%x:%x:%x:%x:%x:%x\n",addr.u8[0],addr.u8[1],addr.u8[2],addr.u8[3],addr.u8[4],addr.u8[5],addr.u8[6],addr.u8[7]); + PRINTFD("MAC address %x:%x:%x:%x:%x:%x:%x:%x\n",addr.u8[0],addr.u8[1],addr.u8[2],addr.u8[3],addr.u8[4],addr.u8[5],addr.u8[6],addr.u8[7]); /* Initialize stack protocols */ queuebuf_init(); @@ -248,27 +270,31 @@ uint8_t i; NETSTACK_NETWORK.init(); #if ANNOUNCE_BOOT - printf_P(PSTR("%s %s, channel %u"),NETSTACK_MAC.name, NETSTACK_RDC.name,rf230_get_channel()); + PRINTF("%s %s, channel %u",NETSTACK_MAC.name, NETSTACK_RDC.name,rf230_get_channel()); if (NETSTACK_RDC.channel_check_interval) {//function pointer is zero for sicslowmac unsigned short tmp; tmp=CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval == 0 ? 1:\ NETSTACK_RDC.channel_check_interval()); if (tmp<65535) printf_P(PSTR(", check rate %u Hz"),tmp); } - printf_P(PSTR("\n")); + PRINTF("\n"); + +#if UIP_CONF_IPV6_RPL + PRINTF("RPL Enabled\n"); +#endif +#if UIP_CONF_ROUTER + PRINTF("Routing Enabled\n"); #endif -#if UIP_CONF_ROUTER -#if ANNOUNCE_BOOT - printf_P(PSTR("Routing Enabled\n")); -#endif -// rime_init(rime_udp_init(NULL)); +#endif /* ANNOUNCE_BOOT */ + +// rime_init(rime_udp_init(NULL)); // uip_router_register(&rimeroute); -#endif process_start(&tcpip_process, NULL); - #else +#else +/* Original RF230 combined mac/radio driver */ /* mac process must be started before tcpip process! */ process_start(&mac_process, NULL); process_start(&tcpip_process, NULL); @@ -288,13 +314,13 @@ uint8_t i; #if COFFEE_FILES int fa = cfs_open( "/index.html", CFS_READ); if (fa<0) { //Make some default web content - printf_P(PSTR("No index.html file found, creating upload.html!\n")); - printf_P(PSTR("Formatting FLASH file system for coffee...")); + PRINTF("No index.html file found, creating upload.html!\n"); + PRINTF("Formatting FLASH file system for coffee..."); cfs_coffee_format(); - printf_P(PSTR("Done!\n")); + PRINTF("Done!\n"); fa = cfs_open( "/index.html", CFS_WRITE); int r = cfs_write(fa, &"It works!", 9); - if (r<0) printf_P(PSTR("Can''t create /index.html!\n")); + if (r<0) PRINTF("Can''t create /index.html!\n"); cfs_close(fa); // fa = cfs_open("upload.html"), CFW_WRITE); //
@@ -322,53 +348,38 @@ uint8_t i; for (i=0;i>10); + PRINTF(".%s online with dynamic %u KB EEPROM file system\n",buf,size>>10); #elif COFFEE_FILES==3 - printf_P(PSTR(".%s online with static %u byte program memory file system\n"),buf,size); + PRINTF(".%s online with static %u byte program memory file system\n",buf,size); #elif COFFEE_FILES==4 - printf_P(PSTR(".%s online with dynamic %u KB program memory file system\n"),buf,size>>10); + PRINTF(".%s online with dynamic %u KB program memory file system\n",buf,size>>10); #endif /* COFFEE_FILES */ #else - printf_P(PSTR("Online\n")); + PRINTF("Online\n"); #endif /* WEBSERVER */ #endif /* ANNOUNCE_BOOT */ } -/*---------------------------------------------------------------------------*/ -void log_message(char *m1, char *m2) -{ - printf_P(PSTR("%s%s\n"), m1, m2); -} -/* Test rtimers, also useful for pings and time stamps in simulator */ -#define TESTRTIMER 0 -#if TESTRTIMER -#define PINGS 60 -#define STAMPS 30 -uint8_t rtimerflag=1; -uint16_t rtime; -struct rtimer rt; -void rtimercycle(void) {rtimerflag=1;} -#endif /* TESTRTIMER */ - #if RF230BB extern char rf230_interrupt_flag, rf230processflag; #endif + /*-------------------------------------------------------------------------*/ /*------------------------- Main Scheduler loop----------------------------*/ /*-------------------------------------------------------------------------*/ @@ -379,68 +390,130 @@ main(void) while(1) { process_run(); - -#if CONFIG_STACK_MONITOR - extern uint16_t __bss_end; - if (*(uint16_t *)(&__bss_end+100) != 0x4242) { - printf_P(PSTR("\nStack Warning, overflow within 100 bytes!\n")); - if (__bss_end != 0x4242) { - __bss_end = 0x4242; - printf_P(PSTR("\n!!!!!!!Stack Overflow!!!!!!!!\n")); - } - *(uint16_t *)(&__bss_end+100) = 0x4242; - } + watchdog_periodic(); + +#if 0 +/* Various entry points for debugging in the AVR Studio simulator. + * Set as next statement and step into the routine. + */ + NETSTACK_RADIO.send(packetbuf_hdrptr(), 42); + process_poll(&rf230_process); + packetbuf_clear(); + len = rf230_read(packetbuf_dataptr(), PACKETBUF_SIZE); + packetbuf_set_datalen(42); + NETSTACK_RDC.input(); #endif #if 0 -/* Clock.c can trigger a periodic RF PLL calibration */ -extern uint8_t rf230_calibrated; +/* Clock.c can trigger a periodic PLL calibration in the RF230BB driver. + * This can show when that happens. + */ + extern uint8_t rf230_calibrated; if (rf230_calibrated) { - printf_P(PSTR("\nRF230 calibrated!")); + PRINTF("\nRF230 calibrated!\n"); rf230_calibrated=0; } #endif -//Various entry points for debugging in AVR simulator -// NETSTACK_RADIO.send(packetbuf_hdrptr(), 42); -// process_poll(&rf230_process); -// packetbuf_clear(); -// len = rf230_read(packetbuf_dataptr(), PACKETBUF_SIZE); -// packetbuf_set_datalen(42); -// NETSTACK_RDC.input(); - watchdog_periodic(); #if TESTRTIMER - if (rtimerflag) { //8 seconds is maximum interval, my raven 6% slow +/* Timeout can be increased up to 8 seconds maximum. + * A one second cycle is convenient for triggering the various debug printouts. + * The triggers are staggered to avoid printing everything at once. + * My raven is 6% slow. + */ + if (rtimerflag) { rtimer_set(&rt, RTIMER_NOW()+ RTIMER_ARCH_SECOND*1UL, 1,(void *) rtimercycle, NULL); rtimerflag=0; + #if STAMPS - if ((rtime%STAMPS)==0) { - printf("%us ",rtime); - } +if ((rtime%STAMPS)==0) { + PRINTF("%us ",rtime); +} #endif rtime+=1; + #if PINGS - if ((rtime%PINGS)==0) { - PRINTF("**Ping\n"); - raven_ping6(); - } +if ((rtime%PINGS)==1) { + PRINTF("**Ping\n"); + raven_ping6(); +} #endif + +#if ROUTES +if ((rtime%ROUTES)==2) { + + //#if UIP_CONF_IPV6_RPL +//#include "rpl.h" +extern uip_ds6_nbr_t uip_ds6_nbr_cache[]; +extern uip_ds6_route_t uip_ds6_routing_table[]; +extern uip_ds6_netif_t uip_ds6_if; + + uint8_t i,j; + PRINTF("\nAddresses [%u max]\n",UIP_DS6_ADDR_NB); + for (i=0;i"); + PRINTF("\nRoutes [%u max]\n",UIP_DS6_ROUTE_NB); + for(i = 0,j=1; i < UIP_DS6_ROUTE_NB; i++) { + if(uip_ds6_routing_table[i].isused) { + ipaddr_add(&uip_ds6_routing_table[i].ipaddr); + PRINTF("/%u (via ", uip_ds6_routing_table[i].length); + ipaddr_add(&uip_ds6_routing_table[i].nexthop); + // if(uip_ds6_routing_table[i].state.lifetime < 600) { + PRINTF(") %lus\n", uip_ds6_routing_table[i].state.lifetime); + // } else { + // PRINTF(")\n"); + // } + j=0; + } + } + if (j) PRINTF(" "); + PRINTF("\n---------\n"); +} #endif +#if STACKMONITOR +if ((rtime%STACKMONITOR)==3) { + extern uint16_t __bss_end; + uint16_t p=(uint16_t)&__bss_end; + do { + if (*(uint16_t *)p != 0x4242) { + PRINTF("Never-used stack > %d bytes\n",p-(uint16_t)&__bss_end); + break; + } + p+=10; + } while (pu8[i] << 8) + addr->u8[i + 1]; + if(a == 0 && f >= 0) { + if(f++ == 0) PRINTF("::"); + } else { + if(f > 0) { + f = -1; + } else if(i > 0) { + PRINTF(":"); + } + PRINTF("%x",a); + } + } +} +#endif diff --git a/platform/avr-raven/slip_uart0.c b/platform/avr-raven/slip_uart0.c new file mode 100644 index 000000000..bf36616ad --- /dev/null +++ b/platform/avr-raven/slip_uart0.c @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2010, University of Colombo School of Computing + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This file is part of the Contiki operating system. + * + * @(#)$$ + */ + +/** + * \file + * Machine dependent AVR SLIP routines for UART0. + * \author + * Kasun Hewage + */ + +#include +#include "contiki.h" +#include "dev/rs232.h" +#include "slip.h" + +/*---------------------------------------------------------------------------*/ +static int +slip_putchar(char c, FILE *stream) +{ +#define SLIP_END 0300 + static char debug_frame = 0; + + if (!debug_frame) { /* Start of debug output */ + slip_arch_writeb(SLIP_END); + slip_arch_writeb('\r'); /* Type debug line == '\r' */ + debug_frame = 1; + } + + slip_arch_writeb((unsigned char)c); + + /* + * Line buffered output, a newline marks the end of debug output and + * implicitly flushes debug output. + */ + if (c == '\n') { + slip_arch_writeb(SLIP_END); + debug_frame = 0; + } + + return c; +} +/*---------------------------------------------------------------------------*/ +static FILE slip_stdout = FDEV_SETUP_STREAM(slip_putchar, NULL, + _FDEV_SETUP_WRITE); +/*---------------------------------------------------------------------------*/ +void +slip_arch_init(unsigned long ubr) +{ + rs232_set_input(RS232_PORT_0, slip_input_byte); + stdout = &slip_stdout; +} +/*---------------------------------------------------------------------------*/ +/* + XXX: + Currently, the following function is in cpu/avr/dev/rs232.c file. this + should be moved to here from there hence this is a platform specific slip + related function. +void +slip_arch_writeb(unsigned char c) +{ + rs232_send(RS232_PORT_0, c); +} +*/ diff --git a/platform/avr-ravenusb/cdc_task.c b/platform/avr-ravenusb/cdc_task.c index c1c4b0483..a53b8e400 100644 --- a/platform/avr-ravenusb/cdc_task.c +++ b/platform/avr-ravenusb/cdc_task.c @@ -116,9 +116,18 @@ static uint8_t timer = 0; static struct etimer et; #define CONVERTTXPOWER 1 -#if CONVERTTXPOWER //adds 92 bytes to program flash size +#if CONVERTTXPOWER //adds ~120 bytes to program flash size const char txonesdigit[16] PROGMEM = {'3','2','2','1','1','0','0','1','2','3','4','5','7','9','2','7'}; const char txtenthsdigit[16] PROGMEM = {'0','6','1','6','1','5','2','2','2','2','2','2','2','2','2','2'}; +static void printtxpower(void) { + uint8_t power=rf230_get_txpower()&0xf; + char sign=(power<6?'+':'-'); + char tens=(power>14?'1':'0'); + char ones=pgm_read_byte(&txonesdigit[power]); + char tenths=pgm_read_byte(&txtenthsdigit[power]); + if (tens=='0') {tens=sign;sign=' ';} + PRINTF_P(PSTR("%c%c%c.%cdBm"),sign,tens,ones,tenths); +} #endif PROCESS(cdc_process, "CDC serial process"); @@ -153,7 +162,7 @@ PROCESS_THREAD(cdc_process, ev, data_proc) previous_stdout = stdout; uart_usb_init(); uart_usb_set_stdout(); - menu_print(); + // menu_print(); do this later } else { stdout = previous_stdout; } @@ -206,16 +215,21 @@ PROCESS_THREAD(cdc_process, ev, data_proc) void menu_print(void) { PRINTF_P(PSTR("\n\r*********** Jackdaw Menu **********\n\r")); - PRINTF_P(PSTR("* *\n\r")); + PRINTF_P(PSTR(" [Built "__DATE__"] \n\r")); +// PRINTF_P(PSTR("* *\n\r")); PRINTF_P(PSTR("* m Print current mode *\n\r")); PRINTF_P(PSTR("* s Set to sniffer mode *\n\r")); PRINTF_P(PSTR("* n Set to network mode *\n\r")); PRINTF_P(PSTR("* c Set RF channel *\n\r")); + PRINTF_P(PSTR("* p Set RF power *\n\r")); PRINTF_P(PSTR("* 6 Toggle 6lowpan *\n\r")); PRINTF_P(PSTR("* r Toggle raw mode *\n\r")); #if USB_CONF_RS232 PRINTF_P(PSTR("* d Toggle RS232 output *\n\r")); #endif +#if RF230BB && RF230_CONF_SNEEZER + PRINTF_P(PSTR("* S Enable sneezer mode *\n\r")); +#endif #if UIP_CONF_IPV6_RPL PRINTF_P(PSTR("* N RPL Neighbors *\n\r")); PRINTF_P(PSTR("* G RPL Global Repair *\n\r")); @@ -227,12 +241,11 @@ void menu_print(void) if(bootloader_is_present()) PRINTF_P(PSTR("* D Switch to DFU mode *\n\r")); PRINTF_P(PSTR("* R Reset (via WDT) *\n\r")); - PRINTF_P(PSTR("* h,? Print this menu *\n\r")); + PRINTF_P(PSTR("* h,? Print this menu *\n\r")); PRINTF_P(PSTR("* *\n\r")); PRINTF_P(PSTR("* Make selection at any time by *\n\r")); PRINTF_P(PSTR("* pressing your choice on keyboard*\n\r")); PRINTF_P(PSTR("***********************************\n\r")); - PRINTF_P(PSTR("[Built "__DATE__"]\n\r")); } #if UIP_CONF_IPV6_RPL @@ -266,11 +279,12 @@ void menu_process(char c) static enum menustate_enum /* Defines an enumeration type */ { normal, - channel + channel, + txpower } menustate = normal; static char channel_string[3]; - static uint8_t channel_string_i = 0; + static uint8_t channel_string_i;// = 0; int tempchannel; @@ -295,14 +309,14 @@ void menu_process(char c) } else { #endif #if JACKDAW_CONF_USE_SETTINGS - if(settings_set_uint8(SETTINGS_KEY_CHANNEL, tempchannel)!=SETTINGS_STATUS_OK) { - PRINTF_P(PSTR("\n\rChannel changed to %d, but unable to store in EEPROM!\n\r"),tempchannel); - } else + if(settings_set_uint8(SETTINGS_KEY_CHANNEL, tempchannel)==SETTINGS_STATUS_OK) { + PRINTF_P(PSTR("\n\rChannel changed to %d and stored in EEPROM.\n\r"),tempchannel); + } else { + PRINTF_P(PSTR("\n\rChannel changed to %d, but unable to store in EEPROM!\n\r"),tempchannel); + } #else - eeprom_write_byte((uint8_t *) 9, tempchannel); //Write channel - eeprom_write_byte((uint8_t *)10, ~tempchannel); //Bit inverse as check + PRINTF_P(PSTR("\n\rChannel changed to %d.\n\r"),tempchannel); #endif - PRINTF_P(PSTR("\n\rChannel changed to %d and stored in EEPROM.\n\r"),tempchannel); } } else { PRINTF_P(PSTR("\n\rChannel unchanged.\n\r")); @@ -346,11 +360,87 @@ void menu_process(char c) default: break; } + } else if (menustate == txpower) { + switch(c) { + case '\r': + case '\n': + + if (channel_string_i) { + channel_string[channel_string_i] = 0; + tempchannel = atoi(channel_string); +#if RF230BB + if ((tempchannel < 0) || (tempchannel > 15)) { + PRINTF_P(PSTR("\n\rInvalid input\n\r")); + } else { + PRINTF_P(PSTR(" ")); //for some reason needs a print here to clear the string input... + rf230_set_txpower(tempchannel); +#else + if(radio_set_tx_power_level(tempchannel)!=RADIO_SUCCESS) { + PRINTF_P(PSTR("\n\rInvalid input\n\r")); + } else { +#endif +#if JACKDAW_CONF_USE_SETTINGS + if(settings_set_uint8(SETTINGS_KEY_TXPOWER, tempchannel)==SETTINGS_STATUS_OK) { + PRINTF_P(PSTR("\n\rTransmit power changed to %d, and stored in EEPROM.\n\r"),tempchannel); + } else { + PRINTF_P(PSTR("\n\rTransmit power changed to %d, but unable to store in EEPROM!\n\r"),tempchannel); + } +#else + PRINTF_P(PSTR("\n\rTransmit power changed to %d.\n\r"),tempchannel); +#endif + } + } else { + PRINTF_P(PSTR("\n\rTransmit power unchanged.\n\r")); + } + menustate = normal; + break; + + case '\b': + + if (channel_string_i) { + channel_string_i--; + PRINTF_P(PSTR("\b \b")); + } + break; + + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + if (channel_string_i > 1) { + // This time the user has gone too far. + // Beep at them. + putc('\a', stdout); + //uart_usb_putchar('\a'); + break; + } + putc(c, stdout); + //uart_usb_putchar(c); + + channel_string[channel_string_i] = c; + channel_string_i++; + break; + + default: + break; + } + } else { uint8_t i; + + /* Any attempt to read an RF230 register in sneeze mode (e.g. rssi) will hang the MCU */ + /* So convert any command into a sneeze off */ + if (usbstick_mode.sneeze) c='S'; + switch(c) { case '\r': case '\n': @@ -369,9 +459,10 @@ void menu_process(char c) PRINTF_P(PSTR("Bringing interface up\n\r")); usb_eth_set_active(1); break; - - case 't': +#if JACKDAW_CONF_RANDOM_MAC + case 'T': // Test "strong" random number generator of R Quattlebaum + // This can potentially reboot the stick! PRINTF_P(PSTR("RNG Output: ")); { uint8_t value = rng_get_uint8(); @@ -384,24 +475,49 @@ void menu_process(char c) watchdog_periodic(); } break; - +#endif case 's': PRINTF_P(PSTR("Jackdaw now in sniffer mode\n\r")); usbstick_mode.sendToRf = 0; usbstick_mode.translate = 0; #if RF230BB - rf230_listen_channel(rf230_get_channel()); + rf230_listen_channel(rf230_get_channel()); #else - radio_set_trx_state(RX_ON); + radio_set_trx_state(RX_ON); #endif break; +#if RF230BB && RF230_CONF_SNEEZER + case 'S': + if (usbstick_mode.sneeze) { + rf230_warm_reset(); + PRINTF_P(PSTR("Jackdaw now behaving itself.\n\r")); + usbstick_mode.sneeze = 0; + } else { + if (rf230_get_txpower()<3) + PRINTF_P(PSTR("*****WARNING Radio may overheat in this mode*******\n\r")); + rf230_start_sneeze(); + PRINTF_P(PSTR("********Jackdaw is continuously broadcasting*******\n\r")); +#if CONVERTTXPOWER + PRINTF_P(PSTR("*********on channel %2d with power "),rf230_get_channel()); + printtxpower(); + PRINTF_P(PSTR("*********\n\r")); +#else + PRINTF_P(PSTR("************on channel %2d with power %2d************\n\r"),rf230_get_channel(),rf230_get_txpower()); +#endif + PRINTF_P(PSTR("Press any key to stop.\n\r")); + watchdog_periodic(); + usbstick_mode.sneeze = 1; + } + break; +#endif + case 'n': PRINTF_P(PSTR("Jackdaw now in network mode\n\r")); usbstick_mode.sendToRf = 1; usbstick_mode.translate = 1; #if RF230BB - rf230_set_channel(rf230_get_channel()); + rf230_set_channel(rf230_get_channel()); #else radio_set_trx_state(RX_AACK_ON); //TODO: Use startup state which may be RX_ON #endif @@ -442,14 +558,25 @@ void menu_process(char c) case 'c': #if RF230BB - PRINTF_P(PSTR("Select 802.15.4 Channel in range 11-26 [%d]: "), rf230_get_channel()); + PRINTF_P(PSTR("\nSelect 802.15.4 Channel in range 11-26 [%d]: "), rf230_get_channel()); #else - PRINTF_P(PSTR("Select 802.15.4 Channel in range 11-26 [%d]: "), radio_get_operating_channel()); + PRINTF_P(PSTR("\nSelect 802.15.4 Channel in range 11-26 [%d]: "), radio_get_operating_channel()); #endif menustate = channel; channel_string_i = 0; break; + case 'p': +#if RF230BB + PRINTF_P(PSTR("\nSelect transmit power (0=+3dBm 15=-17.2dBm) [%d]: "), rf230_get_txpower()); +#else +// PRINTF_P(PSTR("\nSelect transmit power (0=+3dBm 15=-17.2dBm) [%d]: "), ?_power());; +#endif + menustate = txpower; + channel_string_i = 0; + break; + + #if UIP_CONF_IPV6_RPL #include "rpl.h" extern uip_ds6_nbr_t uip_ds6_nbr_cache[]; @@ -457,13 +584,13 @@ extern uip_ds6_route_t uip_ds6_routing_table[]; extern uip_ds6_netif_t uip_ds6_if; case 'N': { uint8_t i,j; - PRINTF_P(PSTR("\n\rAddresses [%u max]\n\r"),UIP_DS6_ADDR_NB); - for (i=0;i14?'1':'0'); - char ones=pgm_read_byte(&txonesdigit[power]); - char tenths=pgm_read_byte(&txtenthsdigit[power]); - PRINTF_P(PSTR(" * Operates on channel %d with TX power %c%c%c.%cdBm\n\r"), rf230_get_channel(),sign,tens,ones,tenths); - } + PRINTF_P(PSTR(" * Operates on channel %d with TX power "),rf230_get_channel()); + printtxpower(); + PRINTF_P(PSTR("\n\r")); #else //just show the raw value PRINTF_P(PSTR(" * Operates on channel %d\n\r"), rf230_get_channel()); - PRINTF_P(PSTR(" * TX Power(0=3dBm, 15=-17.2dBm): %d\n\r"), rf230_get_txpower()); + PRINTF_P(PSTR(" * TX Power(0=+3dBm, 15=-17.2dBm): %d\n\r"), rf230_get_txpower()); #endif - PRINTF_P(PSTR(" * Current/Last RSSI: %d/%ddBm\n\r"), -91+(rf230_rssi()-1), -91+(rf230_last_rssi-1)); + if (rf230_smallest_rssi) { + PRINTF_P(PSTR(" * Current/Last/Smallest RSSI: %d/%d/%ddBm\n\r"), -91+(rf230_rssi()-1), -91+(rf230_last_rssi-1),-91+(rf230_smallest_rssi-1)); + rf230_smallest_rssi=0; + } else { + PRINTF_P(PSTR(" * Current/Last/Smallest RSSI: %d/%d/--dBm\n\r"), -91+(rf230_rssi()-1), -91+(rf230_last_rssi-1)); + } #else /* RF230BB */ PRINTF_P(PSTR(" * Operates on channel %d\n\r"), radio_get_operating_channel()); @@ -579,8 +706,8 @@ extern uip_ds6_netif_t uip_ds6_if; #endif /* RF230BB */ PRINTF_P(PSTR(" * Configuration: %d, USB<->ETH is "), usb_configuration_nb); - if (usb_eth_is_active == 0) PRINTF_P(PSTR("not ")); - PRINTF_P(PSTR("active\n\r")); + if (usb_eth_is_active == 0) PRINTF_P(PSTR("not ")); + PRINTF_P(PSTR("active\n\r")); #if CONFIG_STACK_MONITOR /* See contiki-raven-main.c for initialization of the magic numbers */ @@ -596,7 +723,7 @@ uint16_t p=(uint16_t)&__bss_end; } while (p @@ -67,6 +67,13 @@ /* Set ANNOUNCE to send boot messages to USB or RS232 serial port */ #define ANNOUNCE 1 +/* But only if a serial port exists */ +#if USB_CONF_SERIAL||USB_CONF_RS232 +#define PRINTA(FORMAT,args...) printf_P(PSTR(FORMAT),##args) +#else +#define PRINTA(...) +#endif + #include "usb_task.h" #if USB_CONF_SERIAL #include "cdc_task.h" @@ -101,11 +108,13 @@ rimeaddr_t macLongAddr; #include "ieee-15-4-manager.h" #endif /* RF230BB */ -/* Test rtimers, also useful for pings and time stamps in simulator */ +/* Test rtimers, also useful for pings, time stamps, routes, stack monitor */ #define TESTRTIMER 0 #if TESTRTIMER #define PINGS 0 -#define STAMPS 30 +#define STAMPS 60 +#define ROUTES 120 +#define STACKMONITOR 600 uint8_t rtimerflag=1; uint16_t rtime; struct rtimer rt; @@ -116,6 +125,7 @@ void rtimercycle(void) {rtimerflag=1;} /*---------------------------------------------------------------------------*/ /*--------------------------------- RPL ----------------------------------*/ /*---------------------------------------------------------------------------*/ +/* TODO: Put rpl code into another file, once it stabilizes */ /* Set up fallback interface links to direct stack tcpip output to ethernet */ static void init(void) @@ -126,12 +136,11 @@ static void output(void) { // if(uip_ipaddr_cmp(&last_sender, &UIP_IP_BUF->srcipaddr)) { - /* Do not bounce packets back over SLIP if the packet was received - over SLIP */ -// PRINTF("slip-bridge: Destination off-link but no route\n"); + /* Do not bounce packets back over USB if the packet was received from USB */ +// PRINTA("JACKDAW router: Destination off-link but no route\n"); // } else { - PRINTF("SUT: %u\n", uip_len); - mac_LowpanToEthernet(); + PRINTD("SUT: %u\n", uip_len); + mac_LowpanToEthernet(); //bounceback trap is done in lowpanToEthernet // } } const struct uip_fallback_interface rpl_interface = { @@ -157,11 +166,12 @@ PROCESS_THREAD(border_router_process, ev, data) memcpy_P(buf,dag_id,sizeof(dag_id)); dag = rpl_set_root((uip_ip6addr_t *)buf); -/* Assign bbbb::200 to the uip stack, and bbbb::1 to the host network interface, e.g. $ip -6 address add bbbb::1/64 dev usb0 */ -/* Note the jackdaw uip stack will get packets intended for usb if they have the same address! */ +/* Assign separate addresses to the jackdaw uip stack and the host network interface, but with the same prefix */ +/* E.g. bbbb::200 to the jackdaw and bbbb::1 to the host network interface with $ip -6 address add bbbb::1/64 dev usb0 */ +/* Otherwise the host will trap packets intended for the jackdaw, just as the jackdaw will trap RF packets intended for the host */ /* $ifconfig usb0 -arp on Ubuntu to skip the neighbor solicitations. Add explicit neighbors on other OSs */ if(dag != NULL) { - PRINTF("created a new RPL dag\n"); + PRINTD("created a new RPL dag\n"); #if UIP_CONF_ROUTER_RECEIVE_RA //Contiki stack will shut down until assigned an address from the interface RA @@ -181,6 +191,7 @@ PROCESS_THREAD(border_router_process, ev, data) while(1) { PROCESS_YIELD(); + /* Local and global dag repair can be done from the jackdaw menu */ // rpl_set_prefix(rpl_get_dag(RPL_ANY_INSTANCE), &ipaddr, 64); // rpl_repair_dag(rpl_get_dag(RPL_ANY_INSTANCE)); @@ -194,74 +205,47 @@ PROCESS_THREAD(border_router_process, ev, data) /*-------------------------------------------------------------------------*/ /*----------------------Configuration of the .elf file---------------------*/ -typedef struct {unsigned char B2;unsigned char B1;unsigned char B0;} __signature_t; +#if 1 +/* The proper way to set the signature is */ +#include +#else +/* Older avr-gcc's may not define the needed SIGNATURE bytes. Do it manually if you get an error */ +typedef struct {const unsigned char B2;const unsigned char B1;const unsigned char B0;} __signature_t; #define SIGNATURE __signature_t __signature __attribute__((section (".signature"))) SIGNATURE = { -/* Older AVR-GCCs may not define the SIGNATURE_n bytes so use explicit values */ .B2 = 0x82,//SIGNATURE_2, //AT90USB128x .B1 = 0x97,//SIGNATURE_1, //128KB flash .B0 = 0x1E,//SIGNATURE_0, //Atmel }; +#endif + FUSES ={.low = 0xde, .high = 0x99, .extended = 0xff,}; -/* Put default MAC address in EEPROM */ -#if !JACKDAW_CONF_USE_SETTINGS -uint8_t mac_address[8] EEMEM = {0x02, 0x12, 0x13, 0xff, 0xfe, 0x14, 0x15, 0x16}; -#endif - -static uint8_t get_channel_from_eeprom() { -#if JACKDAW_CONF_USE_SETTINGS - uint8_t chan = settings_get_uint8(SETTINGS_KEY_CHANNEL, 0); - if(!chan) - chan = RF_CHANNEL; - return chan; -#else - uint8_t eeprom_channel; - uint8_t eeprom_check; - - eeprom_channel = eeprom_read_byte((uint8_t *)9); - eeprom_check = eeprom_read_byte((uint8_t *)10); - - if(eeprom_channel==~eeprom_check) - return eeprom_channel; - +/* Save the default settings into program flash memory */ +uint8_t default_mac_address[8] PROGMEM = {0x02, 0x12, 0x13, 0xff, 0xfe, 0x14, 0x15, 0x16}; #ifdef CHANNEL_802_15_4 - return(CHANNEL_802_15_4); +uint8_t default_channel PROGMEM = CHANNEL_802_15_4; #else - return 26; -#endif - +uint8_t default_channel PROGMEM = 26; #endif - -} - -static bool -get_eui64_from_eeprom(uint8_t macptr[8]) { -#if JACKDAW_CONF_USE_SETTINGS - size_t size = 8; - - if(settings_get(SETTINGS_KEY_EUI64, 0, (unsigned char*)macptr, &size)==SETTINGS_STATUS_OK) - return true; - - // Fallback to reading the traditional mac address - eeprom_read_block ((void *)macptr, 0, 8); +#ifdef IEEE802154_PANID +uint16_t default_panid PROGMEM = IEEE802154_PANID; #else - eeprom_read_block ((void *)macptr, &mac_address, 8); +uint16_t default_panid PROGMEM = 0xABCD; +#endif +#ifdef IEEE802154_PANADDR +uint16_t default_panaddr PROGMEM = IEEE802154_PANID; +#else +uint16_t default_panaddr PROGMEM = 0; +#endif +#ifdef RF230_MAX_TX_POWER +uint8_t default_txpower PROGMEM = RF230_MAX_TX_POWER; +#else +uint8_t default_txpower PROGMEM = 0; #endif - return macptr[0]!=0xFF; -} #if JACKDAW_CONF_RANDOM_MAC -static bool -set_eui64_to_eeprom(const uint8_t macptr[8]) { -#if JACKDAW_CONF_USE_SETTINGS - return settings_set(SETTINGS_KEY_EUI64, macptr, 8)==SETTINGS_STATUS_OK; -#else - eeprom_write_block((void *)macptr, &mac_address, 8); - return true; -#endif -} - +#include "rng.h" static void generate_new_eui64(uint8_t eui64[8]) { eui64[0] = 0x02; @@ -275,33 +259,141 @@ generate_new_eui64(uint8_t eui64[8]) { } #endif /* JACKDAW_CONF_RANDOM_MAC */ -static uint16_t -get_panid_from_eeprom(void) { -#if JACKDAW_CONF_USE_SETTINGS - uint16_t x = settings_get_uint16(SETTINGS_KEY_PAN_ID, 0); - if(!x) - x = IEEE802154_PANID; +#if !JACKDAW_CONF_USE_SETTINGS +/****************************No settings manager*****************************/ +/* If not using the settings manager, put the default values into EEMEM + * These can be manually changed and kept over program reflash. + * The channel and bit complement are used to check EEMEM integrity, + * If corrupt all values will be rewritten with the default flash values. + * To make this work, get the channel before anything else. + */ + +uint8_t eemem_mac_address[8] EEMEM = {0x02, 0x12, 0x13, 0xff, 0xfe, 0x14, 0x15, 0x16}; +#ifdef CHANNEL_802_15_4 +uint8_t eemem_channel[2] EEMEM = {CHANNEL_802_15_4, ~CHANNEL_802_15_4}; +#else +uint8_t eemem_channel[2] EMEM = {26, ~26}; +#endif +#ifdef IEEE802154_PANID +uint16_t eemem_panid EEMEM = IEEE802154_PANID; +#else +uint16_t eemem_panid EEMEM = 0xABCD; +#endif +#ifdef IEEE802154_PANADDR +uint16_t eemem_panaddr EEMEM = IEEE802154_PANID; +#else +uint16_t eemem_panaddr EEMEM = 0; +#endif +#ifdef RF230_MAX_TX_POWER +uint8_t eemem_txpower EEMEM = RF230_MAX_TX_POWER; +#else +uint8_t eemem_txpower EEMEM = 0; +#endif +static uint8_t get_channel_from_eeprom() { + uint8_t x[2]; + *(uint16_t *)x = eeprom_read_word ((uint16_t *)&eemem_channel); + if((uint8_t)x[0]!=(uint8_t)~x[1]) {//~x[1] can promote comparison to 16 bit +/* Verification fails, rewrite everything */ + uint8_t mac[8]; +#if JACKDAW_CONF_RANDOM_MAC + PRINTA("Generating random MAC address.\n"); + generate_new_eui64(&mac); +#else + {uint8_t i; for (i=0;i<8;i++) mac[i] = pgm_read_byte_near(default_mac_address+i);} +#endif + eeprom_write_block(&mac, &eemem_mac_address, 8); + eeprom_write_word(&eemem_panid , pgm_read_word_near(&default_panid)); + eeprom_write_word(&eemem_panaddr, pgm_read_word_near(&default_panaddr)); + eeprom_write_byte(&eemem_txpower, pgm_read_byte_near(&default_txpower)); + x[0] = pgm_read_byte_near(&default_channel); + x[1]= ~x[0]; + eeprom_write_word((uint16_t *)&eemem_channel, *(uint16_t *)x); + } + return x[0]; +} +static bool get_eui64_from_eeprom(uint8_t macptr[8]) { + eeprom_read_block ((void *)macptr, &eemem_mac_address, 8); + return macptr[0]!=0xFF; +} +static uint16_t get_panid_from_eeprom(void) { + return eeprom_read_word(&eemem_panid); +} +static uint16_t get_panaddr_from_eeprom(void) { + return eeprom_read_word (&eemem_panaddr); +} +static uint8_t get_txpower_from_eeprom(void) +{ + return eeprom_read_byte(&eemem_txpower); +} + +#else /* !JACKDAW_CONF_USE_SETTINGS */ +/******************************Settings manager******************************/ +static uint8_t get_channel_from_eeprom() { + uint8_t x = settings_get_uint8(SETTINGS_KEY_CHANNEL, 0); + if(!x) x = pgm_read_byte_near(&default_channel); return x; -#else - // TODO: Writeme! - return IEEE802154_PANID; -#endif } - -static uint16_t -get_panaddr_from_eeprom(void) { -#if JACKDAW_CONF_USE_SETTINGS - return settings_get_uint16(SETTINGS_KEY_PAN_ADDR, 0); +static bool get_eui64_from_eeprom(uint8_t macptr[8]) { + size_t size = 8; + if(settings_get(SETTINGS_KEY_EUI64, 0, (unsigned char*)macptr, &size)==SETTINGS_STATUS_OK) { + PRINTD("<=Get EEPROM MAC address.\n"); + return true; + } +#if JACKDAW_CONF_RANDOM_MAC + PRINTA("--Generating random MAC address.\n"); + generate_new_eui64(macptr); #else - // TODO: Writeme! - return 0; + {uint8_t i;for (i=0;i<8;i++) macptr[i] = pgm_read_byte_near(default_mac_address+i);} #endif + settings_add(SETTINGS_KEY_EUI64,(unsigned char*)macptr,8); + PRINTA("->Set EEPROM MAC address.\n"); + return true; } - +static uint16_t get_panid_from_eeprom(void) { + uint16_t x; + if (settings_check(SETTINGS_KEY_PAN_ID,0)) { + x = settings_get_uint16(SETTINGS_KEY_PAN_ID,0); + PRINTD("<-Get EEPROM PAN ID of %04x.\n",x); + } else { + x=pgm_read_word_near(&default_panid); + if (settings_add_uint16(SETTINGS_KEY_PAN_ID,x)==SETTINGS_STATUS_OK) { + PRINTA("->Set EEPROM PAN ID to %04x.\n",x); + } + } + return x; +} +static uint16_t get_panaddr_from_eeprom(void) { + uint16_t x; + if (settings_check(SETTINGS_KEY_PAN_ADDR,0)) { + x = settings_get_uint16(SETTINGS_KEY_PAN_ADDR,0); + PRINTD("<-Get EEPROM PAN address of %04x.\n",x); + } else { + x=pgm_read_word_near(&default_panaddr); + if (settings_add_uint16(SETTINGS_KEY_PAN_ADDR,x)==SETTINGS_STATUS_OK) { + PRINTA("->Set EEPROM PAN address to %04x.\n",x); + } + } + return x; +} +static uint8_t get_txpower_from_eeprom(void) { + uint8_t x; + if (settings_check(SETTINGS_KEY_TXPOWER,0)) { + x = settings_get_uint8(SETTINGS_KEY_TXPOWER,0); + PRINTD("<-Get EEPROM tx power of %d. (0=max)\n",x); + } else { + x=pgm_read_byte_near(&default_txpower); + if (settings_add_uint8(SETTINGS_KEY_TXPOWER,x)==SETTINGS_STATUS_OK) { + PRINTA("->Set EEPROM tx power of %d. (0=max)\n",x); + } + } + return x; +} +#endif /* !JACKDAW_CONF_USE_SETTINGS */ /*-------------------------------------------------------------------------*/ /*-----------------------------Low level initialization--------------------*/ static void initialize(void) { + watchdog_init(); watchdog_start(); @@ -315,7 +407,7 @@ uint16_t p=(uint16_t)&__bss_end; do { *(uint16_t *)p = 0x4242; p+=100; - } while (pnext)) { - printf_P(PSTR("Process=%p Thread=%p Name=\"%s\" \n"),p,p->thread,p->name); + PRINTA("Process=%p Thread=%p Name=\"%s\" \n",p,p->thread,PROCESS_NAME_STRING(p)); } } #endif + while(1) { process_run(); @@ -512,57 +590,118 @@ main(void) #ifdef RF230_MIN_RX_POWER uint8_t lastprint; if (rf230_last_rssi != lastprint) { //can be set in halbb.c interrupt routine - printf_P(PSTR("%u "),rf230_last_rssi); + PRINTA("%u ",rf230_last_rssi); lastprint=rf230_last_rssi; } #endif +#if 0 +/* Clock.c can trigger a periodic PLL calibration in the RF230BB driver. + * This can show when that happens. + */ + extern uint8_t rf230_calibrated; + if (rf230_calibrated) { + PRINTA("\nRF230 calibrated!\n"); + rf230_calibrated=0; + } +#endif + #if TESTRTIMER - if (rtimerflag) { //8 seconds is maximum interval, my jackdaw 4% slow +/* Timeout can be increased up to 8 seconds maximum. + * A one second cycle is convenient for triggering the various debug printouts. + * The triggers are staggered to avoid printing everything at once. + * My Jackdaw is 4% slow. + */ + if (rtimerflag) { rtimer_set(&rt, RTIMER_NOW()+ RTIMER_ARCH_SECOND*1UL, 1,(void *) rtimercycle, NULL); rtimerflag=0; + #if STAMPS - if ((rtime%STAMPS)==0) { - printf("%us ",rtime); - } +if ((rtime%STAMPS)==0) { + PRINTA("%us ",rtime); + if (rtime%STAMPS*10) PRINTA("\n"); +} #endif rtime+=1; -#if PINGS - if ((rtime%PINGS)==0) { - PRINTF("**Ping\n"); - pingsomebody(); - } + +#if PINGS && UIP_CONF_IPV6_RPL +extern void raven_ping6(void); +if ((rtime%PINGS)==1) { + PRINTA("**Ping\n"); + raven_ping6(); +} #endif + +#if ROUTES && UIP_CONF_IPV6_RPL +if ((rtime%ROUTES)==2) { + +extern uip_ds6_nbr_t uip_ds6_nbr_cache[]; +extern uip_ds6_route_t uip_ds6_routing_table[]; +extern uip_ds6_netif_t uip_ds6_if; + + uint8_t i,j; + PRINTA("\nAddresses [%u max]\n",UIP_DS6_ADDR_NB); + for (i=0;i"); + PRINTA("\nRoutes [%u max]\n",UIP_DS6_ROUTE_NB); + for(i = 0,j=1; i < UIP_DS6_ROUTE_NB; i++) { + if(uip_ds6_routing_table[i].isused) { + uip_debug_ipaddr_print(&uip_ds6_routing_table[i].ipaddr); + PRINTA("/%u (via ", uip_ds6_routing_table[i].length); + uip_debug_ipaddr_print(&uip_ds6_routing_table[i].nexthop); + // if(uip_ds6_routing_table[i].state.lifetime < 600) { + PRINTA(") %lus\n", uip_ds6_routing_table[i].state.lifetime); + // } else { + // PRINTA(")\n"); + // } + j=0; + } + } + if (j) PRINTA(" "); + PRINTA("\n---------\n"); +} +#endif + +#if STACKMONITOR && CONFIG_STACK_MONITOR +if ((rtime%STACKMONITOR)==3) { + extern uint16_t __bss_end; + uint16_t p=(uint16_t)&__bss_end; + do { + if (*(uint16_t *)p != 0x4242) { + PRINTA("Never-used stack > %d bytes\n",p-(uint16_t)&__bss_end); + break; + } + p+=100; + } while (ptype != UIP_HTONS(UIP_ETHTYPE_IPV6)) { PRINTF("eth2low: Dropping packet w/type=0x%04x\n",uip_ntohs(((struct uip_eth_hdr *) ethHeader)->type)); // printf("!ipv6"); @@ -1043,10 +1044,12 @@ mac_log_802_15_4_rx(const uint8_t* buf, size_t len) { usb_eth_send(raw_buf, sendlen, 0); } } - +/* The rf230bb send driver may call this routine via RF230BB_HOOK_IS_SEND_ENABLED */ bool mac_is_send_enabled(void) { - return usbstick_mode.sendToRf; + if ((usbstick_mode.sendToRf == 0) || (usbstick_mode.sneeze != 0)) return 0; + return 1; +//return usbstick_mode.sendToRf; } /** @} */ diff --git a/platform/avr-ravenusb/sicslow_ethernet.h b/platform/avr-ravenusb/sicslow_ethernet.h index 4a5b632b1..b5956b470 100644 --- a/platform/avr-ravenusb/sicslow_ethernet.h +++ b/platform/avr-ravenusb/sicslow_ethernet.h @@ -65,6 +65,7 @@ typedef struct { uint8_t translate :1; uint8_t raw :1; uint8_t debugOn :1; + uint8_t sneeze :1; } usbstick_mode_t; diff --git a/platform/esb/dev/ir.c b/platform/esb/dev/ir.c index 042d60155..3c1d4313d 100644 --- a/platform/esb/dev/ir.c +++ b/platform/esb/dev/ir.c @@ -251,7 +251,7 @@ interrupt(TIMERB1_VECTOR) Timer_B1 (void) { // reenable interrupt for falling edge P1IFG &= ~(0x04); P1IE |= 0x04; // enable interrupt for recir RC5 - leds_red(LEDS_OFF); + leds_off(LEDS_RED); } ir_pos++; @@ -280,7 +280,7 @@ ir_irq(void) TBCCTL1 |= CCIE; // CCR0 interrupt enabled, interrupt occurs when timer equals CCR0 P1IE &= ~0x04; // disable interrupt for P12 ( ReceiveIR ) - leds_red(LEDS_ON); + leds_on(LEDS_RED); //GREENON; } diff --git a/platform/jcreate/Makefile.jcreate b/platform/jcreate/Makefile.jcreate index 65e98baef..6db2c3697 100644 --- a/platform/jcreate/Makefile.jcreate +++ b/platform/jcreate/Makefile.jcreate @@ -1,7 +1,7 @@ # $Id: Makefile.jcreate,v 1.3 2010/08/25 19:34:42 nifi Exp $ # Some drivers such as ds2411.c only compile under platform sky -CFLAGS += -DCONTIKI_TARGET_SKY +CFLAGS += -DCONTIKI_TARGET_SKY -DLEDS_CONF_ALL=255 CONTIKI_TARGET_SOURCEFILES += contiki-jcreate-platform.c \ battery-sensor.c radio-sensor.c \ diff --git a/platform/mb851/Makefile.mb851 b/platform/mb851/Makefile.mb851 index 71b3ba8bd..1fd2b3a56 100644 --- a/platform/mb851/Makefile.mb851 +++ b/platform/mb851/Makefile.mb851 @@ -5,7 +5,7 @@ ARCH= irq.c sensors.c acc-sensor.c button-sensor.c temperature-sensor.c mems.c CONTIKI_TARGET_DIRS = . dev ifndef CONTIKI_TARGET_MAIN -CONTIKI_TARGET_MAIN = contiki-main.c #contiki-init-net.c +CONTIKI_TARGET_MAIN = contiki-main.c board-mb851.c endif ifdef UIP_CONF_IPV6 diff --git a/platform/mb851/board-mb851.c b/platform/mb851/board-mb851.c new file mode 100644 index 000000000..c66e811bd --- /dev/null +++ b/platform/mb851/board-mb851.c @@ -0,0 +1,47 @@ +#include PLATFORM_HEADER +#include BOARD_HEADER + +void halBoardInit(void) +{ + + return; +} + + +void halBoardPowerDown(void) +{ +} +void halBoardPowerUp(void) +{ + /* Set everything to input value */ + GPIO_PACFGL = (GPIOCFG_IN <COP_CNTLbits.COP_EN = 1; +#endif + /* XXX debug */ /* trigger periodic rtc int */ // clear_rtc_wu_evt(); @@ -230,11 +237,11 @@ void iab_to_eui64(rimeaddr_t *eui64, uint32_t oui, uint16_t iab, uint32_t ext) { /* IAB */ eui64->u8[3] = (iab >> 4) & 0xff; - eui64->u8[4] = (iab & 0xf) << 4; + eui64->u8[4] = (iab << 4) & 0xf0; /* EXT */ - eui64->u8[4] = (ext >> 24) & 0xff; + eui64->u8[4] |= (ext >> 24) & 0xf; eui64->u8[5] = (ext >> 16) & 0xff; eui64->u8[6] = (ext >> 8) & 0xff; eui64->u8[7] = ext & 0xff; @@ -479,6 +486,10 @@ main(void) while(1) { check_maca(); +#if (USE_WDT == 1) + cop_service(); +#endif + /* TODO: replace this with a uart rx interrupt */ if(uart1_input_handler != NULL) { if(uart1_can_get()) { diff --git a/platform/sky/contiki-conf.h b/platform/sky/contiki-conf.h index e14458a05..baf2ce7cf 100644 --- a/platform/sky/contiki-conf.h +++ b/platform/sky/contiki-conf.h @@ -96,7 +96,9 @@ #define SHELL_VARS_CONF_RAM_END 0x2000 #define PROFILE_CONF_ON 0 +#ifndef ENERGEST_CONF_ON #define ENERGEST_CONF_ON 1 +#endif /* ENERGEST_CONF_ON */ #define ELFLOADER_CONF_TEXT_IN_ROM 0 #ifndef ELFLOADER_CONF_DATAMEMORY_SIZE diff --git a/platform/sky/contiki-sky-main.c b/platform/sky/contiki-sky-main.c index 7edac0693..15b3db66f 100644 --- a/platform/sky/contiki-sky-main.c +++ b/platform/sky/contiki-sky-main.c @@ -29,11 +29,11 @@ * @(#)$Id: contiki-sky-main.c,v 1.87 2011/01/09 21:03:42 adamdunkels Exp $ */ -#include #include #include #include +#include #include "contiki.h" diff --git a/platform/z1/Makefile.z1 b/platform/z1/Makefile.z1 index 11079d09a..8205f96d2 100644 --- a/platform/z1/Makefile.z1 +++ b/platform/z1/Makefile.z1 @@ -4,4 +4,3 @@ CONTIKI_TARGET_SOURCEFILES += contiki-z1-platform.c CLEAN += *.z1 include $(CONTIKI)/platform/z1/Makefile.common - diff --git a/platform/z1/contiki-conf.h b/platform/z1/contiki-conf.h index 76ac245ce..cc0e128d9 100644 --- a/platform/z1/contiki-conf.h +++ b/platform/z1/contiki-conf.h @@ -62,13 +62,10 @@ /* Network setup for non-IPv6 (rime). */ #define NETSTACK_CONF_NETWORK rime_driver -//#define NETSTACK_CONF_MAC csma_driver #define NETSTACK_CONF_MAC nullmac_driver /* #define NETSTACK_CONF_RDC contikimac_driver */ -//#define NETSTACK_CONF_RDC contikimac_driver #define NETSTACK_CONF_RDC nullrdc_driver -#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 128 //Enric like in SKY -//#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8 //like in SKY +#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 128 #define NETSTACK_CONF_FRAMER framer_802154 #define CC2420_CONF_AUTOACK 0 diff --git a/platform/z1/contiki-z1-main.c b/platform/z1/contiki-z1-main.c index cf649a1c0..6363ad179 100644 --- a/platform/z1/contiki-z1-main.c +++ b/platform/z1/contiki-z1-main.c @@ -69,6 +69,7 @@ SENSORS(&button_sensor); + #if DCOSYNCH_CONF_ENABLED static struct timer mgt_timer; #endif @@ -260,6 +261,8 @@ main(int argc, char **argv) set_rime_addr(); cc2420_init(); + accm_init(); + { uint8_t longaddr[8]; uint16_t shortaddr; diff --git a/platform/z1/dev/adxl345.c b/platform/z1/dev/adxl345.c index 52d0b5f7d..c38a3a19b 100644 --- a/platform/z1/dev/adxl345.c +++ b/platform/z1/dev/adxl345.c @@ -43,7 +43,7 @@ #include #include "contiki.h" #include "adxl345.h" -#include "cc2420-arch.c" +#include "cc2420.h" #include "i2cmaster.h" /* Callback pointers when interrupt occurs */ @@ -401,6 +401,7 @@ interrupt(PORT1_VECTOR) port1_isr (void) { } ENERGEST_OFF(ENERGEST_TYPE_IRQ); } + /*---------------------------------------------------------------------------*/ #endif diff --git a/tools/coffee-manager/build.xml b/tools/coffee-manager/build.xml index cd082759e..0712f73c6 100644 --- a/tools/coffee-manager/build.xml +++ b/tools/coffee-manager/build.xml @@ -7,7 +7,7 @@ - + diff --git a/tools/cooja/apps/avrora/build.xml b/tools/cooja/apps/avrora/build.xml index 2b6d83033..32e4dcf26 100644 --- a/tools/cooja/apps/avrora/build.xml +++ b/tools/cooja/apps/avrora/build.xml @@ -23,7 +23,8 @@ - + diff --git a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMote.java b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMote.java old mode 100755 new mode 100644 diff --git a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZLED.java b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZLED.java old mode 100755 new mode 100644 diff --git a/tools/cooja/apps/mrm/build.xml b/tools/cooja/apps/mrm/build.xml index b9049eeb7..0b4e7dd65 100644 --- a/tools/cooja/apps/mrm/build.xml +++ b/tools/cooja/apps/mrm/build.xml @@ -12,7 +12,8 @@ - + diff --git a/tools/cooja/apps/mspsim/build.xml b/tools/cooja/apps/mspsim/build.xml index d877f4e7a..e1b5dac71 100644 --- a/tools/cooja/apps/mspsim/build.xml +++ b/tools/cooja/apps/mspsim/build.xml @@ -36,7 +36,8 @@ - + diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspMoteID.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspMoteID.java index 66e767511..0c8f61ce3 100644 --- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspMoteID.java +++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspMoteID.java @@ -109,6 +109,34 @@ public class MspMoteID extends MoteID { } }); } + if (moteMem.variableExists("ActiveMessageAddressC__addr")) { + this.mote.getCPU().setBreakPoint(moteMem.getVariableAddress("ActiveMessageAddressC__addr"), new CPUMonitor() { + public void cpuAction(int type, int adr, int data) { + if (type != MEMORY_WRITE) { + return; + } + if (data == moteID) { + return; + } + Simulation s = mote.getSimulation(); + s.scheduleEvent(writeIDEvent, s.getSimulationTime()); + } + }); + } + if (moteMem.variableExists("ActiveMessageAddressC$addr")) { + this.mote.getCPU().setBreakPoint(moteMem.getVariableAddress("ActiveMessageAddressC$addr"), new CPUMonitor() { + public void cpuAction(int type, int adr, int data) { + if (type != MEMORY_WRITE) { + return; + } + if (data == moteID) { + return; + } + Simulation s = mote.getSimulation(); + s.scheduleEvent(writeIDEvent, s.getSimulationTime()); + } + }); + } } public int getMoteID() { diff --git a/tools/cooja/apps/native_gateway/build.xml b/tools/cooja/apps/native_gateway/build.xml index 1dbfa8bd3..a290a3d8c 100644 --- a/tools/cooja/apps/native_gateway/build.xml +++ b/tools/cooja/apps/native_gateway/build.xml @@ -23,7 +23,8 @@ Requires pre-installation of Jpcap and (Windows-only) WinPcap. - + diff --git a/tools/cooja/apps/serial_socket/build.xml b/tools/cooja/apps/serial_socket/build.xml index 0872d8d59..7164eb260 100644 --- a/tools/cooja/apps/serial_socket/build.xml +++ b/tools/cooja/apps/serial_socket/build.xml @@ -10,7 +10,7 @@ - + diff --git a/tools/cooja/build.xml b/tools/cooja/build.xml index f57d0f82a..96bdf532d 100644 --- a/tools/cooja/build.xml +++ b/tools/cooja/build.xml @@ -68,7 +68,8 @@ The COOJA Simulator - + @@ -189,7 +190,7 @@ The COOJA Simulator - + diff --git a/tools/cooja/config/scripts/plugins.js b/tools/cooja/config/scripts/plugins.js index 48cd2097c..9e9881dd3 100644 --- a/tools/cooja/config/scripts/plugins.js +++ b/tools/cooja/config/scripts/plugins.js @@ -7,14 +7,26 @@ /* Started plugins are available from the GUI object */ -while (true) { +TIMEOUT(60000); +counter=0; +plugins=0; + +timeout_function = function my_fun() { + log.log("Script timed out.\n"); + log.log(plugins + " plugins were referenced\n"); +} + +while (counter<10) { + counter++; + GENERATE_MSG(1000, "wait"); YIELD_THEN_WAIT_UNTIL(msg.equals("wait")); /* Toggle Log Listener filter */ plugin = mote.getSimulation().getGUI().getStartedPlugin("se.sics.cooja.plugins.LogListener"); if (plugin != null) { + plugins++; log.log("LogListener: Setting filter: " + plugin.getFilter() + "\n"); if (plugin.getFilter() == null || !plugin.getFilter().equals("Contiki")) { plugin.setFilter("Contiki"); @@ -29,6 +41,7 @@ while (true) { /* Extract Timeline statistics */ plugin = mote.getSimulation().getGUI().getStartedPlugin("se.sics.cooja.plugins.TimeLine"); if (plugin != null) { + plugins++; stats = plugin.extractStatistics(); if (stats.length() > 40) { /* Stripping */ @@ -43,6 +56,7 @@ while (true) { /* Select time in Radio Logger */ plugin = mote.getSimulation().getGUI().getStartedPlugin("se.sics.cooja.plugins.RadioLogger"); if (plugin != null) { + plugins++; log.log("RadioLogger: Showing logged radio packet at mid simulation\n"); plugin.trySelectTime(time/2); } diff --git a/tools/cooja/examples/appmote_rimeabc/build.xml b/tools/cooja/examples/appmote_rimeabc/build.xml index 7ca5753d2..06dd4c1d4 100644 --- a/tools/cooja/examples/appmote_rimeabc/build.xml +++ b/tools/cooja/examples/appmote_rimeabc/build.xml @@ -9,7 +9,7 @@ - + diff --git a/tools/cooja/examples/jni_test/mac_users/nmandsize b/tools/cooja/examples/jni_test/mac_users/nmandsize old mode 100644 new mode 100755 diff --git a/tools/cooja/examples/project_new_interface/build.xml b/tools/cooja/examples/project_new_interface/build.xml index 4df9641b3..b0a765559 100644 --- a/tools/cooja/examples/project_new_interface/build.xml +++ b/tools/cooja/examples/project_new_interface/build.xml @@ -13,7 +13,8 @@ - + diff --git a/tools/cooja/examples/project_new_plugin/build.xml b/tools/cooja/examples/project_new_plugin/build.xml index 8143949c7..7b3e78e58 100644 --- a/tools/cooja/examples/project_new_plugin/build.xml +++ b/tools/cooja/examples/project_new_plugin/build.xml @@ -13,7 +13,8 @@ - + diff --git a/tools/cooja/examples/project_new_radiomedium/build.xml b/tools/cooja/examples/project_new_radiomedium/build.xml index 7e89b0427..81b0174bb 100644 --- a/tools/cooja/examples/project_new_radiomedium/build.xml +++ b/tools/cooja/examples/project_new_radiomedium/build.xml @@ -13,7 +13,8 @@ - + diff --git a/tools/cooja/java/se/sics/cooja/GUI.java b/tools/cooja/java/se/sics/cooja/GUI.java index eb10af152..13625787f 100644 --- a/tools/cooja/java/se/sics/cooja/GUI.java +++ b/tools/cooja/java/se/sics/cooja/GUI.java @@ -1882,19 +1882,30 @@ public class GUI extends Observable { } /** - * Returns started plugin with given class name, if any. + * Returns started plugin that ends with given class name, if any. * * @param classname Class name * @return Plugin instance */ - public Plugin getStartedPlugin(String classname) { + public Plugin getPlugin(String classname) { for (Plugin p: startedPlugins) { - if (p.getClass().getName().equals(classname)) { + if (p.getClass().getName().endsWith(classname)) { return p; } } return null; } + + /** + * Returns started plugin with given class name, if any. + * + * @param classname Class name + * @return Plugin instance + * @deprecated + */ + public Plugin getStartedPlugin(String classname) { + return getPlugin(classname); + } public Plugin[] getStartedPlugins() { return startedPlugins.toArray(new Plugin[0]); diff --git a/tools/cooja/java/se/sics/cooja/plugins/DGRMConfigurator.java b/tools/cooja/java/se/sics/cooja/plugins/DGRMConfigurator.java index ae363ae97..b1c47b58d 100644 --- a/tools/cooja/java/se/sics/cooja/plugins/DGRMConfigurator.java +++ b/tools/cooja/java/se/sics/cooja/plugins/DGRMConfigurator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Swedish Institute of Computer Science. + * Copyright (c) 2010, Swedish Institute of Computer Science. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -32,9 +32,13 @@ package se.sics.cooja.plugins; import java.awt.BorderLayout; +import java.awt.GridLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.MouseEvent; +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; import java.util.Observable; import java.util.Observer; @@ -42,12 +46,14 @@ import javax.swing.DefaultCellEditor; import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JDialog; +import javax.swing.JFileChooser; import javax.swing.JOptionPane; +import javax.swing.JPanel; import javax.swing.JScrollPane; -import javax.swing.JSpinner; import javax.swing.JTable; import javax.swing.ListSelectionModel; -import javax.swing.SpinnerNumberModel; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; import javax.swing.table.AbstractTableModel; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; @@ -60,8 +66,12 @@ import se.sics.cooja.Mote; import se.sics.cooja.PluginType; import se.sics.cooja.Simulation; import se.sics.cooja.VisPlugin; +import se.sics.cooja.interfaces.Radio; +import se.sics.cooja.radiomediums.AbstractRadioMedium; +import se.sics.cooja.radiomediums.DGRMDestinationRadio; import se.sics.cooja.radiomediums.DirectedGraphMedium; -import se.sics.cooja.radiomediums.DirectedGraphMedium.DGRMDestinationRadio; +import se.sics.cooja.radiomediums.DirectedGraphMedium.Edge; +import se.sics.cooja.util.StringUtils; /** * Simple user interface for configuring edges for the Directed Graph @@ -70,18 +80,19 @@ import se.sics.cooja.radiomediums.DirectedGraphMedium.DGRMDestinationRadio; * @see DirectedGraphMedium * @author Fredrik Osterlind */ -@ClassDescription("DGRM Configurator") +@ClassDescription("DGRM Links") @PluginType(PluginType.SIM_PLUGIN) public class DGRMConfigurator extends VisPlugin { - private static Logger logger = Logger.getLogger(DGRMConfigurator.class); + private static final long serialVersionUID = 4769638341635882051L; + private static Logger logger = Logger.getLogger(DGRMConfigurator.class); private final static int IDX_SRC = 0; private final static int IDX_DST = 1; private final static int IDX_RATIO = 2; - private final static int IDX_DELAY = 3; - private final static int IDX_DEL = 4; - private final static String[] columns = new String[] { - "Source", "Destination", "Success Ratio (%)", "Delay (ms)", "Delete" + private final static int IDX_SIGNAL = 3; + private final static int IDX_DELAY = 4; + private final static String[] COLUMN_NAMES = new String[] { + "Source", "Destination", "RX Ratio", "RSSI", "Delay" }; private GUI gui = null; @@ -89,12 +100,11 @@ public class DGRMConfigurator extends VisPlugin { private Observer radioMediumObserver; private JTable graphTable = null; private JComboBox combo = new JComboBox(); + private JButton removeButton; public DGRMConfigurator(Simulation sim, GUI gui) { super("DGRM Configurator", gui); - this.gui = gui; - radioMedium = (DirectedGraphMedium) sim.getRadioMedium(); /* Listen for graph updates */ @@ -106,55 +116,53 @@ public class DGRMConfigurator extends VisPlugin { /* Represent directed graph by table */ graphTable = new JTable(model) { - public TableCellEditor getCellEditor(int row, int column) { + private static final long serialVersionUID = -4680013510092815210L; + public TableCellEditor getCellEditor(int row, int column) { + combo.removeAllItems(); if (column == IDX_RATIO) { - combo.removeAllItems(); - combo.addItem(1.0); - combo.addItem(0.9); - combo.addItem(0.8); - combo.addItem(0.7); - combo.addItem(0.6); - combo.addItem(0.5); - combo.addItem(0.4); - combo.addItem(0.3); - combo.addItem(0.2); - combo.addItem(0.1); - combo.addItem(0.0); + for (double d=1.0; d >= 0.0; d -= 0.1) { + combo.addItem(d); + } + } else if (column == IDX_SIGNAL) { + for (double d=AbstractRadioMedium.SS_STRONG; d >= AbstractRadioMedium.SS_WEAK; d -= 1) { + combo.addItem((int) d); + } + } else if (column == IDX_DELAY) { + for (double d=0; d <= 5; d++) { + combo.addItem(d); + } } - if (column == IDX_DELAY) { - combo.removeAllItems(); - combo.addItem(0); - combo.addItem(1); - combo.addItem(2); - combo.addItem(3); - combo.addItem(4); - combo.addItem(5); - } - return super.getCellEditor(row, column); } - public String getToolTipText(MouseEvent e) { - java.awt.Point p = e.getPoint(); - int row = rowAtPoint(p); - int col = convertColumnIndexToModel(columnAtPoint(p)); - - /* TODO */ - return super.getToolTipText(); - } }; + graphTable.setFillsViewportHeight(true); combo.setEditable(true); + graphTable.getColumnModel().getColumn(IDX_RATIO).setCellRenderer(new DefaultTableCellRenderer() { - public void setValue(Object value) { + private static final long serialVersionUID = 4470088575039698508L; + public void setValue(Object value) { if (!(value instanceof Double)) { setText(value.toString()); return; } double v = ((Double) value).doubleValue(); - setText((Math.round(v*1000.0) / 10.0) + "%"); + setText(String.format("%1.1f%%", 100*v)); + } + }); + graphTable.getColumnModel().getColumn(IDX_SIGNAL).setCellRenderer(new DefaultTableCellRenderer() { + private static final long serialVersionUID = -7170745293267593460L; + public void setValue(Object value) { + if (!(value instanceof Long)) { + setText(value.toString()); + return; + } + double v = ((Double) value).doubleValue(); + setText(String.format("%1.1f dBm", v)); } }); graphTable.getColumnModel().getColumn(IDX_DELAY).setCellRenderer(new DefaultTableCellRenderer() { - public void setValue(Object value) { + private static final long serialVersionUID = -4669897764928372246L; + public void setValue(Object value) { if (!(value instanceof Long)) { setText(value.toString()); return; @@ -164,21 +172,50 @@ public class DGRMConfigurator extends VisPlugin { } }); graphTable.getColumnModel().getColumn(IDX_RATIO).setCellEditor(new DefaultCellEditor(combo)); + graphTable.getColumnModel().getColumn(IDX_SIGNAL).setCellEditor(new DefaultCellEditor(combo)); graphTable.getColumnModel().getColumn(IDX_DELAY).setCellEditor(new DefaultCellEditor(combo)); graphTable.setAutoResizeMode(JTable.AUTO_RESIZE_SUBSEQUENT_COLUMNS); graphTable.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - + + JPanel southPanel = new JPanel(new GridLayout(1, 3)); JButton button = new JButton("Add"); button.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { doAddLink(); } }); - final JScrollPane scrollPane = new JScrollPane(graphTable); + southPanel.add(button); + button = new JButton("Remove"); + button.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + doRemoveSelectedLink(); + } + }); + removeButton = button; + removeButton.setEnabled(false); + southPanel.add(button); + button = new JButton("Import"); + button.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + doImportFromFile(); + } + }); + southPanel.add(button); + getContentPane().setLayout(new BorderLayout()); - add(BorderLayout.CENTER, scrollPane); - add(BorderLayout.SOUTH, button); + add(BorderLayout.CENTER, new JScrollPane(graphTable)); + add(BorderLayout.SOUTH, southPanel); + + graphTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() { + public void valueChanged(ListSelectionEvent e) { + ListSelectionModel lsm = (ListSelectionModel)e.getSource(); + if (e.getValueIsAdjusting()) { + return; + } + removeButton.setEnabled(!lsm.isSelectionEmpty()); + } + }); model.fireTableDataChanged(); setSize(400, 300); @@ -186,29 +223,18 @@ public class DGRMConfigurator extends VisPlugin { private void doAddLink() { JComboBox source = new JComboBox(); - for (int i=0; i < gui.getSimulation().getMotesCount(); i++) { - source.addItem(gui.getSimulation().getMote(i)); - } - JComboBox dest = new JComboBox(); - for (int i=0; i < gui.getSimulation().getMotesCount(); i++) { - dest.addItem(gui.getSimulation().getMote(i)); + for (Mote m: gui.getSimulation().getMotes()) { + source.addItem(m); + dest.addItem(m); } - dest.addItem("ALL"); - - JSpinner ratio = new JSpinner(new SpinnerNumberModel(1.0, 0.0, 1.0, 0.01)); - JSpinner delay = new JSpinner(new SpinnerNumberModel(0, 0, 100, 1)); /* User input */ Object description[] = { - columns[0], + COLUMN_NAMES[0], source, - columns[1], - dest, - columns[2], - ratio, - columns[3], - delay + COLUMN_NAMES[1], + dest }; JOptionPane optionPane = new JOptionPane(); optionPane.setMessage(description); @@ -216,34 +242,20 @@ public class DGRMConfigurator extends VisPlugin { String options[] = new String[] {"Cancel", "Add"}; optionPane.setOptions(options); optionPane.setInitialValue(options[1]); - JDialog dialog = optionPane.createDialog(gui.getTopParentContainer(), title); - dialog.setTitle("Add new link"); + JDialog dialog = optionPane.createDialog(this, title); + dialog.setTitle("Add graph edge"); dialog.setVisible(true); if (optionPane.getValue() == null || !optionPane.getValue().equals("Add")) { return; } /* Register new edge with radio medium */ - DirectedGraphMedium.Edge newEdge; - if (dest.getSelectedItem() instanceof Mote) { - newEdge = new DirectedGraphMedium.Edge( - ((Mote) source.getSelectedItem()).getInterfaces().getRadio(), - new DGRMDestinationRadio( - ((Mote) dest.getSelectedItem()).getInterfaces().getRadio(), - ((Number)ratio.getValue()).doubleValue(), - ((Number)delay.getValue()).longValue() - ) - ); - } else { - newEdge = new DirectedGraphMedium.Edge( - ((Mote) source.getSelectedItem()).getInterfaces().getRadio(), - new DGRMDestinationRadio( - null, - ((Number)ratio.getValue()).doubleValue(), - ((Number)delay.getValue()).longValue() - ) - ); - } + DirectedGraphMedium.Edge newEdge = new DirectedGraphMedium.Edge( + ((Mote) source.getSelectedItem()).getInterfaces().getRadio(), + new DGRMDestinationRadio( + ((Mote) dest.getSelectedItem()).getInterfaces().getRadio() + ) + ); radioMedium.addEdge(newEdge); model.fireTableDataChanged(); } @@ -252,98 +264,180 @@ public class DGRMConfigurator extends VisPlugin { radioMedium.removeEdge(edge); model.fireTableDataChanged(); } + private void doRemoveSelectedLink() { + int firstIndex = graphTable.getSelectedRow(); + if (firstIndex < 0) { + return; + } - final AbstractTableModel model = new AbstractTableModel() { - public String getColumnName(int column) { - if (column < 0 || column >= columns.length) { - logger.fatal("Unknown column: " + column); - return ""; + doRemoveLink(radioMedium.getEdges()[firstIndex]); + } + private void doImportFromFile() { + /* Delete existing edges */ + if (radioMedium.getEdges().length > 0) { + String[] options = new String[] { "Remove", "Cancel" }; + int n = JOptionPane.showOptionDialog( + GUI.getTopParentContainer(), + "Importing edges will remove all your existing edges.", + "Clear edge table?", JOptionPane.YES_NO_OPTION, + JOptionPane.WARNING_MESSAGE, null, options, options[0]); + if (n != JOptionPane.YES_OPTION) { + return; + } + for (DirectedGraphMedium.Edge e: radioMedium.getEdges()) { + radioMedium.removeEdge(e); } - return columns[column]; } + /* Select file to import edges from */ + JFileChooser fc = new JFileChooser(); + File suggest = new File(GUI.getExternalToolsSetting("DGRM_IMPORT_LINKS_FILE", "cooja_dgrm_links.dat")); + fc.setSelectedFile(suggest); + int returnVal = fc.showOpenDialog(GUI.getTopParentContainer()); + if (returnVal != JFileChooser.APPROVE_OPTION) { + return; + } + File file = fc.getSelectedFile(); + if (file == null || !file.exists() || !file.canRead()) { + logger.fatal("No read access to file: " + file); + return; + } + GUI.setExternalToolsSetting("DGRM_IMPORT_LINKS_FILE", file.getPath()); + + /* Parse and import edges */ + try { + importEdges(parseDGRMLinksFile(file, gui.getSimulation())); + } catch (Exception e) { + GUI.showErrorDialog(this, "Error when importing DGRM links from " + file.getName(), e, false); + } + } + + private void importEdges(DirectedGraphMedium.Edge[] edges) { + Arrays.sort(edges, new Comparator() { + public int compare(Edge o1, Edge o2) { + return o1.source.getMote().getID() - o2.source.getMote().getID(); + } + }); + for (DirectedGraphMedium.Edge e: edges) { + radioMedium.addEdge(e); + } + logger.info("Imported " + edges.length + " DGRM edges"); + } + + static final int INDEX_SRC = 0; + static final int INDEX_DST = 1; + static final int INDEX_PRR = 2; + static final int INDEX_PRR_CI = 3; + static final int INDEX_NUM_TX = 4; + static final int INDEX_NUM_RX = 5; + static final int INDEX_RSSI_MEDIAN = 6; + static final int INDEX_RSSI_MIN = 7; + static final int INDEX_RSSI_MAX = 8; + public static DirectedGraphMedium.Edge[] parseDGRMLinksFile(File file, Simulation simulation) { + String fileContents = StringUtils.loadFromFile(file); + ArrayList edges = new ArrayList(); + + /* format: # [src] [dst] [prr] [prr_ci] [num_tx] [num_rx] [rssi] [rssi_min] [rssi_max] */ + for (String l: fileContents.split("\n")) { + l = l.trim(); + if (l.startsWith("#")) { + continue; + } + + Mote m; + String[] arr = l.split(" "); + int source = Integer.parseInt(arr[INDEX_SRC]); + m = simulation.getMoteWithID(source); + if (m == null) { + throw new RuntimeException("No simulation mote with ID " + source); + } + Radio sourceRadio = m.getInterfaces().getRadio(); + int dst = Integer.parseInt(arr[INDEX_DST]); + m = simulation.getMoteWithID(dst); + if (m == null) { + throw new RuntimeException("No simulation mote with ID " + dst); + } + DGRMDestinationRadio destRadio = new DGRMDestinationRadio(m.getInterfaces().getRadio()); + double prr = Double.parseDouble(arr[INDEX_PRR]); + /*double prrConfidence = Double.parseDouble(arr[INDEX_PRR_CI]);*/ + /*int numTX <- INDEX_NUM_TX;*/ + /*int numRX <- INDEX_NUM_RX;*/ + double rssi = Double.parseDouble(arr[INDEX_RSSI_MEDIAN]); + /*int rssiMin <- INDEX_RSSI_MIN;*/ + /*int rssiMax <- INDEX_RSSI_MAX;*/ + + DirectedGraphMedium.Edge edge = new DirectedGraphMedium.Edge(sourceRadio, destRadio); + destRadio.delay = 0; + destRadio.ratio = prr; + /*destRadio.prrConfidence = prrConfidence;*/ + destRadio.signal = rssi; + edges.add(edge); + } + return edges.toArray(new DirectedGraphMedium.Edge[0]); + } + + final AbstractTableModel model = new AbstractTableModel() { + private static final long serialVersionUID = 9101118401527171218L; + public String getColumnName(int column) { + if (column < 0 || column >= COLUMN_NAMES.length) { + return ""; + } + return COLUMN_NAMES[column]; + } public int getRowCount() { return radioMedium.getEdges().length; } - public int getColumnCount() { - return columns.length; + return COLUMN_NAMES.length; } - public Object getValueAt(int row, int column) { if (row < 0 || row >= radioMedium.getEdges().length) { - logger.fatal("Unknown row: " + row); return ""; } - if (column < 0 || column >= columns.length) { - logger.fatal("Unknown column: " + column); + if (column < 0 || column >= COLUMN_NAMES.length) { return ""; } - DirectedGraphMedium.Edge edge = radioMedium.getEdges()[row]; if (column == IDX_SRC) { - if (edge.source == null) { - return "?"; - } return edge.source.getMote(); } if (column == IDX_DST) { - if (edge.superDest.toAll) { - return "ALL"; - } return edge.superDest.radio.getMote(); } if (column == IDX_RATIO) { return ((DGRMDestinationRadio)edge.superDest).ratio; } + if (column == IDX_SIGNAL) { + return ((DGRMDestinationRadio)edge.superDest).signal; + } if (column == IDX_DELAY) { return ((DGRMDestinationRadio)edge.superDest).delay / Simulation.MILLISECOND; } - if (column == IDX_DEL) { - return new Boolean(false); - } - - logger.debug("Column data not implemented: " + column); - return "?"; + return ""; } - public void setValueAt(Object value, int row, int column) { if (row < 0 || row >= radioMedium.getEdges().length) { - logger.fatal("Unknown row: " + row); return; } - if (column < 0 || column >= columns.length) { - logger.fatal("Unknown column: " + column); + if (column < 0 || column >= COLUMN_NAMES.length) { return; } DirectedGraphMedium.Edge edge = radioMedium.getEdges()[row]; - if (column == IDX_RATIO) { - /* Success ratio */ - try { - ((DGRMDestinationRadio)edge.superDest).ratio = - ((Number)value).doubleValue(); - radioMedium.requestEdgeAnalysis(); - } catch (ClassCastException e) { - } - return; + try { + if (column == IDX_RATIO) { + ((DGRMDestinationRadio)edge.superDest).ratio = ((Number)value).doubleValue(); + } else if (column == IDX_SIGNAL) { + ((DGRMDestinationRadio)edge.superDest).signal = ((Number)value).doubleValue(); + } else if (column == IDX_DELAY) { + ((DGRMDestinationRadio)edge.superDest).delay = + ((Number)value).longValue() * Simulation.MILLISECOND; + } else { + super.setValueAt(value, row, column); + } + radioMedium.requestEdgeAnalysis(); + } catch (ClassCastException e) { } - if (column == IDX_DELAY) { - /* Propagation delay (ms) */ - try { - ((DGRMDestinationRadio)edge.superDest).delay = - ((Number)value).longValue() * Simulation.MILLISECOND; - radioMedium.requestEdgeAnalysis(); - } catch (ClassCastException e) { - } - return; - } - if (column == IDX_DEL) { - /* Delete link */ - doRemoveLink(edge); - return; - } - super.setValueAt(value, row, column); } public boolean isCellEditable(int row, int column) { @@ -357,24 +451,22 @@ public class DGRMConfigurator extends VisPlugin { return false; } if (column == IDX_DST) { - if (!radioMedium.getEdges()[row].superDest.toAll) { - gui.signalMoteHighlight(radioMedium.getEdges()[row].superDest.radio.getMote()); - } + gui.signalMoteHighlight(radioMedium.getEdges()[row].superDest.radio.getMote()); return false; } if (column == IDX_RATIO) { return true; } - if (column == IDX_DELAY) { + if (column == IDX_SIGNAL) { return true; } - if (column == IDX_DEL) { + if (column == IDX_DELAY) { return true; } return false; } - public Class getColumnClass(int c) { + public Class getColumnClass(int c) { return getValueAt(0, c).getClass(); } }; diff --git a/tools/cooja/java/se/sics/cooja/plugins/LogScriptEngine.java b/tools/cooja/java/se/sics/cooja/plugins/LogScriptEngine.java index 886b605fe..4482c2934 100644 --- a/tools/cooja/java/se/sics/cooja/plugins/LogScriptEngine.java +++ b/tools/cooja/java/se/sics/cooja/plugins/LogScriptEngine.java @@ -434,6 +434,8 @@ public class LogScriptEngine { Hashtable hash = new Hashtable(); engine.put("global", hash); + engine.put("sim", simulation); + engine.put("gui", simulation.getGUI()); scriptMote = new ScriptMote(); engine.put("node", scriptMote); diff --git a/tools/cooja/java/se/sics/cooja/plugins/skins/DGRMVisualizerSkin.java b/tools/cooja/java/se/sics/cooja/plugins/skins/DGRMVisualizerSkin.java index f0ae3595f..79ab97f76 100644 --- a/tools/cooja/java/se/sics/cooja/plugins/skins/DGRMVisualizerSkin.java +++ b/tools/cooja/java/se/sics/cooja/plugins/skins/DGRMVisualizerSkin.java @@ -48,9 +48,9 @@ import se.sics.cooja.interfaces.Position; import se.sics.cooja.interfaces.Radio; import se.sics.cooja.plugins.Visualizer; import se.sics.cooja.plugins.VisualizerSkin; +import se.sics.cooja.radiomediums.DGRMDestinationRadio; +import se.sics.cooja.radiomediums.DestinationRadio; import se.sics.cooja.radiomediums.DirectedGraphMedium; -import se.sics.cooja.radiomediums.DirectedGraphMedium.DGRMDestinationRadio; -import se.sics.cooja.radiomediums.DirectedGraphMedium.DestinationRadio; @ClassDescription("Radio environment (DGRM)") public class DGRMVisualizerSkin implements VisualizerSkin { @@ -142,16 +142,15 @@ public class DGRMVisualizerSkin implements VisualizerSkin { if (prob == 0.0d) { continue; } - msg = (double)(((int)(1000*prob))/10.0) + "%"; + msg = String.format("%1.1f%%", 100.0*prob); Position pos = r.radio.getPosition(); Point pixel = visualizer.transformPositionToPixel(pos); msgWidth = fm.stringWidth(msg); - g.setColor(Color.LIGHT_GRAY); + g.setColor(new Color(1-(float)prob, (float)prob, 0.0f)); g.drawLine(x, y, pixel.x, pixel.y); g.setColor(Color.BLACK); g.drawString(msg, pixel.x - msgWidth/2, pixel.y + 2*Visualizer.MOTE_RADIUS + 3); } - } public void paintAfterMotes(Graphics g) { diff --git a/tools/cooja/java/se/sics/cooja/radiomediums/DGRMDestinationRadio.java b/tools/cooja/java/se/sics/cooja/radiomediums/DGRMDestinationRadio.java new file mode 100644 index 000000000..cf1dc08ba --- /dev/null +++ b/tools/cooja/java/se/sics/cooja/radiomediums/DGRMDestinationRadio.java @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2010, Swedish Institute of Computer Science. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $Id: DirectedGraphMedium.java,v 1.8 2010/12/02 15:25:50 fros4943 Exp $ + */ + +package se.sics.cooja.radiomediums; + +import java.util.Collection; + +import org.jdom.Element; + +import se.sics.cooja.Simulation; +import se.sics.cooja.interfaces.Radio; + +public class DGRMDestinationRadio extends DestinationRadio { + public double ratio = 1.0; /* Link success ratio (per packet). */ + public double signal = AbstractRadioMedium.SS_STRONG; /* RSSI */ + public long delay = 0; /* EXPERIMENTAL: Propagation delay (us). */ + + public DGRMDestinationRadio() { + super(); + } + public DGRMDestinationRadio(Radio dest) { + super(dest); + } + + protected Object clone() { + DGRMDestinationRadio clone = new DGRMDestinationRadio(this.radio); + clone.ratio = this.ratio; + clone.delay = this.delay; + clone.signal = this.signal; + return clone; + } + + public Collection getConfigXML() { + Collection config = super.getConfigXML(); + Element element; + + element = new Element("ratio"); + element.setText("" + ratio); + config.add(element); + + element = new Element("signal"); + element.setText("" + signal); + config.add(element); + + element = new Element("delay"); + element.setText("" + delay); + config.add(element); + + return config; + } + + public boolean setConfigXML(final Collection configXML, Simulation simulation) { + if (!super.setConfigXML(configXML, simulation)) { + return false; + } + for (Element element : configXML) { + if (element.getName().equals("ratio")) { + ratio = Double.parseDouble(element.getText()); + } else if (element.getName().equals("signal")) { + signal = Double.parseDouble(element.getText()); + } else if (element.getName().equals("delay")) { + delay = Long.parseLong(element.getText()); + } + } + return true; + } +} diff --git a/tools/cooja/java/se/sics/cooja/radiomediums/DestinationRadio.java b/tools/cooja/java/se/sics/cooja/radiomediums/DestinationRadio.java new file mode 100644 index 000000000..2613af0c6 --- /dev/null +++ b/tools/cooja/java/se/sics/cooja/radiomediums/DestinationRadio.java @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2010, Swedish Institute of Computer Science. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $Id: DirectedGraphMedium.java,v 1.8 2010/12/02 15:25:50 fros4943 Exp $ + */ + +package se.sics.cooja.radiomediums; + +import java.util.ArrayList; +import java.util.Collection; + +import org.apache.log4j.Logger; +import org.jdom.Element; + +import se.sics.cooja.Simulation; +import se.sics.cooja.interfaces.Radio; + +public class DestinationRadio { + private static Logger logger = Logger.getLogger(DestinationRadio.class); + + public Radio radio; /* destination radio */ + public DestinationRadio() { + } + public DestinationRadio(Radio dest) { + this.radio = dest; + } + + public String toString() { + return radio.getMote().toString(); + } + + public Collection getConfigXML() { + ArrayList config = new ArrayList(); + Element element; + + element = new Element("radio"); + element.setText("" + radio.getMote().getID()); + config.add(element); + return config; + } + + public boolean setConfigXML(Collection configXML, Simulation simulation) { + for (Element element : configXML) { + if (element.getName().equals("radio")) { + radio = simulation.getMoteWithID(Integer.parseInt(element.getText())).getInterfaces().getRadio(); + if (radio == null) { + throw new RuntimeException("No mote with ID " + element.getText()); + } + } + } + return true; + } +} diff --git a/tools/cooja/java/se/sics/cooja/radiomediums/DirectedGraphMedium.java b/tools/cooja/java/se/sics/cooja/radiomediums/DirectedGraphMedium.java index adbbaac4b..b61004a48 100644 --- a/tools/cooja/java/se/sics/cooja/radiomediums/DirectedGraphMedium.java +++ b/tools/cooja/java/se/sics/cooja/radiomediums/DirectedGraphMedium.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Swedish Institute of Computer Science. + * Copyright (c) 2010, Swedish Institute of Computer Science. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -36,13 +36,11 @@ import java.util.Collection; import java.util.Enumeration; import java.util.Hashtable; import java.util.Random; -import java.util.Vector; import org.apache.log4j.Logger; import org.jdom.Element; import se.sics.cooja.ClassDescription; -import se.sics.cooja.Mote; import se.sics.cooja.RadioConnection; import se.sics.cooja.Simulation; import se.sics.cooja.interfaces.Radio; @@ -57,496 +55,390 @@ import se.sics.cooja.plugins.skins.DGRMVisualizerSkin; * as a basis for other radio medium implementations. * * The stand-alone radio medium supports propagation delays and - * and single-value per-link transmission success ratio. + * and per-link transmission success ratio/RSSI. * - * @see UDGM + * @see AbstractRadioMedium * @author Fredrik Osterlind */ @ClassDescription("Directed Graph Radio Medium (DGRM)") public class DirectedGraphMedium extends AbstractRadioMedium { - private static Logger logger = Logger.getLogger(DirectedGraphMedium.class); - - private Simulation simulation; - private Random random; - - private ArrayList edges = new ArrayList(); - private boolean edgesDirty = true; - - /* Used for optimizing lookup time */ - private Hashtable edgesTable = new Hashtable(); - - public DirectedGraphMedium() { - /* Do not initialize radio medium: use only for hash table */ - super(null); - Visualizer.registerVisualizerSkin(DGRMVisualizerSkin.class); - } - - public DirectedGraphMedium(Simulation simulation) { - super(simulation); - this.simulation = simulation; - random = simulation.getRandomGenerator(); - - requestEdgeAnalysis(); - - /* Register plugin and visualizer skin */ - simulation.getGUI().registerPlugin(DGRMConfigurator.class); - Visualizer.registerVisualizerSkin(DGRMVisualizerSkin.class); - } - - public void removed() { - super.removed(); - - /* Unregister plugin and visualizer skin */ - simulation.getGUI().unregisterPlugin(DGRMConfigurator.class); - Visualizer.unregisterVisualizerSkin(DGRMVisualizerSkin.class); - } - - public void addEdge(Edge e) { - edges.add(e); - requestEdgeAnalysis(); - - ((AbstractRadioMedium.RadioMediumObservable) - this.getRadioMediumObservable()).setRadioMediumChangedAndNotify(); - } - - public void removeEdge(Edge edge) { - if (!edges.contains(edge)) { - logger.fatal("Cannot remove edge: " + edge); - return; - } - edges.remove(edge); - requestEdgeAnalysis(); - - ((AbstractRadioMedium.RadioMediumObservable) - this.getRadioMediumObservable()).setRadioMediumChangedAndNotify(); - } - - public void clearEdges() { - edges.clear(); - requestEdgeAnalysis(); - - ((AbstractRadioMedium.RadioMediumObservable) - this.getRadioMediumObservable()).setRadioMediumChangedAndNotify(); - } - - public Edge[] getEdges() { - return edges.toArray(new Edge[0]); - } - - /** - * Signal that the configuration changed, and needs to be re-analyzed - * before used. - */ - public void requestEdgeAnalysis() { - edgesDirty = true; - } - - public boolean needsEdgeAnalysis() { - return edgesDirty; - } - - public void registerRadioInterface(Radio radio, Simulation sim) { - super.registerRadioInterface(radio, sim); - - for (Edge edge: getEdges()) { - if (edge.delayedLoadConfig == null) { - continue; - } - - /* Try to configure edge now */ - if (edge.setConfigXML(edge.delayedLoadConfig, sim)) { - edge.delayedLoadConfig = null; - } - } - - requestEdgeAnalysis(); - } - - public void unregisterRadioInterface(Radio radio, Simulation sim) { - super.unregisterRadioInterface(radio, sim); - - if (radio == null) { - return; - } - for (Edge edge: getEdges()) { - if (edge.source == radio || edge.superDest.radio == radio) { - removeEdge(edge); - } - } - - requestEdgeAnalysis(); - } - - public void updateSignalStrengths() { - - /* Reset signal strengths */ - for (Radio radio : getRegisteredRadios()) { - radio.setCurrentSignalStrength(SS_NOTHING); - } - - /* Set signal strengths */ - RadioConnection[] conns = getActiveConnections(); - for (RadioConnection conn : conns) { - if (conn.getSource().getCurrentSignalStrength() < SS_STRONG) { - conn.getSource().setCurrentSignalStrength(SS_STRONG); - } - for (Radio dstRadio : conn.getDestinations()) { - if (dstRadio.getCurrentSignalStrength() < SS_STRONG) { - dstRadio.setCurrentSignalStrength(SS_STRONG); - } - } - } - - /* Set signal strength to weak on interfered */ - for (RadioConnection conn : conns) { - for (Radio intfRadio : conn.getInterfered()) { - if (intfRadio.getCurrentSignalStrength() < SS_STRONG) { - intfRadio.setCurrentSignalStrength(SS_STRONG); - } - - if (!intfRadio.isInterfered()) { - /*logger.warn("Radio was not interfered");*/ - intfRadio.interfereAnyReception(); - } - } - } - } - - public static class DestinationRadio { - public Radio radio; /* destination radio */ - public boolean toAll; /* to all destinations */ - - public DestinationRadio(Radio dest) { - this.radio = dest; - toAll = (radio == null); - } - - public String toString() { - return radio.getMote().toString(); - } - - protected Object clone() { - return new DestinationRadio(radio); - } - } - - public static class DGRMDestinationRadio extends DestinationRadio { - public double ratio; /* Link success ratio (per packet). */ - public long delay; /* EXPERIMENTAL: Propagation delay (us). */ - - public DGRMDestinationRadio(Radio dest, double ratio, long delay) { - super(dest); - this.ratio = ratio; - this.delay = delay; - } - - protected Object clone() { - return new DGRMDestinationRadio(radio, ratio, delay); - } - } - - /** - * Generates hash table using current edges for efficient lookup. - */ - protected void analyzeEdges() { - Hashtable> listTable = - new Hashtable>(); - - /* Fill edge hash table with all edges */ - for (Edge edge: getEdges()) { - if (edge.source == null) { - /* XXX Wait until edge configuration has been loaded */ - logger.warn("DGRM edges not loaded"); - return; - } - - ArrayList destRadios; - if (!listTable.containsKey(edge.source)) { - /* Create new source */ - destRadios = new ArrayList(); - } else { - /* Extend source radio with another destination */ - destRadios = listTable.get(edge.source); - } - - /* Explode special rule: to all radios */ - if (edge.superDest.toAll) { - for (Radio r: getRegisteredRadios()) { - if (edge.source == r) { - continue; - } - DestinationRadio d = (DestinationRadio) edge.superDest.clone(); - d.radio = r; - d.toAll = false; - destRadios.add(d); - } - } else { - destRadios.add(edge.superDest); - } - listTable.put(edge.source, destRadios); - } - - /* Convert to arrays */ - Hashtable arrTable = - new Hashtable(); - Enumeration sources = listTable.keys(); - while (sources.hasMoreElements()) { - Radio source = sources.nextElement(); - DestinationRadio[] arr = - listTable.get(source).toArray(new DestinationRadio[0]); - arrTable.put(source, arr); - } - - this.edgesTable = arrTable; - edgesDirty = false; - } - - /** - * Returns all potential destination radios, i.e. all radios "within reach". - * Does not consider radio channels, transmission success ratios etc. - * - * @param source Source radio - * @return All potential destination radios - */ - public DestinationRadio[] getPotentialDestinations(Radio source) { - if (edgesDirty) { - analyzeEdges(); - } - return edgesTable.get(source); - } - - public RadioConnection createConnections(Radio source) { - if (edgesDirty) { - analyzeEdges(); - } - if (edgesDirty) { - logger.fatal("Error when analyzing edges, aborting new radio connection"); - return new RadioConnection(source); - } - - /* Create new radio connection using edge hash table */ - RadioConnection newConn = new RadioConnection(source); - DestinationRadio[] destinations = getPotentialDestinations(source); - if (destinations == null || destinations.length == 0) { - /* No destinations */ - /*logger.info(sendingRadio + ": No dest");*/ - return newConn; - } - - /*logger.info(source + ": " + destinations.length + " potential destinations");*/ - for (DestinationRadio d: destinations) { - DGRMDestinationRadio dest = (DGRMDestinationRadio) d; - if (dest.radio == source) { - /* Fail: cannot receive our own transmission */ - /*logger.info(source + ": Fail, receiver is sender");*/ - continue; - } - - /* Fail if radios are on different (but configured) channels */ - if (source.getChannel() >= 0 && - dest.radio.getChannel() >= 0 && - source.getChannel() != dest.radio.getChannel()) { - continue; - } - - if (!dest.radio.isReceiverOn()) { - /* Fail: radio is off */ - /*logger.info(source + ": Fail, off");*/ - newConn.addInterfered(dest.radio); - continue; - } - - if (dest.ratio < 1.0 && random.nextDouble() > dest.ratio) { - /*logger.info(source + ": Fail, randomly");*/ - /* TODO Interfere now? */ - newConn.addInterfered(dest.radio); - - dest.radio.interfereAnyReception(); - RadioConnection otherConnection = null; - for (RadioConnection conn : getActiveConnections()) { - for (Radio dstRadio : conn.getDestinations()) { - if (dstRadio == dest.radio) { - otherConnection = conn; - break; - } - } - } - if (otherConnection != null) { - otherConnection.addInterfered(dest.radio); - } - continue; - } - - if (dest.radio.isReceiving()) { - /* Fail: radio is already actively receiving */ - /*logger.info(source + ": Fail, receiving");*/ - newConn.addInterfered(dest.radio); - - /* We will also interfere with the other connection */ - dest.radio.interfereAnyReception(); - RadioConnection otherConnection = null; - for (RadioConnection conn : getActiveConnections()) { - for (Radio dstRadio : conn.getDestinations()) { - if (dstRadio == dest.radio) { - otherConnection = conn; - break; - } - } - } - if (otherConnection != null) { - otherConnection.addInterfered(dest.radio); - } - continue; - } - - if (dest.radio.isInterfered()) { - /* Fail: radio is interfered in another connection */ - /*logger.info(source + ": Fail, interfered");*/ - newConn.addInterfered(dest.radio); - continue; - } - - /* Success: radio starts receiving */ - /*logger.info(source + ": OK: " + dest.radio);*/ - newConn.addDestination(dest.radio, dest.delay); - } - - return newConn; - } - - public Collection getConfigXML() { - ArrayList config = new ArrayList(); - Element element; - - for (Edge edge: getEdges()) { - element = new Element("edge"); - element.addContent(edge.getConfigXML()); - config.add(element); - } - - return config; - } - - public boolean setConfigXML(final Collection configXML, boolean visAvailable) { - random = simulation.getRandomGenerator(); - - for (Element element : configXML) { - if (element.getName().equals("edge")) { - Edge edge = new Edge(); - edge.delayedLoadConfig = element.getChildren(); - addEdge(edge); - } - } - - requestEdgeAnalysis(); - return true; - } - - public static class Edge { - public Radio source; - public DestinationRadio superDest; - - private Edge() { - /* Internal constructor: await config */ - source = null; - superDest = null; - } - - public Edge(Radio source, DestinationRadio dest) { - this.source = source; - this.superDest = dest; - } - - /* Internal methods */ - private Collection delayedLoadConfig = null; /* Used for restoring edges from config */ - private Collection getConfigXML() { - Vector config = new Vector(); - Element element; - - element = new Element("src"); - element.setText(source.getMote().toString()); - config.add(element); - - element = new Element("dest"); - if (superDest.toAll) { - element.setText("ALL"); - } else { - element.setText(superDest.radio.getMote().toString()); - } - config.add(element); - - if (superDest instanceof DGRMDestinationRadio) { - element = new Element("ratio"); - element.setText("" + ((DGRMDestinationRadio)superDest).ratio); - config.add(element); - - element = new Element("delay"); - element.setText("" + ((DGRMDestinationRadio)superDest).delay); - config.add(element); - } - - return config; - } - - private boolean setConfigXML(Collection configXML, Simulation simulation) { - Radio dest = null; - double ratio = -1; - long delay = -1; - - for (Element element : configXML) { - if (element.getName().equals("src")) { - String moteDescription = element.getText(); - - boolean foundMote = false; - for (Mote m: simulation.getMotes()) { - if (moteDescription.equals(m.toString())) { - foundMote = true; - source = m.getInterfaces().getRadio(); - break; - } - } - - if (!foundMote) { - return false; - } - } - - if (element.getName().equals("dest")) { - String moteDescription = element.getText(); - - if (moteDescription.equals("ALL")) { - dest = null; /* ALL */ - } else { - boolean foundMote = false; - for (Mote m: simulation.getMotes()) { - if (moteDescription.equals(m.toString())) { - foundMote = true; - dest = m.getInterfaces().getRadio(); - break; - } - } - if (!foundMote) { - return false; - } - } - } - - if (element.getName().equals("ratio")) { - ratio = Double.parseDouble(element.getText()); - } - - if (element.getName().equals("delay")) { - delay = Long.parseLong(element.getText()); - } - } - - if (ratio < 0 || delay < 0) { - return false; - } - - superDest = new DGRMDestinationRadio(dest, ratio, delay); - return true; - } - } - + private static Logger logger = Logger.getLogger(DirectedGraphMedium.class); + + private Simulation simulation; + private Random random; + + private ArrayList edges = new ArrayList(); + private boolean edgesDirty = true; + + /* Used for optimizing lookup time */ + private Hashtable edgesTable = new Hashtable(); + + public DirectedGraphMedium() { + /* Do not initialize radio medium: use only for hash table */ + super(null); + Visualizer.registerVisualizerSkin(DGRMVisualizerSkin.class); + } + + public DirectedGraphMedium(Simulation simulation) { + super(simulation); + this.simulation = simulation; + random = simulation.getRandomGenerator(); + + requestEdgeAnalysis(); + + /* Register plugin and visualizer skin */ + simulation.getGUI().registerPlugin(DGRMConfigurator.class); + Visualizer.registerVisualizerSkin(DGRMVisualizerSkin.class); + } + + public void removed() { + super.removed(); + + /* Unregister plugin and visualizer skin */ + simulation.getGUI().unregisterPlugin(DGRMConfigurator.class); + Visualizer.unregisterVisualizerSkin(DGRMVisualizerSkin.class); + } + + public void addEdge(Edge e) { + edges.add(e); + requestEdgeAnalysis(); + + ((AbstractRadioMedium.RadioMediumObservable) + this.getRadioMediumObservable()).setRadioMediumChangedAndNotify(); + } + + public void removeEdge(Edge edge) { + if (!edges.contains(edge)) { + logger.fatal("Cannot remove edge: " + edge); + return; + } + edges.remove(edge); + requestEdgeAnalysis(); + + ((AbstractRadioMedium.RadioMediumObservable) + this.getRadioMediumObservable()).setRadioMediumChangedAndNotify(); + } + + public void clearEdges() { + edges.clear(); + requestEdgeAnalysis(); + + ((AbstractRadioMedium.RadioMediumObservable) + this.getRadioMediumObservable()).setRadioMediumChangedAndNotify(); + } + + public Edge[] getEdges() { + return edges.toArray(new Edge[0]); + } + + /** + * Signal that the configuration changed, and needs to be re-analyzed + * before used. + */ + public void requestEdgeAnalysis() { + edgesDirty = true; + } + + public boolean needsEdgeAnalysis() { + return edgesDirty; + } + + public void unregisterRadioInterface(Radio radio, Simulation sim) { + super.unregisterRadioInterface(radio, sim); + + for (Edge edge: getEdges()) { + if (edge.source == radio || edge.superDest.radio == radio) { + removeEdge(edge); + requestEdgeAnalysis(); + } + } + } + + public void updateSignalStrengths() { + + /* Reset signal strengths */ + for (Radio radio : getRegisteredRadios()) { + radio.setCurrentSignalStrength(SS_NOTHING); + } + + /* Set signal strengths */ + RadioConnection[] conns = getActiveConnections(); + for (RadioConnection conn : conns) { + if (conn.getSource().getCurrentSignalStrength() < SS_STRONG) { + conn.getSource().setCurrentSignalStrength(SS_STRONG); + } + for (Radio dstRadio : conn.getDestinations()) { + if (dstRadio.getCurrentSignalStrength() < SS_STRONG) { + dstRadio.setCurrentSignalStrength(SS_STRONG); + } + } + } + + /* Set signal strength to weak on interfered */ + for (RadioConnection conn : conns) { + for (Radio intfRadio : conn.getInterfered()) { + if (intfRadio.getCurrentSignalStrength() < SS_STRONG) { + intfRadio.setCurrentSignalStrength(SS_STRONG); + } + + if (!intfRadio.isInterfered()) { + /*logger.warn("Radio was not interfered");*/ + intfRadio.interfereAnyReception(); + } + } + } + } + + + + /** + * Generates hash table using current edges for efficient lookup. + */ + protected void analyzeEdges() { + Hashtable> listTable = + new Hashtable>(); + + /* Fill edge hash table with all edges */ + for (Edge edge: getEdges()) { + ArrayList destRadios; + if (!listTable.containsKey(edge.source)) { + destRadios = new ArrayList(); + } else { + destRadios = listTable.get(edge.source); + } + + destRadios.add(edge.superDest); + listTable.put(edge.source, destRadios); + } + + /* Convert to arrays */ + Hashtable arrTable = new Hashtable(); + Enumeration sources = listTable.keys(); + while (sources.hasMoreElements()) { + Radio source = sources.nextElement(); + DestinationRadio[] arr = listTable.get(source).toArray(new DestinationRadio[0]); + arrTable.put(source, arr); + } + + this.edgesTable = arrTable; + edgesDirty = false; + } + + /** + * Returns all potential destination radios, i.e. all radios "within reach". + * Does not consider radio channels, transmission success ratios etc. + * + * @param source Source radio + * @return All potential destination radios + */ + public DestinationRadio[] getPotentialDestinations(Radio source) { + if (edgesDirty) { + analyzeEdges(); + } + return edgesTable.get(source); + } + + public RadioConnection createConnections(Radio source) { + if (edgesDirty) { + analyzeEdges(); + } + if (edgesDirty) { + logger.fatal("Error when analyzing edges, aborting new radio connection"); + return new RadioConnection(source); + } + + /* Create new radio connection using edge hash table */ + RadioConnection newConn = new RadioConnection(source); + DestinationRadio[] destinations = getPotentialDestinations(source); + if (destinations == null || destinations.length == 0) { + /* No destinations */ + /*logger.info(sendingRadio + ": No dest");*/ + return newConn; + } + + /*logger.info(source + ": " + destinations.length + " potential destinations");*/ + for (DestinationRadio d: destinations) { + DGRMDestinationRadio dest = (DGRMDestinationRadio) d; + if (dest.radio == source) { + /* Fail: cannot receive our own transmission */ + /*logger.info(source + ": Fail, receiver is sender");*/ + continue; + } + + /* Fail if radios are on different (but configured) channels */ + if (source.getChannel() >= 0 && + dest.radio.getChannel() >= 0 && + source.getChannel() != dest.radio.getChannel()) { + continue; + } + + if (!dest.radio.isReceiverOn()) { + /* Fail: radio is off */ + /*logger.info(source + ": Fail, off");*/ + newConn.addInterfered(dest.radio); + continue; + } + + if (dest.ratio < 1.0 && random.nextDouble() > dest.ratio) { + /*logger.info(source + ": Fail, randomly");*/ + /* TODO Interfere now? */ + newConn.addInterfered(dest.radio); + + dest.radio.interfereAnyReception(); + RadioConnection otherConnection = null; + for (RadioConnection conn : getActiveConnections()) { + for (Radio dstRadio : conn.getDestinations()) { + if (dstRadio == dest.radio) { + otherConnection = conn; + break; + } + } + } + if (otherConnection != null) { + otherConnection.addInterfered(dest.radio); + } + continue; + } + + if (dest.radio.isReceiving()) { + /* Fail: radio is already actively receiving */ + /*logger.info(source + ": Fail, receiving");*/ + newConn.addInterfered(dest.radio); + + /* We will also interfere with the other connection */ + dest.radio.interfereAnyReception(); + RadioConnection otherConnection = null; + for (RadioConnection conn : getActiveConnections()) { + for (Radio dstRadio : conn.getDestinations()) { + if (dstRadio == dest.radio) { + otherConnection = conn; + break; + } + } + } + if (otherConnection != null) { + otherConnection.addInterfered(dest.radio); + } + continue; + } + + if (dest.radio.isInterfered()) { + /* Fail: radio is interfered in another connection */ + /*logger.info(source + ": Fail, interfered");*/ + newConn.addInterfered(dest.radio); + continue; + } + + /* Success: radio starts receiving */ + /*logger.info(source + ": OK: " + dest.radio);*/ + newConn.addDestination(dest.radio, dest.delay); + } + + return newConn; + } + + public Collection getConfigXML() { + ArrayList config = new ArrayList(); + Element element; + + for (Edge edge: getEdges()) { + element = new Element("edge"); + element.addContent(edge.getConfigXML()); + config.add(element); + } + + return config; + } + + private Collection delayedConfiguration = null; + public boolean setConfigXML(Collection configXML, boolean visAvailable) { + random = simulation.getRandomGenerator(); + + /* Wait until simulation has been loaded */ + delayedConfiguration = configXML; + return true; + } + public void simulationFinishedLoading() { + if (delayedConfiguration == null) { + return; + } + + boolean warnedOldConfig = false; + for (Element element : delayedConfiguration) { + if (element.getName().equals("edge")) { + Collection edgeConfig = element.getChildren(); + Radio source = null; + DestinationRadio dest = null; + for (Element edgeElement : edgeConfig) { + if (edgeElement.getName().equals("src")) { + /* Old version, ignore edge */ + if (!warnedOldConfig) { + logger.fatal("Old simulation config detected: DGRM links will not be imported"); + warnedOldConfig = true; + } + return; + } else if (edgeElement.getName().equals("source")) { + source = simulation.getMoteWithID( + Integer.parseInt(edgeElement.getText())).getInterfaces().getRadio(); + } else if (edgeElement.getName().equals("dest")) { + String destClassName = edgeElement.getText().trim(); + if (destClassName == null || destClassName.isEmpty()) { + continue; + } + Class destClass = + simulation.getGUI().tryLoadClass(this, DestinationRadio.class, destClassName); + if (destClass == null) { + throw new RuntimeException("Could not load class: " + destClassName); + } + try { + dest = destClass.newInstance(); + dest.setConfigXML(edgeElement.getChildren(), simulation); + } catch (Exception e) { + throw (RuntimeException) + new RuntimeException("Unknown class: " + destClassName).initCause(e); + } + } + } + if (source == null || dest == null) { + if (!warnedOldConfig) { + logger.fatal("Old simulation config detected: DGRM links will not be imported"); + warnedOldConfig = true; + } + } else { + addEdge(new Edge(source, dest)); + } + } + } + requestEdgeAnalysis(); + delayedConfiguration = null; + } + + public static class Edge { + public Radio source = null; + public DestinationRadio superDest = null; + + public Edge(Radio source, DestinationRadio dest) { + this.source = source; + this.superDest = dest; + } + + private Collection getConfigXML() { + ArrayList config = new ArrayList(); + Element element; + + element = new Element("source"); + element.setText("" + source.getMote().getID()); + config.add(element); + + element = new Element("dest"); + element.setText(superDest.getClass().getName()); + Collection destConfig = superDest.getConfigXML(); + if (destConfig != null) { + element.addContent(destConfig); + config.add(element); + } + + return config; + } + } } diff --git a/tools/cooja/java/se/sics/cooja/radiomediums/UDGM.java b/tools/cooja/java/se/sics/cooja/radiomediums/UDGM.java index a9b2d6ab3..24ecdc6fd 100644 --- a/tools/cooja/java/se/sics/cooja/radiomediums/UDGM.java +++ b/tools/cooja/java/se/sics/cooja/radiomediums/UDGM.java @@ -43,13 +43,12 @@ import org.jdom.Element; import se.sics.cooja.ClassDescription; import se.sics.cooja.Mote; import se.sics.cooja.RadioConnection; -import se.sics.cooja.Simulation; import se.sics.cooja.SimEventCentral.MoteCountListener; +import se.sics.cooja.Simulation; import se.sics.cooja.interfaces.Position; import se.sics.cooja.interfaces.Radio; import se.sics.cooja.plugins.Visualizer; import se.sics.cooja.plugins.skins.UDGMVisualizerSkin; -import se.sics.cooja.radiomediums.DirectedGraphMedium.DestinationRadio; /** * The Unit Disk Graph Radio Medium abstracts radio transmission range as circles. @@ -184,7 +183,6 @@ public class UDGM extends AbstractRadioMedium { Position senderPos = sender.getPosition(); for (DestinationRadio dest: potentialDestinations) { Radio recv = dest.radio; - Position recvPos = recv.getPosition(); /* Fail if radios are on different (but configured) channels */ if (sender.getChannel() >= 0 && @@ -192,6 +190,7 @@ public class UDGM extends AbstractRadioMedium { sender.getChannel() != recv.getChannel()) { continue; } + Position recvPos = recv.getPosition(); /* Fail if radio is turned off */ // if (!recv.isReceiverOn()) { diff --git a/tools/csc/csc-compute-neighbor-stats b/tools/csc/csc-compute-neighbor-stats index 4ccaa1461..a62990d92 100755 --- a/tools/csc/csc-compute-neighbor-stats +++ b/tools/csc/csc-compute-neighbor-stats @@ -9,6 +9,9 @@ while() { if(/\([\d.]+)\<\//) { $range = $1; } + if(/\([\d.]+)\<\//) { + $success_ratio_rx = $1; + } if(/\([\d.]+)\) { $num++; } } -print "Range $range num $num override range $override_range\n"; if($override_range) { $range = $override_range; @@ -27,15 +29,26 @@ if($override_range) { $no_neighbors = 0; $all_neighbors = 0; $total_neighbors = 0; -# Go through all nodes, find how many are in their range. + +# Go through all nodes, find how many are in their range and compute +# the average reception probability. Make sure we only count each neighbor once. for($i = 0; $i < $num; $i++) { $neighbors = 0; for($j = 0; $j < $num; $j++) { if($i != $j) { - if(($x[$i] - $x[$j]) * ($x[$i] - $x[$j]) + - ($y[$i] - $y[$j]) * ($y[$i] - $y[$j]) <= - $range * $range) { + $distance2 = ($x[$i] - $x[$j]) * ($x[$i] - $x[$j]) + + ($y[$i] - $y[$j]) * ($y[$i] - $y[$j]); + $range2 = $range * $range; + if($distance2 <= $range2) { $neighbors++; + + $ratio = $distance2 / $range2; + if($ratio > 1) { + $reception_probability = 0; + } else { + $reception_probability = 1 - $ratio * (1 - $success_ratio_rx); + } + $reception_probability_sum += $reception_probability; } } } @@ -47,8 +60,16 @@ for($i = 0; $i < $num; $i++) { } $total_neighbors += $neighbors; } -print "Num nodes $num, average neighbors " . ($total_neighbors / $num) . + +print "$num $range " . ($total_neighbors / $num) . + " " . ($no_neighbors / $num) . + " " . ($all_neighbors / $num) . + " " . ($reception_probability_sum / $total_neighbors) . + "\n"; +print "# Range $range number of nodes $num override range $override_range\n"; +print "# Num nodes $num, average neighbors " . ($total_neighbors / $num) . ", $no_neighbors nodes (" . (100 * $no_neighbors / $num) . "%) have no neighbors, $all_neighbors (" . (100 * $all_neighbors / $num) . - "%) have all nodes as neighbors\n"; - + "%) have all other nodes as neighbors\n"; +print "# Average reception probability " . + ($reception_probability_sum / $total_neighbors) . "\n"; diff --git a/tools/sensinode/nano_usb_programmer/ftdi_win32/ftd2xx.h b/tools/sensinode/nano_usb_programmer/ftdi_win32/ftd2xx.h old mode 100755 new mode 100644 diff --git a/tools/stm32w/wpcapslip6/wpcapslip6.c b/tools/stm32w/wpcapslip6/wpcapslip6.c old mode 100644 new mode 100755 index 72eb0c5c6..730ec3a26 --- a/tools/stm32w/wpcapslip6/wpcapslip6.c +++ b/tools/stm32w/wpcapslip6/wpcapslip6.c @@ -116,11 +116,11 @@ static bool clean_route = false; static bool clean_neighb = false; static struct uip_eth_addr adapter_eth_addr; static char * if_name; + OSVERSIONINFO osVersionInfo; /* Fictitious Ethernet address of the attached device (used in tun mode). */ -#define DEV_MAC_ADDR "02-00-00-00-00-02" -static const struct uip_eth_addr dev_eth_addr = {{0x02,0x00,0x00,0x00,0x00,0x02}}; +static struct uip_eth_addr dev_eth_addr = {{0x00,0x00,0x00,0x00,0x00,0x00}}; static bool request_mac = true; @@ -325,22 +325,51 @@ read_more: if(inpktbuf[0] == '!') { if (inpktbuf[1] == 'M' && inbufptr == 18) { /* Read gateway MAC address and autoconfigure tap0 interface */ - char macs[24]; - int i, pos; + char macs64[24], macs48[18]; + int addr_bytes[8]; + int i, pos; for(i = 0, pos = 0; i < 16; i++) { - macs[pos++] = inpktbuf[2 + i]; + macs64[pos++] = inpktbuf[2 + i]; if ((i & 1) == 1 && i < 14) { - macs[pos++] = ':'; + macs64[pos++] = '-'; } } - macs[pos] = '\0'; - printf("*** Gateway's MAC address: %s\n", macs); + macs64[pos] = '\0'; + printf("*** Gateway's MAC address: %s\n", macs64); mac_received = true; + + sscanf(macs64, "%2X-%2X-%2X-%2X-%2X-%2X-%2X-%2X", + &addr_bytes[0], + &addr_bytes[1], + &addr_bytes[2], + &addr_bytes[3], + &addr_bytes[4], + &addr_bytes[5], + &addr_bytes[6], + &addr_bytes[7]); + + /* Form a fictitious MAC address for the attached device from its EUI-64 (2 middle bytes elided) */ + addr_bytes[0] |= 0x02; + for(i=0;i<3;i++){ + dev_eth_addr.addr[i] = addr_bytes[i]; + } + for(i=3;i<6;i++){ + dev_eth_addr.addr[i] = addr_bytes[i+2]; + } + sprintf(macs48,"%02X-%02X-%02X-%02X-%02X-%02X", + dev_eth_addr.addr[0], + dev_eth_addr.addr[1], + dev_eth_addr.addr[2], + dev_eth_addr.addr[3], + dev_eth_addr.addr[4], + dev_eth_addr.addr[5]); + + printf("Fictitious MAC-48: %s\n", macs48); if(autoconf){ - if(IPAddrFromPrefix(autoconf_addr, ipprefix, macs)!=0){ + if(IPAddrFromPrefix(autoconf_addr, ipprefix, macs64)!=0){ fprintf(stderr, "Invalid IPv6 address.\n"); exit(1); } @@ -351,13 +380,13 @@ read_more: if(br_prefix != NULL){ /* RPL Border Router mode. Add route towards LoWPAN. */ - if(IPAddrFromPrefix(rem_ipaddr, br_prefix, macs)!=0){ + if(IPAddrFromPrefix(rem_ipaddr, br_prefix, macs64)!=0){ fprintf(stderr, "Invalid IPv6 address.\n"); exit(1); } addLoWPANRoute(if_name, br_prefix, rem_ipaddr); - addNeighbor(if_name, rem_ipaddr, DEV_MAC_ADDR); + addNeighbor(if_name, rem_ipaddr, macs48); } } @@ -858,7 +887,7 @@ int IPAddrFromPrefix(char * ipaddr, const char * ipprefix, const char * mac) // sscanf requires int instead of 8-bit for hexadecimal variables. - sscanf(mac, "%2X:%2X:%2X:%2X:%2X:%2X:%2X:%2X", + sscanf(mac, "%2X-%2X-%2X-%2X-%2X-%2X-%2X-%2X", &addr_bytes[0], &addr_bytes[1], &addr_bytes[2], @@ -1059,12 +1088,10 @@ main(int argc, char **argv) (int *)&adapter_eth_addr.addr[4],(int *)&adapter_eth_addr.addr[5]); if_name = wpcap_start(&adapter_eth_addr, verbose); - if(local_ipaddr!=NULL){ addAddress(if_name, local_ipaddr); } - switch(baudrate) { case -2: break; /* Use default. */ diff --git a/tools/stm32w/wpcapslip6/wpcapslip6.exe b/tools/stm32w/wpcapslip6/wpcapslip6.exe old mode 100644 new mode 100755 index 3317d74a5..84dbcc768 Binary files a/tools/stm32w/wpcapslip6/wpcapslip6.exe and b/tools/stm32w/wpcapslip6/wpcapslip6.exe differ diff --git a/tools/tunslip6.c b/tools/tunslip6.c index 650f58b58..82ab3f433 100644 --- a/tools/tunslip6.c +++ b/tools/tunslip6.c @@ -210,7 +210,9 @@ serial_to_tun(FILE *inslip, int outfd) ssystem("ifconfig %s hw ether %s", tundev, &macs[6]); if (timestamp) stamptime(); ssystem("ifconfig %s up", tundev); - } else if(uip.inbuf[1] == 'P') { + } + } else if(uip.inbuf[0] == '?') { + if(uip.inbuf[1] == 'P') { /* Prefix info requested */ struct in6_addr addr; int i;