From c200624e91782e6e2703af73e37752fbc00d7421 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 4 Jul 2011 06:14:04 +0000 Subject: rename main.c remix16.c --- kernel/main.c | 60 -------------------------------------------------------- kernel/remix16.c | 46 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 60 deletions(-) delete mode 100644 kernel/main.c create mode 100644 kernel/remix16.c (limited to 'kernel') diff --git a/kernel/main.c b/kernel/main.c deleted file mode 100644 index d06dd8e..0000000 --- a/kernel/main.c +++ /dev/null @@ -1,60 +0,0 @@ -/* $Id$ */ -/* - * Copyright (c) 2011 Dimitri Sokolyuk - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include -#include -#include "kernel.h" -#include "tasks.h" - -uint8_t red, green, blue; -uint16_t adcval[ADCCHANNELS]; - -struct rgbarg rgbargs = { &red, &green, &blue }; -struct pwmarg pwmargs[] = { - { &red, PB2 }, - { &green, PB3 }, - { &blue, PB4 } -}; -struct adcarg adcarg = { adcval }; -struct lcdarg lcdarg = { 0, 0, adcval }; -struct ppmarg ppmarg = { adcval }; - -int -main() -{ - init(STACK); - - init_uart(); - - semaphore(0, 1); - - /* - task(rgb, STACK, MSEC(10), &rgbargs); - task(pwm, STACK, MSEC(10), &pwmargs[0]); - task(pwm, STACK, MSEC(10), &pwmargs[1]); - task(pwm, STACK, MSEC(10), &pwmargs[2]); - */ - - task(heartbeat, STACK, MSEC(0), MSEC(750), 0); - task(adc, STACK, MSEC(1), MSEC(60), &adcarg); - task(ppm, STACK, MSEC(3), MSEC(20), &ppmarg); - task(lcd, STACK, MSEC(7), MSEC(100), &lcdarg); - - for (;;); - - return 0; -} diff --git a/kernel/remix16.c b/kernel/remix16.c new file mode 100644 index 0000000..c8cfbfb --- /dev/null +++ b/kernel/remix16.c @@ -0,0 +1,46 @@ +/* $Id$ */ +/* + * Copyright (c) 2011 Dimitri Sokolyuk + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include +#include +#include "kernel.h" +#include "tasks.h" + +uint16_t adcval[ADCCHANNELS]; + +struct adcarg adcarg = { adcval }; +struct lcdarg lcdarg = { 0, 0, adcval }; +struct ppmarg ppmarg = { adcval }; + +int +main() +{ + init(STACK); + + init_uart(); + + semaphore(0, 1); + + task(heartbeat, STACK, MSEC(0), MSEC(750), 0); + task(adc, STACK, MSEC(1), MSEC(60), &adcarg); + task(ppm, STACK, MSEC(3), MSEC(20), &ppmarg); + task(lcd, STACK, MSEC(7), MSEC(100), &lcdarg); + + for (;;); + + return 0; +} -- cgit v1.2.3