aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2012-11-04 04:18:18 +0000
committerDimitri Sokolyuk <demon@dim13.org>2012-11-04 04:18:18 +0000
commitcbd44e9015ac4ab4eca7d819f55d8f9e88d4c0d4 (patch)
treed611db92560042d6530cf61bd3c95857c30c9228
parent1952e988e9a8a2e24404eca6a762176798122457 (diff)
drop old includes
-rw-r--r--kernel/cmd.c66
-rw-r--r--kernel/color.h90
-rw-r--r--kernel/dmx.c2
-rw-r--r--kernel/factor.h35
-rw-r--r--kernel/factor10000.h35
5 files changed, 1 insertions, 227 deletions
diff --git a/kernel/cmd.c b/kernel/cmd.c
deleted file mode 100644
index bf44be4..0000000
--- a/kernel/cmd.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (c) 2011 Dimitri Sokolyuk <demon@dim13.org>
- *
- * 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 <stdint.h>
-#include <avr/io.h>
-#include <stdlib.h>
-#include "kernel.h"
-#include "tasks.h"
-
-void
-uputs(char *s)
-{
- while (*s)
- uart_putchar(*s++);
- uart_putchar('\r');
- uart_putchar('\n');
-}
-
-void
-cmd(void *arg)
-{
- struct rgbarg *a = arg;
- char c;
- int val;
- char buf[10], *s;
-
- init_uart();
-
- s = buf;
-
- for (;;) {
- c = uart_getchar();
- if (c > 0) {
- if (c >= '0' && c <= '9')
- *s++ = c;
- if (c == '\n' || c == '\r' || s - buf >= 9) {
- *s = '\0';
- s = buf;
- uputs(buf);
- val = atoi(buf);
- if (val >= 0 && val < 256) {
- *a->r = *a->g = *a->b = val;
- uputs("OK");
- } else {
- uputs("ERR");
- }
- }
- }
-
- snore(MSEC(10));
- }
-}
diff --git a/kernel/color.h b/kernel/color.h
deleted file mode 100644
index b208377..0000000
--- a/kernel/color.h
+++ /dev/null
@@ -1,90 +0,0 @@
-#ifndef __COLOR_H
-#define __COLOR_H
-
-struct color {
- uint8_t color, r, g, b;
-} color[] PROGMEM = {
- { 10, 0xff, 0x38, 0x00 },
- { 11, 0xff, 0x47, 0x00 },
- { 12, 0xff, 0x53, 0x00 },
- { 13, 0xff, 0x5d, 0x00 },
- { 14, 0xff, 0x65, 0x00 },
- { 15, 0xff, 0x6d, 0x00 },
- { 16, 0xff, 0x73, 0x00 },
- { 17, 0xff, 0x79, 0x00 },
- { 18, 0xff, 0x7e, 0x00 },
- { 19, 0xff, 0x83, 0x00 },
- { 20, 0xff, 0x89, 0x12 },
- { 21, 0xff, 0x8e, 0x21 },
- { 22, 0xff, 0x93, 0x2c },
- { 23, 0xff, 0x98, 0x36 },
- { 24, 0xff, 0x9d, 0x3f },
- { 25, 0xff, 0xa1, 0x48 },
- { 26, 0xff, 0xa5, 0x4f },
- { 27, 0xff, 0xa9, 0x57 },
- { 28, 0xff, 0xad, 0x5e },
- { 29, 0xff, 0xb1, 0x65 },
- { 30, 0xff, 0xb4, 0x6b },
- { 31, 0xff, 0xb8, 0x72 },
- { 32, 0xff, 0xbb, 0x78 },
- { 33, 0xff, 0xbe, 0x7e },
- { 34, 0xff, 0xc1, 0x84 },
- { 35, 0xff, 0xc4, 0x89 },
- { 36, 0xff, 0xc7, 0x8f },
- { 37, 0xff, 0xc9, 0x94 },
- { 38, 0xff, 0xcc, 0x99 },
- { 39, 0xff, 0xce, 0x9f },
- { 40, 0xff, 0xd1, 0xa3 },
- { 41, 0xff, 0xd3, 0xa8 },
- { 42, 0xff, 0xd5, 0xad },
- { 43, 0xff, 0xd7, 0xb1 },
- { 44, 0xff, 0xd9, 0xb6 },
- { 45, 0xff, 0xdb, 0xba },
- { 46, 0xff, 0xdd, 0xbe },
- { 47, 0xff, 0xdf, 0xc2 },
- { 48, 0xff, 0xe1, 0xc6 },
- { 49, 0xff, 0xe3, 0xca },
- { 50, 0xff, 0xe4, 0xce },
- { 51, 0xff, 0xe6, 0xd2 },
- { 52, 0xff, 0xe8, 0xd5 },
- { 53, 0xff, 0xe9, 0xd9 },
- { 54, 0xff, 0xeb, 0xdc },
- { 55, 0xff, 0xec, 0xe0 },
- { 56, 0xff, 0xee, 0xe3 },
- { 57, 0xff, 0xef, 0xe6 },
- { 58, 0xff, 0xf0, 0xe9 },
- { 59, 0xff, 0xf2, 0xec },
- { 60, 0xff, 0xf3, 0xef },
- { 61, 0xff, 0xf4, 0xf2 },
- { 62, 0xff, 0xf5, 0xf5 },
- { 63, 0xff, 0xf6, 0xf8 },
- { 64, 0xff, 0xf8, 0xfb },
- { 65, 0xff, 0xf9, 0xfd },
- { 66, 0xfe, 0xf9, 0xff },
- { 67, 0xfc, 0xf7, 0xff },
- { 68, 0xf9, 0xf6, 0xff },
- { 69, 0xf7, 0xf5, 0xff },
- { 70, 0xf5, 0xf3, 0xff },
- { 71, 0xf3, 0xf2, 0xff },
- { 72, 0xf0, 0xf1, 0xff },
- { 73, 0xef, 0xf0, 0xff },
- { 74, 0xed, 0xef, 0xff },
- { 75, 0xeb, 0xee, 0xff },
- { 76, 0xe9, 0xed, 0xff },
- { 77, 0xe7, 0xec, 0xff },
- { 78, 0xe6, 0xeb, 0xff },
- { 79, 0xe4, 0xea, 0xff },
- { 80, 0xe3, 0xe9, 0xff },
- { 81, 0xe1, 0xe8, 0xff },
- { 82, 0xe0, 0xe7, 0xff },
- { 83, 0xde, 0xe6, 0xff },
- { 84, 0xdd, 0xe6, 0xff },
- { 85, 0xdc, 0xe5, 0xff },
- { 86, 0xda, 0xe4, 0xff },
- { 87, 0xd9, 0xe3, 0xff },
- { 88, 0xd8, 0xe3, 0xff },
- { 89, 0xd7, 0xe2, 0xff },
- { 90, 0xd6, 0xe1, 0xff },
-};
-
-#endif
diff --git a/kernel/dmx.c b/kernel/dmx.c
index fa1399c..12af3c8 100644
--- a/kernel/dmx.c
+++ b/kernel/dmx.c
@@ -35,9 +35,9 @@ struct pwmarg pwmargs[] = {
int
main()
{
- init(nSema);
uart_init();
lcd_init();
+ init(nSema);
exec(heartbeat, NULL, DEFSTACK);
exec(rgb, &rgbargs, DEFSTACK);
diff --git a/kernel/factor.h b/kernel/factor.h
deleted file mode 100644
index a3b118b..0000000
--- a/kernel/factor.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* 1/sqrt(2) timing scala in usec */
-uint16_t factor[256] PROGMEM = {
- 30, 30, 31, 31, 32, 32, 33, 34,
- 34, 35, 35, 36, 37, 37, 38, 39,
- 39, 40, 41, 41, 42, 43, 44, 44,
- 45, 46, 47, 48, 48, 49, 50, 51,
- 52, 53, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 65, 66, 68,
- 69, 70, 71, 72, 74, 75, 76, 78,
- 79, 80, 82, 83, 85, 86, 88, 89,
- 91, 92, 94, 96, 97, 99, 101, 103,
- 104, 106, 108, 110, 112, 114, 116, 118,
- 120, 122, 124, 126, 129, 131, 133, 136,
- 138, 140, 143, 145, 148, 150, 153, 156,
- 158, 161, 164, 167, 170, 173, 176, 179,
- 182, 185, 189, 192, 195, 199, 202, 206,
- 209, 213, 217, 220, 224, 228, 232, 236,
- 240, 245, 249, 253, 258, 262, 267, 272,
- 276, 281, 286, 291, 296, 301, 307, 312,
- 317, 323, 329, 334, 340, 346, 352, 358,
- 365, 371, 378, 384, 391, 398, 405, 412,
- 419, 426, 434, 441, 449, 457, 465, 473,
- 481, 490, 498, 507, 516, 525, 534, 544,
- 553, 563, 573, 583, 593, 603, 614, 625,
- 635, 647, 658, 669, 681, 693, 705, 717,
- 730, 743, 756, 769, 782, 796, 810, 824,
- 839, 853, 868, 883, 899, 915, 931, 947,
- 963, 980, 997, 1015, 1033, 1051, 1069, 1088,
- 1107, 1126, 1146, 1166, 1186, 1207, 1228, 1250,
- 1271, 1294, 1316, 1339, 1363, 1386, 1411, 1435,
- 1460, 1486, 1512, 1538, 1565, 1593, 1621, 1649,
- 1678, 1707, 1737, 1767, 1798, 1830, 1862, 1894,
- 1927, 1961, 1995, 2030, 2066, 2102, 2138, 2176,
- 2214, 2253, 2292, 2332, 2373, 2414, 2457, 2500,
-};
diff --git a/kernel/factor10000.h b/kernel/factor10000.h
deleted file mode 100644
index 2985026..0000000
--- a/kernel/factor10000.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef __FACTOR_H
-#define __FACTOR_H
-
-/* octave: round(sqrt(2).^(0:(1/16):16) * 10000 / 256)(2:end) */
-
-uint16_t factor[256] PROGMEM = {
- 40, 41, 42, 43, 44, 44, 45, 46, 47, 49,
- 50, 51, 52, 53, 54, 55, 56, 58, 59, 60,
- 62, 63, 64, 66, 67, 69, 70, 72, 73, 75,
- 76, 78, 80, 82, 83, 85, 87, 89, 91, 93,
- 95, 97, 99, 101, 104, 106, 108, 110, 113, 115,
- 118, 120, 123, 126, 129, 131, 134, 137, 140, 143,
- 146, 150, 153, 156, 160, 163, 167, 170, 174, 178,
- 182, 186, 190, 194, 198, 203, 207, 212, 216, 221,
- 226, 231, 236, 241, 246, 252, 257, 263, 269, 274,
- 280, 287, 293, 299, 306, 313, 319, 326, 333, 341,
- 348, 356, 364, 372, 380, 388, 397, 405, 414, 423,
- 432, 442, 452, 462, 472, 482, 492, 503, 514, 526,
- 537, 549, 561, 573, 586, 599, 612, 625, 639, 653,
- 667, 682, 696, 712, 727, 743, 760, 776, 793, 811,
- 828, 846, 865, 884, 903, 923, 943, 964, 985, 1007,
- 1029, 1051, 1074, 1098, 1122, 1146, 1171, 1197, 1223, 1250,
- 1277, 1305, 1334, 1363, 1393, 1423, 1455, 1487, 1519, 1552,
- 1586, 1621, 1657, 1693, 1730, 1768, 1806, 1846, 1886, 1928,
- 1970, 2013, 2057, 2102, 2148, 2195, 2243, 2293, 2343, 2394,
- 2446, 2500, 2555, 2611, 2668, 2726, 2786, 2847, 2909, 2973,
- 3038, 3105, 3173, 3242, 3313, 3386, 3460, 3536, 3613, 3692,
- 3773, 3856, 3940, 4026, 4114, 4204, 4297, 4391, 4487, 4585,
- 4685, 4788, 4893, 5000, 5109, 5221, 5336, 5453, 5572, 5694,
- 5819, 5946, 6076, 6209, 6345, 6484, 6626, 6771, 6920, 7071,
- 7226, 7384, 7546, 7711, 7880, 8052, 8229, 8409, 8593, 8781,
- 8974, 9170, 9371, 9576, 9786, 10000
-};
-
-#endif