Removed lots of CR characters, and adapted to the new event handling

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4956 a1c6a512-1295-4272-9138-f99709370657
author: Linus Nielsen Feltzing <linus@haxx.se> 2004-07-26 23:34:42 +0000
committer: Linus Nielsen Feltzing <linus@haxx.se> 2004-07-26 23:34:42 +0000
commit: 147d0eb5d4545175f9eec739477dc92c4467da0f (patch)
tree: 5c0963de6eb7a8a335be10e4565a2ba41fce68b7 /apps
parent: 5f8f4a392f0579822aef97b3550ae2c5d9dae21a (diff)
download: rockbox-147d0eb5d4545175f9eec739477dc92c4467da0f.tar.gz
rockbox-147d0eb5d4545175f9eec739477dc92c4467da0f.zip
1 files changed, 67 insertions, 144 deletions
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c
index 257a279839..1630f03877 100644
--- a/apps/plugins/calculator.c
+++ b/apps/plugins/calculator.c
@@ -20,58 +20,31 @@
 /*
   00 01    21 22 23    43 44 45    65 66 67    87 88 89    109110111
 00 |-----------|-----------|-----------|-----------|-----------|
-01 |
+01 |           |           |           |           |           |
-           |           |           |           |           |
+   |***********|***********|***********|***********|***********|
-   |
+   |***********|***********|***********|***********|***********|
-***********|
+11 |           |           |           |           |           |
-***********|
-***********|
-***********|
-***********|
-   |
-***********|
-***********|
-***********|
-***********|
-***********|
-11 |
-           |           |           |           |           |
 12 |-----------|-----------|-----------|-----------|-----------|
 13 |-----------|-----------|-----------|-----------|-----------| y1
-14 |
+14 |           |           |           |           |           |
-           |           |           |           |           |
   |           |           |           |           |           |
-22 |
+22 |           |           |           |           |           |
-           |           |           |           |           |
 23 |-----------|-----------|-----------|-----------|-----------| y2
-24 |
+24 |           |           |           |           |           |
-           |           |           |           |           |
   |           |           |           |           |           |
-32 |
+32 |           |           |           |           |           |
-           |           |           |           |           |
 33 |-----------|-----------|-----------|-----------|-----------| y3
-34 |
+34 |           |           |           |           |           |
-           |           |           |           |           |
   |           |           |           |           |           |
-42 |
+42 |           |           |           |           |           |
-           |           |           |           |           |
 43 |-----------|-----------|-----------|-----------|-----------| y4
-44 |
+44 |           |           |           |           |           |
-           |           |           |           |           |
   |           |           |           |           |           |
-52 |
+52 |           |           |           |           |           |
-           |           |           |           |           |
 53 |-----------|-----------|-----------|-----------|-----------| y5
-54 |
+54 |           |           |           |           |           |
-           |           |           |           |           |
   |           |           |           |           |           |
-62 |
+62 |           |           |           |           |           |
-           |           |           |           |           |
 63 |-----------|-----------|-----------|-----------|-----------| y6
   x0          x1          x2          x3          x4          x5
 */
@@ -227,106 +200,56 @@ enum {cal_normal,  /* 0, normal status, display result */
 /* constant table for CORDIC algorithm */
 double cordicTable[51][2]= {
 /* pow(2,0) - pow(2,-50)             atan(pow(2,0) - atan(pow(2,-50) */
-    {1e+00,
+    {1e+00,                                    7.853981633974483e-01},
-                                    7.853981633974483e-01},
+    {5e-01,                                    4.636476090008061e-01},
-    {5e-01,
+    {2.5e-01,                                  2.449786631268641e-01},
-                                    4.636476090008061e-01},
+    {1.25e-01,                                 1.243549945467614e-01},
-    {2.5e-01,
+    {6.25e-02,                                 6.241880999595735e-02},
-                                  2.449786631268641e-01},
+    {3.125e-02,                                3.123983343026828e-02},
-    {1.25e-01,
+    {1.5625e-02,                               1.562372862047683e-02},
-                                 1.243549945467614e-01},
+    {7.8125e-03,                               7.812341060101111e-03},
-    {6.25e-02,
+    {3.90625e-03,                              3.906230131966972e-03},
-                                 6.241880999595735e-02},
+    {1.953125e-03,                             1.953122516478819e-03},
-    {3.125e-02,
+    {9.765625e-04,                             9.765621895593195e-04},
-                                3.123983343026828e-02},
+    {4.8828125e-04,                            4.882812111948983e-04},
-    {1.5625e-02,
+    {2.44140625e-04,                           2.441406201493618e-04},
-                               1.562372862047683e-02},
+    {1.220703125e-04,                          1.220703118936702e-04},
-    {7.8125e-03,
+    {6.103515625e-05,                          6.103515617420877e-05},
-                               7.812341060101111e-03},
+    {3.0517578125e-05,                         3.051757811552610e-05},
-    {3.90625e-03,
+    {1.52587890625e-05,                        1.525878906131576e-05},
-                              3.906230131966972e-03},
+    {7.62939453125e-06,                        7.629394531101970e-06},
-    {1.953125e-03,
+    {3.814697265625e-06,                       3.814697265606496e-06},
-                             1.953122516478819e-03},
+    {1.9073486328125e-06,                      1.907348632810187e-06},
-    {9.765625e-04,
+    {9.5367431640625e-07,                      9.536743164059608e-07},
-                             9.765621895593195e-04},
+    {4.76837158203125e-07,                     4.768371582030888e-07},
-    {4.8828125e-04,
+    {2.384185791015625e-07,                    2.384185791015580e-07},
-                            4.882812111948983e-04},
+    {1.1920928955078125e-07,                   1.192092895507807e-07},
-    {2.44140625e-04,
+    {5.9604644775390625e-08,                   5.960464477539055e-08},
-                           2.441406201493618e-04},
+    {2.98023223876953125e-08,                  2.980232238769530e-08},
-    {1.220703125e-04,
+    {1.490116119384765625e-08,                 1.490116119384765e-08},
-                          1.220703118936702e-04},
+    {7.450580596923828125e-09,                 7.450580596923828e-09},
-    {6.103515625e-05,
+    {3.7252902984619140625e-09,                3.725290298461914e-09},
-                          6.103515617420877e-05},
+    {1.86264514923095703125e-09,               1.862645149230957e-09},
-    {3.0517578125e-05,
+    {9.31322574615478515625e-10,               9.313225746154785e-10},
-                         3.051757811552610e-05},
+    {4.656612873077392578125e-10,              4.656612873077393e-10},
-    {1.52587890625e-05,
+    {2.3283064365386962890625e-10,             2.328306436538696e-10},
-                        1.525878906131576e-05},
+    {1.16415321826934814453125e-10,            1.164153218269348e-10},
-    {7.62939453125e-06,
+    {5.82076609134674072265625e-11,            5.820766091346741e-11},
-                        7.629394531101970e-06},
+    {2.910383045673370361328125e-11,           2.910383045673370e-11},
-    {3.814697265625e-06,
+    {1.4551915228366851806640625e-11,          1.455191522836685e-11},
-                       3.814697265606496e-06},
+    {7.2759576141834259033203125e-12,          7.275957614183426e-12},
-    {1.9073486328125e-06,
+    {3.63797880709171295166015625e-12,         3.637978807091713e-12},
-                      1.907348632810187e-06},
+    {1.818989403545856475830078125e-12,        1.818989403545856e-12},
-    {9.5367431640625e-07,
+    {9.094947017729282379150390625e-13,        9.094947017729282e-13},
-                      9.536743164059608e-07},
+    {4.5474735088646411895751953125e-13,       4.547473508864641e-13},
-    {4.76837158203125e-07,
+    {2.27373675443232059478759765625e-13,      2.273736754432321e-13},
-                     4.768371582030888e-07},
+    {1.136868377216160297393798828125e-13,     1.136868377216160e-13},
-    {2.384185791015625e-07,
+    {5.684341886080801486968994140625e-14,     5.684341886080801e-14},
-                    2.384185791015580e-07},
+    {2.8421709430404007434844970703125e-14,    2.842170943040401e-14},
-    {1.1920928955078125e-07,
+    {1.42108547152020037174224853515625e-14,   1.421085471520200e-14},
-                   1.192092895507807e-07},
+    {7.10542735760100185871124267578125e-15,   7.105427357601002e-15},
-    {5.9604644775390625e-08,
+    {3.552713678800500929355621337890625e-15,  3.552713678800501e-15},
-                   5.960464477539055e-08},
+    {1.7763568394002504646778106689453125e-15, 1.776356839400250e-15},
-    {2.98023223876953125e-08,
-                  2.980232238769530e-08},
-    {1.490116119384765625e-08,
-                 1.490116119384765e-08},
-    {7.450580596923828125e-09,
-                 7.450580596923828e-09},
-    {3.7252902984619140625e-09,
-                3.725290298461914e-09},
-    {1.86264514923095703125e-09,
-               1.862645149230957e-09},
-    {9.31322574615478515625e-10,
-               9.313225746154785e-10},
-    {4.656612873077392578125e-10,
-              4.656612873077393e-10},
-    {2.3283064365386962890625e-10,
-             2.328306436538696e-10},
-    {1.16415321826934814453125e-10,
-            1.164153218269348e-10},
-    {5.82076609134674072265625e-11,
-            5.820766091346741e-11},
-    {2.910383045673370361328125e-11,
-           2.910383045673370e-11},
-    {1.4551915228366851806640625e-11,
-          1.455191522836685e-11},
-    {7.2759576141834259033203125e-12,
-          7.275957614183426e-12},
-    {3.63797880709171295166015625e-12,
-         3.637978807091713e-12},
-    {1.818989403545856475830078125e-12,
-        1.818989403545856e-12},
-    {9.094947017729282379150390625e-13,
-        9.094947017729282e-13},
-    {4.5474735088646411895751953125e-13,
-       4.547473508864641e-13},
-    {2.27373675443232059478759765625e-13,
-      2.273736754432321e-13},
-    {1.136868377216160297393798828125e-13,
-     1.136868377216160e-13},
-    {5.684341886080801486968994140625e-14,
-     5.684341886080801e-14},
-    {2.8421709430404007434844970703125e-14,
-    2.842170943040401e-14},
-    {1.42108547152020037174224853515625e-14,
-   1.421085471520200e-14},
-    {7.10542735760100185871124267578125e-15,
-   7.105427357601002e-15},
-    {3.552713678800500929355621337890625e-15,
-  3.552713678800501e-15},
-    {1.7763568394002504646778106689453125e-15,
- 1.776356839400250e-15},
    {8.8817841970012523233890533447265625e-16, 8.881784197001252e-16}
 };
@@ -1383,9 +1306,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
                calStatus = cal_exit;
                printResult();
                break;
-            case SYS_USB_CONNECTED:
+            default:
-                rb->usb_screen();
+                if(rb->default_event_handler(btn) == SYS_USB_CONNECTED)
-                return PLUGIN_USB_CONNECTED;
+                    return PLUGIN_USB_CONNECTED;
                break;
        }  /* switch (btn) */
    } /* while (calStatus != cal_exit ) */
author	Linus Nielsen Feltzing <linus@haxx.se>	2004-07-26 23:34:42 +0000
committer	Linus Nielsen Feltzing <linus@haxx.se>	2004-07-26 23:34:42 +0000
commit	147d0eb5d4545175f9eec739477dc92c4467da0f (patch)
tree	5c0963de6eb7a8a335be10e4565a2ba41fce68b7 /apps
parent	5f8f4a392f0579822aef97b3550ae2c5d9dae21a (diff)
download	rockbox-147d0eb5d4545175f9eec739477dc92c4467da0f.tar.gz rockbox-147d0eb5d4545175f9eec739477dc92c4467da0f.zip

diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 257a279839..1630f03877 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c
@@ -20,58 +20,31 @@
20	/*	20	/*
21	00 01 21 22 23 43 44 45 65 66 67 87 88 89 109110111	21	00 01 21 22 23 43 44 45 65 66 67 87 88 89 109110111
22	00 \|-----------\|-----------\|-----------\|-----------\|-----------\|	22	00 \|-----------\|-----------\|-----------\|-----------\|-----------\|
23	01 \|	23	01 \| \| \| \| \| \|
24	\| \| \| \| \|	24	\|*********\|*******\|*******\|*******\|*********\|
25	\|	25	\|*********\|*******\|*******\|*******\|*********\|
26	***********\|	26	11 \| \| \| \| \| \|
27	***********\|
28	***********\|
29	***********\|
30	***********\|
31	\|
32	***********\|
33	***********\|
34	***********\|
35	***********\|
36	***********\|
37	11 \|
38	\| \| \| \| \|
39	12 \|-----------\|-----------\|-----------\|-----------\|-----------\|	27	12 \|-----------\|-----------\|-----------\|-----------\|-----------\|
40	13 \|-----------\|-----------\|-----------\|-----------\|-----------\| y1	28	13 \|-----------\|-----------\|-----------\|-----------\|-----------\| y1
41	14 \|	29	14 \| \| \| \| \| \|
42	\| \| \| \| \|
43
44	\| \| \| \| \| \|	30	\| \| \| \| \| \|
45	22 \|	31	22 \| \| \| \| \| \|
46	\| \| \| \| \|
47	23 \|-----------\|-----------\|-----------\|-----------\|-----------\| y2	32	23 \|-----------\|-----------\|-----------\|-----------\|-----------\| y2
48	24 \|	33	24 \| \| \| \| \| \|
49	\| \| \| \| \|
50
51	\| \| \| \| \| \|	34	\| \| \| \| \| \|
52	32 \|	35	32 \| \| \| \| \| \|
53	\| \| \| \| \|
54	33 \|-----------\|-----------\|-----------\|-----------\|-----------\| y3	36	33 \|-----------\|-----------\|-----------\|-----------\|-----------\| y3
55	34 \|	37	34 \| \| \| \| \| \|
56	\| \| \| \| \|
57
58	\| \| \| \| \| \|	38	\| \| \| \| \| \|
59	42 \|	39	42 \| \| \| \| \| \|
60	\| \| \| \| \|
61	43 \|-----------\|-----------\|-----------\|-----------\|-----------\| y4	40	43 \|-----------\|-----------\|-----------\|-----------\|-----------\| y4
62	44 \|	41	44 \| \| \| \| \| \|
63	\| \| \| \| \|
64
65	\| \| \| \| \| \|	42	\| \| \| \| \| \|
66	52 \|	43	52 \| \| \| \| \| \|
67	\| \| \| \| \|
68	53 \|-----------\|-----------\|-----------\|-----------\|-----------\| y5	44	53 \|-----------\|-----------\|-----------\|-----------\|-----------\| y5
69	54 \|	45	54 \| \| \| \| \| \|
70	\| \| \| \| \|
71
72	\| \| \| \| \| \|	46	\| \| \| \| \| \|
73	62 \|	47	62 \| \| \| \| \| \|
74	\| \| \| \| \|
75	63 \|-----------\|-----------\|-----------\|-----------\|-----------\| y6	48	63 \|-----------\|-----------\|-----------\|-----------\|-----------\| y6
76	x0 x1 x2 x3 x4 x5	49	x0 x1 x2 x3 x4 x5
77	*/	50	*/
@@ -227,106 +200,56 @@ enum {cal_normal, /* 0, normal status, display result */
227	/* constant table for CORDIC algorithm */	200	/* constant table for CORDIC algorithm */
228	double cordicTable[51][2]= {	201	double cordicTable[51][2]= {
229	/* pow(2,0) - pow(2,-50) atan(pow(2,0) - atan(pow(2,-50) */	202	/* pow(2,0) - pow(2,-50) atan(pow(2,0) - atan(pow(2,-50) */
230	{1e+00,	203	{1e+00, 7.853981633974483e-01},
231	7.853981633974483e-01},	204	{5e-01, 4.636476090008061e-01},
232	{5e-01,	205	{2.5e-01, 2.449786631268641e-01},
233	4.636476090008061e-01},	206	{1.25e-01, 1.243549945467614e-01},
234	{2.5e-01,	207	{6.25e-02, 6.241880999595735e-02},
235	2.449786631268641e-01},	208	{3.125e-02, 3.123983343026828e-02},
236	{1.25e-01,	209	{1.5625e-02, 1.562372862047683e-02},
237	1.243549945467614e-01},	210	{7.8125e-03, 7.812341060101111e-03},
238	{6.25e-02,	211	{3.90625e-03, 3.906230131966972e-03},
239	6.241880999595735e-02},	212	{1.953125e-03, 1.953122516478819e-03},
240	{3.125e-02,	213	{9.765625e-04, 9.765621895593195e-04},
241	3.123983343026828e-02},	214	{4.8828125e-04, 4.882812111948983e-04},
242	{1.5625e-02,	215	{2.44140625e-04, 2.441406201493618e-04},
243	1.562372862047683e-02},	216	{1.220703125e-04, 1.220703118936702e-04},
244	{7.8125e-03,	217	{6.103515625e-05, 6.103515617420877e-05},
245	7.812341060101111e-03},	218	{3.0517578125e-05, 3.051757811552610e-05},
246	{3.90625e-03,	219	{1.52587890625e-05, 1.525878906131576e-05},
247	3.906230131966972e-03},	220	{7.62939453125e-06, 7.629394531101970e-06},
248	{1.953125e-03,	221	{3.814697265625e-06, 3.814697265606496e-06},
249	1.953122516478819e-03},	222	{1.9073486328125e-06, 1.907348632810187e-06},
250	{9.765625e-04,	223	{9.5367431640625e-07, 9.536743164059608e-07},
251	9.765621895593195e-04},	224	{4.76837158203125e-07, 4.768371582030888e-07},
252	{4.8828125e-04,	225	{2.384185791015625e-07, 2.384185791015580e-07},
253	4.882812111948983e-04},	226	{1.1920928955078125e-07, 1.192092895507807e-07},
254	{2.44140625e-04,	227	{5.9604644775390625e-08, 5.960464477539055e-08},
255	2.441406201493618e-04},	228	{2.98023223876953125e-08, 2.980232238769530e-08},
256	{1.220703125e-04,	229	{1.490116119384765625e-08, 1.490116119384765e-08},
257	1.220703118936702e-04},	230	{7.450580596923828125e-09, 7.450580596923828e-09},
258	{6.103515625e-05,	231	{3.7252902984619140625e-09, 3.725290298461914e-09},
259	6.103515617420877e-05},	232	{1.86264514923095703125e-09, 1.862645149230957e-09},
260	{3.0517578125e-05,	233	{9.31322574615478515625e-10, 9.313225746154785e-10},
261	3.051757811552610e-05},	234	{4.656612873077392578125e-10, 4.656612873077393e-10},
262	{1.52587890625e-05,	235	{2.3283064365386962890625e-10, 2.328306436538696e-10},
263	1.525878906131576e-05},	236	{1.16415321826934814453125e-10, 1.164153218269348e-10},
264	{7.62939453125e-06,	237	{5.82076609134674072265625e-11, 5.820766091346741e-11},
265	7.629394531101970e-06},	238	{2.910383045673370361328125e-11, 2.910383045673370e-11},
266	{3.814697265625e-06,	239	{1.4551915228366851806640625e-11, 1.455191522836685e-11},
267	3.814697265606496e-06},	240	{7.2759576141834259033203125e-12, 7.275957614183426e-12},
268	{1.9073486328125e-06,	241	{3.63797880709171295166015625e-12, 3.637978807091713e-12},
269	1.907348632810187e-06},	242	{1.818989403545856475830078125e-12, 1.818989403545856e-12},
270	{9.5367431640625e-07,	243	{9.094947017729282379150390625e-13, 9.094947017729282e-13},
271	9.536743164059608e-07},	244	{4.5474735088646411895751953125e-13, 4.547473508864641e-13},
272	{4.76837158203125e-07,	245	{2.27373675443232059478759765625e-13, 2.273736754432321e-13},
273	4.768371582030888e-07},	246	{1.136868377216160297393798828125e-13, 1.136868377216160e-13},
274	{2.384185791015625e-07,	247	{5.684341886080801486968994140625e-14, 5.684341886080801e-14},
275	2.384185791015580e-07},	248	{2.8421709430404007434844970703125e-14, 2.842170943040401e-14},
276	{1.1920928955078125e-07,	249	{1.42108547152020037174224853515625e-14, 1.421085471520200e-14},
277	1.192092895507807e-07},	250	{7.10542735760100185871124267578125e-15, 7.105427357601002e-15},
278	{5.9604644775390625e-08,	251	{3.552713678800500929355621337890625e-15, 3.552713678800501e-15},
279	5.960464477539055e-08},	252	{1.7763568394002504646778106689453125e-15, 1.776356839400250e-15},
280	{2.98023223876953125e-08,
281	2.980232238769530e-08},
282	{1.490116119384765625e-08,
283	1.490116119384765e-08},
284	{7.450580596923828125e-09,
285	7.450580596923828e-09},
286	{3.7252902984619140625e-09,
287	3.725290298461914e-09},
288	{1.86264514923095703125e-09,
289	1.862645149230957e-09},
290	{9.31322574615478515625e-10,
291	9.313225746154785e-10},
292	{4.656612873077392578125e-10,
293	4.656612873077393e-10},
294	{2.3283064365386962890625e-10,
295	2.328306436538696e-10},
296	{1.16415321826934814453125e-10,
297	1.164153218269348e-10},
298	{5.82076609134674072265625e-11,
299	5.820766091346741e-11},
300	{2.910383045673370361328125e-11,
301	2.910383045673370e-11},
302	{1.4551915228366851806640625e-11,
303	1.455191522836685e-11},
304	{7.2759576141834259033203125e-12,
305	7.275957614183426e-12},
306	{3.63797880709171295166015625e-12,
307	3.637978807091713e-12},
308	{1.818989403545856475830078125e-12,
309	1.818989403545856e-12},
310	{9.094947017729282379150390625e-13,
311	9.094947017729282e-13},
312	{4.5474735088646411895751953125e-13,
313	4.547473508864641e-13},
314	{2.27373675443232059478759765625e-13,
315	2.273736754432321e-13},
316	{1.136868377216160297393798828125e-13,
317	1.136868377216160e-13},
318	{5.684341886080801486968994140625e-14,
319	5.684341886080801e-14},
320	{2.8421709430404007434844970703125e-14,
321	2.842170943040401e-14},
322	{1.42108547152020037174224853515625e-14,
323	1.421085471520200e-14},
324	{7.10542735760100185871124267578125e-15,
325	7.105427357601002e-15},
326	{3.552713678800500929355621337890625e-15,
327	3.552713678800501e-15},
328	{1.7763568394002504646778106689453125e-15,
329	1.776356839400250e-15},
330	{8.8817841970012523233890533447265625e-16, 8.881784197001252e-16}	253	{8.8817841970012523233890533447265625e-16, 8.881784197001252e-16}
331	};	254	};
332		255
@@ -1383,9 +1306,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
1383	calStatus = cal_exit;	1306	calStatus = cal_exit;
1384	printResult();	1307	printResult();
1385	break;	1308	break;
1386	case SYS_USB_CONNECTED:	1309	default:
1387	rb->usb_screen();	1310	if(rb->default_event_handler(btn) == SYS_USB_CONNECTED)
1388	return PLUGIN_USB_CONNECTED;	1311	return PLUGIN_USB_CONNECTED;
1389	break;	1312	break;
1390	} /* switch (btn) */	1313	} /* switch (btn) */
1391	} /* while (calStatus != cal_exit ) */	1314	} /* while (calStatus != cal_exit ) */