mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-12-23 01:29:33 +00:00
removed autostart processes from contiki template: these are now instead defined in the contiki application
This commit is contained in:
parent
0bc10750bc
commit
874ffb029b
@ -26,7 +26,7 @@
|
|||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* $Id: contiki_template.c,v 1.10 2009/01/21 12:18:10 fros4943 Exp $
|
* $Id: contiki_template.c,v 1.11 2009/03/10 21:24:46 fros4943 Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -75,8 +75,7 @@
|
|||||||
|
|
||||||
#include "node-id.h"
|
#include "node-id.h"
|
||||||
|
|
||||||
/* Declare all initialization processes */
|
PROCINIT(&etimer_process);
|
||||||
[PROCESS_DEFINITIONS]
|
|
||||||
|
|
||||||
/* Declare all sensors */
|
/* Declare all sensors */
|
||||||
[SENSOR_DEFINITIONS]
|
[SENSOR_DEFINITIONS]
|
||||||
@ -85,9 +84,6 @@
|
|||||||
[INTERFACE_DEFINITIONS]
|
[INTERFACE_DEFINITIONS]
|
||||||
|
|
||||||
|
|
||||||
/* Create initialization process array */
|
|
||||||
[PROCESS_ARRAY]
|
|
||||||
|
|
||||||
/* Create sensor array */
|
/* Create sensor array */
|
||||||
[SENSOR_ARRAY]
|
[SENSOR_ARRAY]
|
||||||
|
|
||||||
@ -130,6 +126,9 @@ start_process_run_loop(void *data)
|
|||||||
/* Start process handler */
|
/* Start process handler */
|
||||||
process_init();
|
process_init();
|
||||||
|
|
||||||
|
/* Start Contiki processes */
|
||||||
|
procinit_init();
|
||||||
|
|
||||||
/* Print startup information */
|
/* Print startup information */
|
||||||
printf(CONTIKI_VERSION_STRING " started. ");
|
printf(CONTIKI_VERSION_STRING " started. ");
|
||||||
if(node_id > 0) {
|
if(node_id > 0) {
|
||||||
@ -137,8 +136,6 @@ start_process_run_loop(void *data)
|
|||||||
} else {
|
} else {
|
||||||
printf("Node id is not set.\n");
|
printf("Node id is not set.\n");
|
||||||
}
|
}
|
||||||
/* Start Contiki processes */
|
|
||||||
procinit_init();
|
|
||||||
|
|
||||||
/* Initialize communication stack */
|
/* Initialize communication stack */
|
||||||
init_net();
|
init_net();
|
||||||
@ -148,7 +145,7 @@ start_process_run_loop(void *data)
|
|||||||
}
|
}
|
||||||
printf("%d\n", rimeaddr_node_addr.u8[i]);
|
printf("%d\n", rimeaddr_node_addr.u8[i]);
|
||||||
|
|
||||||
/* Start user applications */
|
/* Start autostart processes (defined in Contiki application) */
|
||||||
print_processes(autostart_processes);
|
print_processes(autostart_processes);
|
||||||
autostart_start(autostart_processes);
|
autostart_start(autostart_processes);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user