1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
3228
3229
3230
3231
3232
3233
3234
3235
3236
3237
3238
3239
3240
3241
3242
3243
3244
3245
3246
3247
3248
3249
3250
3251
3252
3253
3254
3255
3256
3257
3258
3259
3260
3261
3262
3263
3264
3265
3266
3267
3268
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
3285
3286
3287
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
3299
3300
3301
3302
3303
3304
3305
3306
3307
3308
3309
3310
3311
3312
3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
3334
3335
3336
3337
3338
3339
3340
3341
3342
3343
3344
3345
3346
3347
3348
3349
3350
3351
3352
3353
3354
3355
3356
3357
3358
3359
3360
3361
3362
3363
3364
3365
3366
3367
3368
3369
3370
3371
3372
3373
3374
3375
3376
3377
3378
3379
3380
3381
3382
3383
3384
3385
3386
3387
3388
3389
3390
3391
3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
3417
3418
3419
3420
3421
3422
3423
3424
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
3439
3440
3441
3442
3443
3444
3445
3446
3447
3448
3449
3450
3451
3452
3453
3454
3455
3456
3457
3458
3459
3460
3461
3462
3463
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
3498
3499
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
3535
3536
3537
3538
3539
3540
3541
3542
3543
3544
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
3565
3566
3567
3568
3569
3570
3571
3572
3573
3574
3575
3576
3577
3578
3579
3580
3581
3582
3583
3584
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
3599
3600
3601
3602
3603
3604
3605
3606
3607
3608
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
3621
3622
3623
3624
3625
3626
3627
3628
3629
3630
3631
3632
3633
3634
3635
3636
3637
3638
3639
3640
3641
3642
3643
3644
3645
3646
3647
3648
3649
3650
3651
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
3662
3663
3664
3665
3666
3667
3668
3669
3670
3671
3672
3673
3674
3675
3676
3677
3678
3679
3680
3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
3691
3692
3693
3694
3695
3696
3697
3698
3699
3700
3701
3702
3703
3704
3705
3706
3707
3708
3709
3710
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
3725
3726
3727
3728
3729
3730
3731
3732
3733
3734
3735
3736
3737
3738
3739
3740
3741
3742
3743
3744
3745
3746
3747
3748
3749
3750
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
3764
3765
3766
3767
3768
3769
3770
3771
3772
3773
3774
3775
3776
3777
3778
3779
3780
3781
3782
3783
3784
3785
3786
3787
3788
3789
3790
3791
3792
3793
3794
3795
3796
3797
3798
3799
3800
3801
3802
3803
3804
3805
3806
3807
3808
3809
3810
3811
3812
3813
3814
3815
3816
3817
3818
3819
3820
3821
3822
3823
3824
3825
3826
3827
3828
3829
3830
3831
3832
3833
3834
3835
3836
3837
3838
3839
3840
3841
3842
3843
3844
3845
3846
3847
3848
3849
3850
3851
3852
3853
3854
3855
3856
3857
3858
3859
3860
3861
3862
3863
3864
3865
3866
3867
3868
3869
3870
3871
3872
3873
3874
3875
3876
3877
3878
3879
3880
3881
3882
3883
3884
3885
3886
3887
3888
3889
3890
3891
3892
3893
3894
3895
3896
3897
3898
3899
3900
3901
3902
3903
3904
3905
3906
3907
3908
3909
3910
3911
3912
3913
3914
3915
3916
3917
3918
3919
3920
3921
3922
3923
3924
3925
3926
3927
3928
3929
3930
3931
3932
3933
3934
3935
3936
3937
3938
3939
3940
3941
3942
3943
3944
3945
3946
3947
3948
3949
3950
3951
3952
3953
3954
3955
3956
3957
3958
3959
3960
3961
3962
3963
3964
3965
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
3978
3979
3980
3981
3982
3983
3984
3985
3986
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
4013
4014
4015
4016
4017
4018
4019
4020
4021
4022
4023
4024
4025
4026
4027
4028
4029
4030
4031
4032
4033
4034
4035
4036
4037
4038
4039
4040
4041
4042
4043
4044
4045
4046
4047
4048
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
4062
4063
4064
4065
4066
4067
4068
4069
4070
4071
4072
4073
4074
4075
4076
4077
4078
4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091
4092
4093
4094
4095
4096
4097
4098
4099
4100
4101
4102
4103
4104
4105
4106
4107
4108
4109
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
4121
4122
4123
4124
4125
4126
4127
4128
4129
4130
4131
4132
4133
4134
4135
4136
4137
4138
4139
4140
4141
4142
4143
4144
4145
4146
4147
4148
4149
4150
4151
4152
4153
4154
4155
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
4168
4169
4170
4171
4172
4173
4174
4175
4176
4177
4178
4179
4180
4181
4182
4183
4184
4185
4186
4187
4188
4189
4190
4191
4192
4193
4194
4195
4196
4197
4198
4199
4200
4201
4202
4203
4204
4205
4206
4207
4208
4209
4210
4211
4212
4213
4214
4215
4216
4217
4218
4219
4220
4221
4222
4223
4224
4225
4226
4227
4228
4229
4230
4231
4232
4233
4234
4235
4236
4237
4238
4239
4240
4241
4242
4243
4244
4245
4246
4247
4248
4249
4250
4251
4252
4253
4254
4255
4256
4257
4258
4259
4260
4261
4262
4263
4264
4265
4266
4267
4268
4269
4270
4271
4272
4273
4274
4275
4276
4277
4278
4279
4280
4281
4282
4283
4284
4285
4286
4287
4288
4289
4290
4291
4292
4293
4294
4295
4296
4297
4298
4299
4300
4301
4302
4303
4304
4305
4306
4307
4308
4309
4310
4311
4312
4313
4314
4315
4316
4317
4318
4319
4320
4321
4322
4323
4324
4325
4326
4327
4328
4329
4330
4331
4332
4333
4334
4335
4336
4337
4338
4339
4340
4341
4342
4343
4344
4345
4346
4347
4348
4349
4350
4351
4352
4353
4354
4355
4356
4357
4358
4359
4360
4361
4362
4363
4364
4365
4366
4367
4368
4369
4370
4371
4372
4373
4374
4375
4376
4377
4378
4379
4380
4381
4382
4383
4384
4385
4386
4387
4388
4389
4390
4391
4392
4393
4394
4395
4396
4397
4398
4399
4400
4401
4402
4403
4404
4405
4406
4407
4408
4409
4410
4411
4412
4413
4414
4415
4416
4417
4418
4419
4420
4421
4422
4423
4424
4425
4426
4427
4428
4429
4430
4431
4432
4433
4434
4435
4436
4437
4438
4439
4440
4441
4442
4443
4444
4445
4446
4447
4448
4449
4450
4451
4452
4453
4454
4455
4456
4457
4458
4459
4460
4461
4462
4463
4464
4465
4466
4467
4468
4469
4470
4471
4472
4473
4474
4475
4476
4477
4478
4479
4480
4481
4482
4483
4484
4485
4486
4487
4488
4489
4490
4491
4492
4493
4494
4495
4496
4497
4498
4499
4500
4501
4502
4503
4504
4505
4506
4507
4508
4509
4510
4511
4512
4513
4514
4515
4516
4517
4518
4519
4520
4521
4522
4523
4524
4525
4526
4527
4528
4529
4530
4531
4532
4533
4534
4535
4536
4537
4538
4539
4540
4541
4542
4543
4544
4545
4546
4547
4548
4549
4550
4551
4552
4553
4554
4555
4556
4557
4558
4559
4560
4561
4562
4563
4564
4565
4566
4567
4568
4569
4570
4571
4572
4573
4574
4575
4576
4577
4578
4579
4580
4581
4582
4583
4584
4585
4586
4587
4588
4589
4590
4591
4592
4593
4594
4595
4596
4597
4598
4599
4600
4601
4602
4603
4604
4605
4606
4607
4608
4609
4610
4611
4612
4613
4614
4615
4616
4617
4618
4619
4620
4621
4622
4623
4624
4625
4626
4627
4628
4629
4630
4631
4632
4633
4634
4635
4636
4637
4638
4639
4640
4641
4642
4643
4644
4645
4646
4647
4648
4649
4650
4651
4652
4653
4654
4655
4656
4657
4658
4659
4660
4661
4662
4663
4664
4665
4666
4667
4668
4669
4670
4671
4672
4673
4674
4675
4676
4677
4678
4679
4680
4681
4682
4683
4684
4685
4686
4687
4688
4689
4690
4691
4692
4693
4694
4695
4696
4697
4698
4699
4700
4701
4702
4703
4704
4705
4706
4707
4708
4709
4710
4711
4712
4713
4714
4715
4716
4717
4718
4719
4720
4721
4722
4723
4724
4725
4726
4727
4728
4729
4730
4731
4732
4733
4734
4735
4736
4737
4738
4739
4740
4741
4742
4743
4744
4745
4746
4747
4748
4749
4750
4751
4752
4753
4754
4755
4756
4757
4758
4759
4760
4761
4762
4763
4764
4765
4766
4767
4768
4769
4770
4771
4772
4773
4774
4775
4776
4777
4778
4779
4780
4781
4782
4783
4784
4785
4786
4787
4788
4789
4790
4791
4792
4793
4794
4795
4796
4797
4798
4799
4800
4801
4802
4803
4804
4805
4806
4807
4808
4809
4810
4811
4812
4813
4814
4815
4816
4817
4818
4819
4820
4821
4822
4823
4824
4825
4826
4827
4828
4829
4830
4831
4832
4833
4834
4835
4836
4837
4838
4839
4840
4841
4842
4843
4844
4845
4846
4847
4848
4849
4850
4851
4852
4853
4854
4855
4856
4857
4858
4859
4860
4861
4862
4863
4864
4865
4866
4867
4868
4869
4870
4871
4872
4873
4874
4875
4876
4877
4878
4879
4880
4881
4882
4883
4884
4885
4886
4887
4888
4889
4890
4891
4892
4893
4894
4895
4896
4897
4898
4899
4900
4901
4902
4903
4904
4905
4906
4907
4908
4909
4910
4911
4912
4913
4914
4915
4916
4917
4918
4919
4920
4921
4922
4923
4924
4925
4926
4927
4928
4929
4930
4931
4932
4933
4934
4935
4936
4937
4938
4939
4940
4941
4942
4943
4944
4945
4946
4947
4948
4949
4950
4951
4952
4953
4954
4955
4956
4957
4958
4959
4960
4961
4962
4963
4964
4965
4966
4967
4968
4969
4970
4971
4972
4973
4974
4975
4976
4977
4978
4979
4980
4981
4982
4983
4984
4985
4986
4987
4988
4989
4990
4991
4992
4993
4994
4995
4996
4997
4998
4999
5000
5001
5002
5003
5004
5005
5006
5007
5008
5009
5010
5011
5012
5013
5014
5015
5016
5017
5018
5019
5020
5021
5022
5023
5024
5025
5026
5027
5028
5029
5030
5031
5032
5033
5034
5035
5036
5037
5038
5039
5040
5041
5042
5043
5044
5045
5046
5047
5048
5049
5050
5051
5052
5053
5054
5055
5056
5057
5058
5059
5060
5061
5062
5063
5064
5065
5066
5067
5068
5069
5070
5071
5072
5073
5074
5075
5076
5077
5078
5079
5080
5081
5082
5083
5084
5085
5086
5087
5088
5089
5090
5091
5092
5093
5094
5095
5096
5097
5098
5099
5100
5101
5102
5103
5104
5105
5106
5107
5108
5109
5110
5111
5112
5113
5114
5115
5116
5117
5118
5119
5120
5121
5122
5123
5124
5125
5126
5127
5128
5129
5130
5131
5132
5133
5134
5135
5136
5137
5138
5139
5140
5141
5142
5143
5144
5145
5146
5147
5148
5149
5150
5151
5152
5153
5154
5155
5156
5157
5158
5159
5160
5161
5162
5163
5164
5165
5166
5167
5168
5169
5170
5171
5172
5173
5174
5175
5176
5177
5178
5179
5180
5181
5182
5183
5184
5185
5186
5187
5188
5189
5190
5191
5192
5193
5194
5195
5196
5197
5198
5199
5200
5201
5202
5203
5204
5205
5206
5207
5208
5209
5210
5211
5212
5213
5214
5215
5216
5217
5218
5219
5220
5221
5222
5223
5224
5225
5226
5227
5228
5229
5230
5231
5232
5233
5234
5235
5236
5237
5238
5239
5240
5241
5242
5243
5244
5245
5246
5247
5248
5249
5250
5251
5252
5253
5254
5255
5256
5257
5258
5259
5260
5261
5262
5263
5264
5265
5266
5267
5268
5269
5270
5271
5272
5273
5274
5275
5276
5277
5278
5279
5280
5281
5282
5283
5284
5285
5286
5287
5288
5289
5290
5291
5292
5293
5294
5295
5296
5297
5298
5299
5300
5301
5302
5303
5304
5305
5306
5307
5308
5309
5310
5311
5312
5313
5314
5315
5316
5317
5318
5319
5320
5321
5322
5323
5324
5325
5326
5327
5328
5329
5330
5331
5332
5333
5334
5335
5336
5337
5338
5339
5340
5341
5342
5343
5344
5345
5346
5347
5348
5349
5350
5351
5352
5353
5354
5355
5356
5357
5358
5359
5360
5361
5362
5363
5364
5365
5366
5367
5368
5369
5370
5371
5372
5373
5374
5375
5376
5377
5378
5379
5380
5381
5382
5383
5384
5385
5386
5387
5388
5389
5390
5391
5392
5393
5394
5395
5396
5397
5398
5399
5400
5401
5402
5403
5404
5405
5406
5407
5408
5409
5410
5411
5412
5413
5414
5415
5416
5417
5418
5419
5420
5421
5422
5423
5424
5425
5426
5427
5428
5429
5430
5431
5432
5433
5434
5435
5436
5437
5438
5439
5440
5441
5442
5443
5444
5445
5446
5447
5448
5449
5450
5451
5452
5453
5454
5455
5456
5457
5458
5459
5460
5461
5462
5463
5464
5465
5466
5467
5468
5469
5470
5471
5472
5473
5474
5475
5476
5477
5478
5479
5480
5481
5482
5483
5484
5485
5486
5487
5488
5489
5490
5491
5492
5493
5494
5495
5496
5497
5498
5499
5500
5501
5502
5503
5504
5505
5506
5507
5508
5509
5510
5511
5512
5513
5514
5515
5516
5517
5518
5519
5520
5521
5522
5523
5524
5525
5526
5527
5528
5529
5530
5531
5532
5533
5534
5535
5536
5537
5538
5539
5540
5541
5542
5543
5544
5545
5546
5547
5548
5549
5550
5551
5552
5553
5554
5555
5556
5557
5558
5559
5560
5561
5562
5563
5564
5565
5566
5567
5568
5569
5570
5571
5572
5573
5574
5575
5576
5577
5578
5579
5580
5581
5582
5583
5584
5585
5586
5587
5588
5589
5590
5591
5592
5593
5594
5595
5596
5597
5598
5599
5600
5601
5602
5603
5604
5605
5606
5607
5608
5609
5610
5611
5612
5613
5614
5615
5616
5617
5618
5619
5620
5621
5622
5623
5624
5625
5626
5627
5628
5629
5630
5631
5632
5633
5634
5635
5636
5637
5638
5639
5640
5641
5642
5643
5644
5645
5646
5647
5648
5649
5650
5651
5652
5653
5654
5655
5656
5657
5658
5659
5660
5661
5662
5663
5664
5665
5666
5667
5668
5669
5670
5671
5672
5673
5674
5675
5676
5677
5678
5679
5680
5681
5682
5683
5684
5685
5686
5687
5688
5689
5690
5691
5692
5693
5694
5695
5696
5697
5698
5699
5700
5701
5702
5703
5704
5705
5706
5707
5708
5709
5710
5711
5712
5713
5714
5715
5716
5717
5718
5719
5720
5721
5722
5723
5724
5725
5726
5727
5728
5729
5730
5731
5732
5733
5734
5735
5736
5737
5738
5739
5740
5741
5742
5743
5744
5745
5746
5747
5748
5749
5750
5751
5752
5753
5754
5755
5756
5757
5758
5759
5760
5761
5762
5763
5764
5765
5766
5767
5768
5769
5770
5771
5772
5773
5774
5775
5776
5777
5778
5779
5780
5781
5782
5783
5784
5785
5786
5787
5788
5789
5790
5791
5792
5793
5794
5795
5796
5797
5798
5799
5800
5801
5802
5803
5804
5805
5806
5807
5808
5809
5810
5811
5812
5813
5814
5815
5816
5817
5818
5819
5820
5821
5822
5823
5824
5825
5826
5827
5828
5829
5830
5831
5832
5833
5834
5835
5836
5837
5838
5839
5840
5841
5842
5843
5844
5845
5846
5847
5848
5849
5850
5851
5852
5853
5854
5855
5856
5857
5858
5859
5860
5861
5862
5863
5864
5865
5866
5867
5868
5869
5870
5871
5872
5873
5874
5875
5876
5877
5878
5879
5880
5881
5882
5883
5884
5885
5886
5887
5888
5889
5890
5891
5892
5893
5894
5895
5896
5897
5898
5899
5900
5901
5902
5903
5904
5905
5906
5907
5908
5909
5910
5911
5912
5913
5914
5915
5916
5917
5918
5919
5920
5921
5922
5923
5924
5925
5926
5927
5928
5929
5930
5931
5932
5933
5934
5935
5936
5937
5938
5939
5940
5941
5942
5943
5944
5945
5946
5947
5948
5949
5950
5951
5952
5953
5954
5955
5956
5957
5958
5959
5960
5961
5962
5963
5964
5965
5966
5967
5968
5969
5970
5971
5972
5973
5974
5975
5976
5977
5978
5979
5980
5981
5982
5983
5984
5985
5986
5987
5988
5989
5990
5991
5992
5993
5994
5995
5996
5997
5998
5999
6000
6001
6002
6003
6004
6005
6006
6007
6008
6009
6010
6011
6012
6013
6014
6015
6016
6017
6018
6019
6020
6021
6022
6023
6024
6025
6026
6027
6028
6029
6030
6031
6032
6033
6034
6035
6036
6037
6038
6039
6040
6041
6042
6043
6044
6045
6046
6047
6048
6049
6050
6051
6052
6053
6054
6055
6056
6057
6058
6059
6060
6061
6062
6063
6064
6065
6066
6067
6068
6069
6070
6071
6072
6073
6074
6075
6076
6077
6078
6079
6080
6081
6082
6083
6084
6085
6086
6087
6088
6089
6090
6091
6092
6093
6094
6095
6096
6097
6098
6099
6100
6101
6102
6103
6104
6105
6106
6107
6108
6109
6110
6111
6112
6113
6114
6115
6116
6117
6118
6119
6120
6121
6122
6123
6124
6125
6126
6127
6128
6129
6130
6131
6132
6133
6134
6135
6136
6137
6138
6139
6140
6141
6142
6143
6144
6145
6146
6147
6148
6149
6150
6151
6152
6153
6154
6155
6156
6157
6158
6159
6160
6161
6162
6163
6164
6165
6166
6167
6168
6169
6170
6171
6172
6173
6174
6175
6176
6177
6178
6179
6180
6181
6182
6183
6184
6185
6186
6187
6188
6189
6190
6191
6192
6193
6194
6195
6196
6197
6198
6199
6200
6201
6202
6203
6204
6205
6206
6207
6208
6209
6210
6211
6212
6213
6214
6215
6216
6217
6218
6219
6220
6221
6222
6223
6224
6225
6226
6227
6228
6229
6230
6231
6232
6233
6234
6235
6236
6237
6238
6239
6240
6241
6242
6243
6244
6245
6246
6247
6248
6249
6250
6251
6252
6253
6254
6255
6256
6257
6258
6259
6260
6261
6262
6263
6264
6265
6266
6267
6268
6269
6270
6271
6272
6273
6274
6275
6276
6277
6278
6279
6280
6281
6282
6283
6284
6285
6286
6287
6288
6289
6290
6291
6292
6293
6294
6295
6296
6297
6298
6299
6300
6301
6302
6303
6304
6305
6306
6307
6308
6309
6310
6311
6312
6313
6314
6315
6316
6317
6318
6319
6320
6321
6322
6323
6324
6325
6326
6327
6328
6329
6330
6331
6332
6333
6334
6335
6336
6337
6338
6339
6340
6341
6342
6343
6344
6345
6346
6347
6348
6349
6350
6351
6352
6353
6354
6355
6356
6357
6358
6359
6360
6361
6362
6363
6364
6365
6366
6367
6368
6369
6370
6371
6372
6373
6374
6375
6376
6377
6378
6379
6380
6381
6382
6383
6384
6385
6386
6387
6388
6389
6390
6391
6392
6393
6394
6395
6396
6397
6398
6399
6400
6401
6402
6403
6404
6405
6406
6407
6408
6409
6410
6411
6412
6413
6414
6415
6416
6417
6418
6419
6420
6421
6422
6423
6424
6425
6426
6427
6428
6429
6430
6431
6432
6433
6434
6435
6436
6437
6438
6439
6440
6441
6442
6443
6444
6445
6446
6447
6448
6449
6450
6451
6452
6453
6454
6455
6456
6457
6458
6459
6460
6461
6462
6463
6464
6465
6466
6467
6468
6469
6470
6471
6472
6473
6474
6475
6476
6477
6478
6479
6480
6481
6482
6483
6484
6485
6486
6487
6488
6489
6490
6491
6492
6493
6494
6495
6496
6497
6498
6499
6500
6501
6502
6503
6504
6505
6506
6507
6508
6509
6510
6511
6512
6513
6514
6515
6516
6517
6518
6519
6520
6521
6522
6523
6524
6525
6526
6527
6528
6529
6530
6531
6532
6533
6534
6535
6536
6537
6538
6539
6540
6541
6542
6543
6544
6545
6546
6547
6548
6549
6550
6551
6552
6553
6554
6555
6556
6557
6558
6559
6560
6561
6562
6563
6564
6565
6566
6567
6568
6569
6570
6571
6572
6573
6574
6575
6576
6577
6578
6579
6580
6581
6582
6583
6584
6585
6586
6587
6588
6589
6590
6591
6592
6593
6594
6595
6596
6597
6598
6599
6600
6601
6602
6603
6604
6605
6606
6607
6608
6609
6610
6611
6612
6613
6614
6615
6616
6617
6618
6619
6620
6621
6622
6623
6624
6625
6626
6627
6628
6629
6630
6631
6632
6633
6634
6635
6636
6637
6638
6639
6640
6641
6642
6643
6644
6645
6646
6647
6648
6649
6650
6651
6652
6653
6654
6655
6656
6657
6658
6659
6660
6661
6662
6663
6664
6665
6666
6667
6668
6669
6670
6671
6672
6673
6674
6675
6676
6677
6678
6679
6680
6681
6682
6683
6684
6685
6686
6687
6688
6689
6690
6691
6692
6693
6694
6695
6696
6697
6698
6699
6700
6701
6702
6703
6704
6705
6706
6707
6708
6709
6710
6711
6712
6713
6714
6715
6716
6717
6718
6719
6720
6721
6722
6723
6724
6725
6726
6727
6728
6729
6730
6731
6732
6733
6734
6735
6736
6737
6738
6739
6740
6741
6742
6743
6744
6745
6746
6747
6748
6749
6750
6751
6752
6753
6754
6755
6756
6757
6758
6759
6760
6761
6762
6763
6764
6765
6766
6767
6768
6769
6770
6771
6772
6773
6774
6775
6776
6777
6778
6779
6780
6781
6782
6783
6784
6785
6786
6787
6788
6789
6790
6791
6792
6793
6794
6795
6796
6797
6798
6799
6800
6801
6802
6803
6804
6805
6806
6807
6808
6809
6810
6811
6812
6813
6814
6815
6816
6817
6818
6819
6820
6821
6822
6823
6824
6825
6826
6827
6828
6829
6830
6831
6832
6833
6834
6835
6836
6837
6838
6839
6840
6841
6842
6843
6844
6845
6846
6847
6848
6849
6850
6851
6852
6853
6854
6855
6856
6857
6858
6859
6860
6861
6862
6863
6864
6865
6866
6867
6868
6869
6870
6871
6872
6873
6874
6875
6876
6877
6878
6879
6880
6881
6882
6883
6884
6885
6886
6887
6888
6889
6890
6891
6892
6893
6894
6895
6896
6897
6898
6899
6900
6901
6902
6903
6904
6905
6906
6907
6908
6909
6910
6911
6912
6913
6914
6915
6916
6917
6918
6919
6920
6921
6922
6923
6924
6925
6926
6927
6928
6929
6930
6931
6932
6933
6934
6935
6936
6937
6938
6939
6940
6941
6942
6943
6944
6945
6946
6947
6948
6949
6950
6951
6952
6953
6954
6955
6956
6957
6958
6959
6960
6961
6962
6963
6964
6965
6966
6967
6968
6969
6970
6971
6972
6973
6974
6975
6976
6977
6978
6979
6980
6981
6982
6983
6984
6985
6986
6987
6988
6989
6990
6991
6992
6993
6994
6995
6996
6997
6998
6999
7000
7001
7002
7003
7004
7005
7006
7007
7008
7009
7010
7011
7012
7013
7014
7015
7016
7017
7018
7019
7020
7021
7022
7023
7024
7025
7026
7027
7028
7029
7030
7031
7032
7033
7034
7035
7036
7037
7038
7039
7040
7041
7042
7043
7044
7045
7046
7047
7048
7049
7050
7051
7052
7053
7054
7055
7056
7057
7058
7059
7060
7061
7062
7063
7064
7065
7066
7067
7068
7069
7070
7071
7072
7073
7074
7075
7076
7077
7078
7079
7080
7081
7082
7083
7084
7085
7086
7087
7088
7089
7090
7091
7092
7093
7094
7095
7096
7097
7098
7099
7100
7101
7102
7103
7104
7105
7106
7107
7108
7109
7110
7111
7112
7113
7114
7115
7116
7117
7118
7119
7120
7121
7122
7123
7124
7125
7126
7127
7128
7129
7130
7131
7132
7133
7134
7135
7136
7137
7138
7139
7140
7141
7142
7143
7144
7145
7146
7147
7148
7149
7150
7151
7152
7153
7154
7155
7156
7157
7158
7159
7160
7161
7162
7163
7164
7165
7166
7167
7168
7169
7170
7171
7172
7173
7174
7175
7176
7177
7178
7179
7180
7181
7182
7183
7184
7185
7186
7187
7188
7189
7190
7191
7192
7193
7194
7195
7196
7197
7198
7199
7200
7201
7202
7203
7204
7205
7206
7207
7208
7209
7210
7211
7212
7213
7214
7215
7216
7217
7218
7219
7220
7221
7222
7223
7224
7225
7226
7227
7228
7229
7230
7231
7232
7233
7234
7235
7236
7237
7238
7239
7240
7241
7242
7243
7244
7245
7246
7247
7248
7249
7250
7251
7252
7253
7254
7255
7256
7257
7258
7259
7260
7261
7262
7263
7264
7265
7266
7267
7268
7269
7270
7271
7272
7273
7274
7275
7276
7277
7278
7279
7280
7281
7282
7283
7284
7285
7286
7287
7288
7289
7290
7291
7292
7293
7294
7295
7296
7297
7298
7299
7300
7301
7302
7303
7304
7305
7306
7307
7308
7309
7310
7311
7312
7313
7314
7315
7316
7317
7318
7319
7320
7321
7322
7323
7324
7325
7326
7327
7328
7329
7330
7331
7332
7333
7334
7335
7336
7337
7338
7339
7340
7341
7342
7343
7344
7345
7346
7347
7348
7349
7350
7351
7352
7353
7354
7355
7356
7357
7358
7359
7360
7361
7362
7363
7364
7365
7366
7367
7368
7369
7370
7371
7372
7373
7374
7375
7376
7377
7378
7379
7380
7381
7382
7383
7384
7385
7386
7387
7388
7389
7390
7391
7392
7393
7394
7395
7396
7397
7398
7399
7400
7401
7402
7403
7404
7405
7406
7407
7408
7409
7410
7411
7412
7413
7414
7415
7416
7417
7418
7419
7420
7421
7422
7423
7424
7425
7426
7427
7428
7429
7430
7431
7432
7433
7434
7435
7436
7437
7438
7439
7440
7441
7442
7443
7444
7445
7446
7447
7448
7449
7450
7451
7452
7453
7454
7455
7456
7457
7458
7459
7460
7461
7462
7463
7464
7465
7466
7467
7468
7469
7470
7471
7472
7473
7474
7475
7476
7477
7478
7479
7480
7481
7482
7483
7484
7485
7486
7487
7488
7489
7490
7491
7492
7493
7494
7495
7496
7497
7498
7499
7500
7501
7502
7503
7504
7505
7506
7507
7508
7509
7510
7511
7512
7513
7514
7515
7516
7517
7518
7519
7520
7521
7522
7523
7524
7525
7526
7527
7528
7529
7530
7531
7532
7533
7534
7535
7536
7537
7538
7539
7540
7541
7542
7543
7544
7545
7546
7547
7548
7549
7550
7551
7552
7553
7554
7555
7556
7557
7558
7559
7560
7561
7562
7563
7564
7565
7566
7567
7568
7569
7570
7571
7572
7573
7574
7575
7576
7577
7578
7579
7580
7581
7582
7583
7584
7585
7586
7587
7588
7589
7590
7591
7592
7593
7594
7595
7596
7597
7598
7599
7600
7601
7602
7603
7604
7605
7606
7607
7608
7609
7610
7611
7612
7613
7614
7615
7616
7617
7618
7619
7620
7621
7622
7623
7624
7625
7626
7627
7628
7629
7630
7631
7632
7633
7634
7635
7636
7637
7638
7639
7640
7641
7642
7643
7644
7645
7646
7647
7648
7649
7650
7651
7652
7653
7654
7655
7656
7657
7658
7659
7660
7661
7662
7663
7664
7665
7666
7667
7668
7669
7670
7671
7672
7673
7674
7675
7676
7677
7678
7679
7680
7681
7682
7683
7684
7685
7686
7687
7688
7689
7690
7691
7692
7693
7694
7695
7696
7697
7698
7699
7700
7701
7702
7703
7704
7705
7706
7707
7708
7709
7710
7711
7712
7713
7714
7715
7716
7717
7718
7719
7720
7721
7722
7723
7724
7725
7726
7727
7728
7729
7730
7731
7732
7733
7734
7735
7736
7737
7738
7739
7740
7741
7742
7743
7744
7745
7746
7747
7748
7749
7750
7751
7752
7753
7754
7755
7756
7757
7758
7759
7760
7761
7762
7763
7764
7765
7766
7767
7768
7769
7770
7771
7772
7773
7774
7775
7776
7777
7778
7779
7780
7781
7782
7783
7784
7785
7786
7787
7788
7789
7790
7791
7792
7793
7794
7795
7796
7797
7798
7799
7800
7801
7802
7803
7804
7805
7806
7807
7808
7809
7810
7811
7812
7813
7814
7815
7816
7817
7818
7819
7820
7821
7822
7823
7824
7825
7826
7827
7828
7829
7830
7831
7832
7833
7834
7835
7836
7837
7838
7839
7840
7841
7842
7843
7844
7845
7846
7847
7848
7849
7850
7851
7852
7853
7854
7855
7856
7857
7858
7859
7860
7861
7862
7863
7864
7865
7866
7867
7868
7869
7870
7871
7872
7873
7874
7875
7876
7877
7878
7879
7880
7881
7882
7883
7884
7885
7886
7887
7888
7889
7890
7891
7892
7893
7894
7895
7896
7897
7898
7899
7900
7901
7902
7903
7904
7905
7906
7907
7908
7909
7910
7911
7912
7913
7914
7915
7916
7917
7918
7919
7920
7921
7922
7923
7924
7925
7926
7927
7928
7929
7930
7931
7932
7933
7934
7935
7936
7937
7938
7939
7940
7941
7942
7943
7944
7945
7946
7947
7948
7949
7950
7951
7952
7953
7954
7955
7956
7957
7958
7959
7960
7961
7962
7963
7964
7965
7966
7967
7968
7969
7970
7971
7972
7973
7974
7975
7976
7977
7978
7979
7980
7981
7982
7983
7984
7985
7986
7987
7988
7989
7990
7991
7992
7993
7994
7995
7996
7997
7998
7999
8000
8001
8002
8003
8004
8005
8006
8007
8008
8009
8010
8011
8012
8013
8014
8015
8016
8017
8018
8019
8020
8021
8022
8023
8024
8025
8026
8027
8028
8029
8030
8031
8032
8033
8034
8035
8036
8037
8038
8039
8040
8041
8042
8043
8044
8045
8046
8047
8048
8049
8050
8051
8052
8053
8054
8055
8056
8057
8058
8059
8060
8061
8062
8063
8064
8065
8066
8067
8068
8069
8070
8071
8072
8073
8074
8075
8076
8077
8078
8079
8080
8081
8082
8083
8084
8085
8086
8087
8088
8089
8090
8091
8092
8093
8094
8095
8096
8097
8098
8099
8100
8101
8102
8103
8104
8105
8106
8107
8108
8109
8110
8111
8112
8113
8114
8115
8116
8117
8118
8119
8120
8121
8122
8123
8124
8125
8126
8127
8128
8129
8130
8131
8132
8133
8134
8135
8136
8137
8138
8139
8140
8141
8142
8143
8144
8145
8146
8147
8148
8149
8150
8151
8152
8153
8154
8155
8156
8157
8158
8159
8160
8161
8162
8163
8164
8165
8166
8167
8168
8169
8170
8171
8172
8173
8174
8175
8176
8177
8178
8179
8180
8181
8182
8183
8184
8185
8186
8187
8188
8189
8190
8191
8192
8193
8194
8195
8196
8197
8198
8199
8200
8201
8202
8203
8204
8205
8206
8207
8208
8209
8210
8211
8212
8213
8214
8215
8216
8217
8218
8219
8220
8221
8222
8223
8224
8225
8226
8227
8228
8229
8230
8231
8232
8233
8234
8235
8236
8237
8238
8239
8240
8241
8242
8243
8244
8245
8246
8247
8248
8249
8250
8251
8252
8253
8254
8255
8256
8257
8258
8259
8260
8261
8262
8263
8264
8265
8266
8267
8268
8269
8270
8271
8272
8273
8274
8275
8276
8277
8278
8279
8280
8281
8282
8283
8284
8285
8286
8287
8288
8289
8290
8291
8292
8293
8294
8295
8296
8297
8298
8299
8300
8301
8302
8303
8304
8305
8306
8307
8308
8309
8310
8311
8312
8313
8314
8315
8316
8317
8318
8319
8320
8321
8322
8323
8324
8325
8326
8327
8328
8329
8330
8331
8332
8333
8334
8335
8336
8337
8338
8339
8340
8341
8342
8343
8344
8345
8346
8347
8348
8349
8350
8351
8352
8353
8354
8355
8356
8357
8358
8359
8360
8361
8362
8363
8364
8365
8366
8367
8368
8369
8370
8371
8372
8373
8374
8375
8376
8377
8378
8379
8380
8381
8382
8383
8384
8385
8386
8387
8388
8389
8390
8391
8392
8393
8394
8395
8396
8397
8398
8399
8400
8401
8402
8403
8404
8405
8406
8407
8408
8409
8410
8411
8412
8413
8414
8415
8416
8417
8418
8419
8420
8421
8422
8423
8424
8425
8426
8427
8428
8429
8430
8431
8432
8433
8434
8435
8436
8437
8438
8439
8440
8441
8442
8443
8444
8445
8446
8447
8448
8449
8450
8451
8452
8453
8454
8455
8456
8457
8458
8459
8460
8461
8462
8463
8464
8465
8466
8467
8468
8469
8470
8471
8472
8473
8474
8475
8476
8477
8478
8479
8480
8481
8482
8483
8484
8485
8486
8487
8488
8489
8490
8491
8492
8493
8494
8495
8496
8497
8498
8499
8500
8501
8502
8503
8504
8505
8506
8507
8508
8509
8510
8511
8512
8513
8514
8515
8516
8517
8518
8519
8520
8521
8522
8523
8524
8525
8526
8527
8528
8529
8530
8531
8532
8533
8534
8535
8536
8537
8538
8539
8540
8541
8542
8543
8544
8545
8546
8547
8548
8549
8550
8551
8552
8553
8554
8555
8556
8557
8558
8559
8560
8561
8562
8563
8564
8565
8566
8567
8568
8569
8570
8571
8572
8573
8574
8575
8576
8577
8578
8579
8580
8581
8582
8583
8584
8585
8586
8587
8588
8589
8590
8591
8592
8593
8594
8595
8596
8597
8598
8599
8600
8601
8602
8603
8604
8605
8606
8607
8608
8609
8610
8611
8612
8613
8614
8615
8616
8617
8618
8619
8620
8621
8622
8623
8624
8625
8626
8627
8628
8629
8630
8631
8632
8633
8634
8635
8636
8637
8638
8639
8640
8641
8642
8643
8644
8645
8646
8647
8648
8649
8650
8651
8652
8653
8654
8655
8656
8657
8658
8659
8660
8661
8662
8663
8664
8665
8666
8667
8668
8669
8670
8671
8672
8673
8674
8675
8676
8677
8678
8679
8680
8681
8682
8683
8684
8685
8686
8687
8688
8689
8690
8691
8692
8693
8694
8695
8696
8697
8698
8699
8700
8701
8702
8703
8704
8705
8706
8707
8708
8709
8710
8711
8712
8713
8714
8715
8716
8717
8718
8719
8720
8721
8722
8723
8724
8725
8726
8727
8728
8729
8730
8731
8732
8733
8734
8735
8736
8737
8738
8739
8740
8741
8742
8743
8744
8745
8746
8747
8748
8749
8750
8751
8752
8753
8754
8755
8756
8757
8758
8759
8760
8761
8762
8763
8764
8765
8766
8767
8768
8769
8770
8771
8772
8773
8774
8775
8776
8777
8778
8779
8780
8781
8782
8783
8784
8785
8786
8787
8788
8789
8790
8791
8792
8793
8794
8795
8796
8797
8798
8799
8800
8801
8802
8803
8804
8805
8806
8807
8808
8809
8810
8811
8812
8813
8814
8815
8816
8817
8818
8819
8820
8821
8822
8823
8824
8825
8826
8827
8828
8829
8830
8831
8832
8833
8834
8835
8836
8837
8838
8839
8840
8841
8842
8843
8844
8845
8846
8847
8848
8849
8850
8851
8852
8853
8854
8855
8856
8857
8858
8859
8860
8861
8862
8863
8864
8865
8866
8867
8868
8869
8870
8871
8872
8873
8874
8875
8876
8877
8878
8879
8880
8881
8882
8883
8884
8885
8886
8887
8888
8889
8890
8891
8892
8893
8894
8895
8896
8897
8898
8899
8900
8901
8902
8903
8904
8905
8906
8907
8908
8909
8910
8911
8912
8913
8914
8915
8916
8917
8918
8919
8920
8921
8922
8923
8924
8925
8926
8927
8928
8929
8930
8931
8932
8933
8934
8935
8936
8937
8938
8939
8940
8941
8942
8943
8944
8945
8946
8947
8948
8949
8950
8951
8952
8953
8954
8955
8956
8957
8958
8959
8960
8961
8962
8963
8964
8965
8966
8967
8968
8969
8970
8971
8972
8973
8974
8975
8976
8977
8978
8979
8980
8981
8982
8983
8984
8985
8986
8987
8988
8989
8990
8991
8992
8993
8994
8995
8996
8997
8998
8999
9000
9001
9002
9003
9004
9005
9006
9007
9008
9009
9010
9011
9012
9013
9014
9015
9016
9017
9018
9019
9020
9021
9022
9023
9024
9025
9026
9027
9028
9029
9030
9031
9032
9033
9034
9035
9036
9037
9038
9039
9040
9041
9042
9043
9044
9045
9046
9047
9048
9049
9050
9051
9052
9053
9054
9055
9056
9057
9058
9059
9060
9061
9062
9063
9064
9065
9066
9067
9068
9069
9070
9071
9072
9073
9074
9075
9076
9077
9078
9079
9080
9081
9082
9083
9084
9085
9086
9087
9088
9089
9090
9091
9092
9093
9094
9095
9096
9097
9098
9099
9100
9101
9102
9103
9104
9105
9106
9107
9108
9109
9110
9111
9112
9113
9114
9115
9116
9117
9118
9119
9120
9121
9122
9123
9124
9125
9126
9127
9128
9129
9130
9131
9132
9133
9134
9135
9136
9137
9138
9139
9140
9141
9142
9143
9144
9145
9146
9147
9148
9149
9150
9151
9152
9153
9154
9155
9156
9157
9158
9159
9160
9161
9162
9163
9164
9165
9166
9167
9168
9169
9170
9171
9172
9173
9174
9175
9176
9177
9178
9179
9180
9181
9182
9183
9184
9185
9186
9187
9188
9189
9190
9191
9192
9193
9194
9195
9196
9197
9198
9199
9200
9201
9202
9203
9204
9205
9206
9207
9208
9209
9210
9211
9212
9213
9214
9215
9216
9217
9218
9219
9220
9221
9222
9223
9224
9225
9226
9227
9228
9229
9230
9231
9232
9233
9234
9235
9236
9237
9238
9239
9240
9241
9242
9243
9244
9245
9246
9247
9248
9249
9250
9251
9252
9253
9254
9255
9256
9257
9258
9259
9260
9261
9262
9263
9264
9265
9266
9267
9268
9269
9270
9271
9272
9273
9274
9275
9276
9277
9278
9279
9280
9281
9282
9283
9284
9285
9286
9287
9288
9289
9290
9291
9292
9293
9294
9295
9296
9297
9298
9299
9300
9301
9302
9303
9304
9305
9306
9307
9308
9309
9310
9311
9312
9313
9314
9315
9316
9317
9318
9319
9320
9321
9322
9323
9324
9325
9326
9327
9328
9329
9330
9331
9332
9333
9334
9335
9336
9337
9338
9339
9340
9341
9342
9343
9344
9345
9346
9347
9348
9349
9350
9351
9352
9353
9354
9355
9356
9357
9358
9359
9360
9361
9362
9363
9364
9365
9366
9367
9368
9369
9370
9371
9372
9373
9374
9375
9376
9377
9378
9379
9380
9381
9382
9383
9384
9385
9386
9387
9388
9389
9390
9391
9392
9393
9394
9395
9396
9397
9398
9399
9400
9401
9402
9403
9404
9405
9406
9407
9408
9409
9410
9411
9412
9413
9414
9415
9416
9417
9418
9419
9420
9421
9422
9423
9424
9425
9426
9427
9428
9429
9430
9431
9432
9433
9434
9435
9436
9437
9438
9439
9440
9441
9442
9443
9444
9445
9446
9447
9448
9449
9450
9451
9452
9453
9454
9455
9456
9457
9458
9459
9460
9461
9462
9463
9464
9465
9466
9467
9468
9469
9470
9471
9472
9473
9474
9475
9476
9477
9478
9479
9480
9481
9482
9483
9484
9485
9486
9487
9488
9489
9490
9491
9492
9493
9494
9495
9496
9497
9498
9499
9500
9501
9502
9503
9504
9505
9506
9507
9508
9509
9510
9511
9512
9513
9514
9515
9516
9517
9518
9519
9520
9521
9522
9523
9524
9525
9526
9527
9528
9529
9530
9531
9532
9533
9534
9535
9536
9537
9538
9539
9540
9541
9542
9543
9544
9545
9546
9547
9548
9549
9550
9551
9552
9553
9554
9555
9556
9557
9558
9559
9560
9561
9562
9563
9564
9565
9566
9567
9568
9569
9570
9571
9572
9573
9574
9575
9576
9577
9578
9579
9580
9581
9582
9583
9584
9585
9586
9587
9588
9589
9590
9591
9592
9593
9594
9595
9596
9597
9598
9599
9600
9601
9602
9603
9604
9605
9606
9607
9608
9609
9610
9611
9612
9613
9614
9615
9616
9617
9618
9619
9620
9621
9622
9623
9624
9625
9626
9627
9628
9629
9630
9631
9632
9633
9634
9635
9636
9637
9638
9639
9640
9641
9642
9643
9644
9645
9646
9647
9648
9649
9650
9651
9652
9653
9654
9655
9656
9657
9658
9659
9660
9661
9662
9663
9664
9665
9666
9667
9668
9669
9670
9671
9672
9673
9674
9675
9676
9677
9678
9679
9680
9681
9682
9683
9684
9685
9686
9687
9688
9689
9690
9691
9692
9693
9694
9695
9696
9697
9698
9699
9700
9701
9702
9703
9704
9705
9706
9707
9708
9709
9710
9711
9712
9713
9714
9715
9716
9717
9718
9719
9720
9721
9722
9723
9724
9725
9726
9727
9728
9729
9730
9731
9732
9733
9734
9735
9736
9737
9738
9739
9740
9741
9742
9743
9744
9745
9746
9747
9748
9749
9750
9751
9752
9753
9754
9755
9756
9757
9758
9759
9760
9761
9762
9763
9764
9765
9766
9767
9768
9769
9770
9771
9772
9773
9774
9775
9776
9777
9778
9779
9780
9781
9782
9783
9784
9785
9786
9787
9788
9789
9790
9791
9792
9793
9794
9795
9796
9797
9798
9799
9800
9801
9802
9803
9804
9805
9806
9807
9808
9809
9810
9811
9812
9813
9814
9815
9816
9817
9818
9819
9820
9821
9822
9823
9824
9825
9826
9827
9828
9829
9830
9831
9832
9833
9834
9835
9836
9837
9838
9839
9840
9841
9842
9843
9844
9845
9846
9847
9848
9849
9850
9851
9852
9853
9854
9855
9856
9857
9858
9859
9860
9861
9862
9863
9864
9865
9866
9867
9868
9869
9870
9871
9872
9873
9874
9875
9876
9877
9878
9879
9880
9881
9882
9883
9884
9885
9886
9887
9888
9889
9890
9891
9892
9893
9894
9895
9896
9897
9898
9899
9900
9901
9902
9903
9904
9905
9906
9907
9908
9909
9910
9911
9912
9913
9914
9915
9916
9917
9918
9919
9920
9921
9922
9923
9924
9925
9926
9927
9928
9929
9930
9931
9932
9933
9934
9935
9936
9937
9938
9939
9940
9941
9942
9943
9944
9945
9946
9947
9948
9949
9950
9951
9952
9953
9954
9955
9956
9957
9958
9959
9960
9961
9962
9963
9964
9965
9966
9967
9968
9969
9970
9971
9972
9973
9974
9975
9976
9977
9978
9979
9980
9981
9982
9983
9984
9985
9986
9987
9988
9989
9990
9991
9992
9993
9994
9995
9996
9997
9998
9999
10000
10001
10002
10003
10004
10005
10006
10007
10008
10009
10010
10011
10012
10013
10014
10015
10016
10017
10018
10019
10020
10021
10022
10023
10024
10025
10026
10027
10028
10029
10030
10031
10032
10033
10034
10035
10036
10037
10038
10039
10040
10041
10042
10043
10044
10045
10046
10047
10048
10049
10050
10051
10052
10053
10054
10055
10056
10057
10058
10059
10060
10061
10062
10063
10064
10065
10066
10067
10068
10069
10070
10071
10072
10073
10074
10075
10076
10077
10078
10079
10080
10081
10082
10083
10084
10085
10086
10087
10088
10089
10090
10091
10092
10093
10094
10095
10096
10097
10098
10099
10100
10101
10102
10103
10104
10105
10106
10107
10108
10109
10110
10111
10112
10113
10114
10115
10116
10117
10118
10119
10120
10121
10122
10123
10124
10125
10126
10127
10128
10129
10130
10131
10132
10133
10134
10135
10136
10137
10138
10139
10140
10141
10142
10143
10144
10145
10146
10147
10148
10149
10150
10151
10152
10153
10154
10155
10156
10157
10158
10159
10160
10161
10162
10163
10164
10165
10166
10167
10168
10169
10170
10171
10172
10173
10174
10175
10176
10177
10178
10179
10180
10181
10182
10183
10184
10185
10186
10187
10188
10189
10190
10191
10192
10193
10194
10195
10196
10197
10198
10199
10200
10201
10202
10203
10204
10205
10206
10207
10208
10209
10210
10211
10212
10213
10214
10215
10216
10217
10218
10219
10220
10221
10222
10223
10224
10225
10226
10227
10228
10229
10230
10231
10232
10233
10234
10235
10236
10237
10238
10239
10240
10241
10242
10243
10244
10245
10246
10247
10248
10249
10250
10251
10252
10253
10254
10255
10256
10257
10258
10259
10260
10261
10262
10263
10264
10265
10266
10267
10268
10269
10270
10271
10272
10273
10274
10275
10276
10277
10278
10279
10280
10281
10282
10283
10284
10285
10286
10287
10288
10289
10290
10291
10292
10293
10294
10295
10296
10297
10298
10299
10300
10301
10302
10303
10304
10305
10306
10307
10308
10309
10310
10311
10312
10313
10314
10315
10316
10317
10318
10319
10320
10321
10322
10323
10324
10325
10326
10327
10328
10329
10330
10331
10332
10333
10334
10335
10336
10337
10338
10339
10340
10341
10342
10343
10344
10345
10346
10347
10348
10349
10350
10351
10352
10353
10354
10355
10356
10357
10358
10359
10360
10361
10362
10363
10364
10365
10366
10367
10368
10369
10370
10371
10372
10373
10374
10375
10376
10377
10378
10379
10380
10381
10382
10383
10384
10385
10386
10387
10388
10389
10390
10391
10392
10393
10394
10395
10396
10397
10398
10399
10400
10401
10402
10403
10404
10405
10406
10407
10408
10409
10410
10411
10412
10413
10414
10415
10416
10417
10418
10419
10420
10421
10422
10423
10424
10425
10426
10427
10428
10429
10430
10431
10432
10433
10434
10435
10436
10437
10438
10439
10440
10441
10442
10443
10444
10445
10446
10447
10448
10449
10450
10451
10452
10453
10454
10455
10456
10457
10458
10459
10460
10461
10462
10463
10464
10465
10466
10467
10468
10469
10470
10471
10472
10473
10474
10475
10476
10477
10478
10479
10480
10481
10482
10483
10484
10485
10486
10487
10488
10489
10490
10491
10492
10493
10494
10495
10496
10497
10498
10499
10500
10501
10502
10503
10504
10505
10506
10507
10508
10509
10510
10511
10512
10513
10514
10515
10516
10517
10518
10519
10520
10521
10522
10523
10524
10525
10526
10527
10528
10529
10530
10531
10532
10533
10534
10535
10536
10537
10538
10539
10540
10541
10542
10543
10544
10545
10546
10547
10548
10549
10550
10551
10552
10553
10554
10555
10556
10557
10558
10559
10560
10561
10562
10563
10564
10565
10566
10567
10568
10569
10570
10571
10572
10573
10574
10575
10576
10577
10578
10579
10580
10581
10582
10583
10584
10585
10586
10587
10588
10589
10590
10591
10592
10593
10594
10595
10596
10597
10598
10599
10600
10601
10602
10603
10604
10605
10606
10607
10608
10609
10610
10611
10612
10613
10614
10615
10616
10617
10618
10619
10620
10621
10622
10623
10624
10625
10626
10627
10628
10629
10630
10631
10632
10633
10634
10635
10636
10637
10638
10639
10640
10641
10642
10643
10644
10645
10646
10647
10648
10649
10650
10651
10652
10653
10654
10655
10656
10657
10658
10659
10660
10661
10662
10663
10664
10665
10666
10667
10668
10669
10670
10671
10672
10673
10674
10675
10676
10677
10678
10679
10680
10681
10682
10683
10684
10685
10686
10687
10688
10689
10690
10691
10692
10693
10694
10695
10696
10697
10698
10699
10700
10701
10702
10703
10704
10705
10706
10707
10708
10709
10710
10711
10712
10713
10714
10715
10716
10717
10718
10719
10720
10721
10722
10723
10724
10725
10726
10727
10728
10729
10730
10731
10732
10733
10734
10735
10736
10737
10738
10739
10740
10741
10742
10743
10744
10745
10746
10747
10748
10749
10750
10751
10752
10753
10754
10755
10756
10757
10758
10759
10760
10761
10762
10763
10764
10765
10766
10767
10768
10769
10770
10771
10772
10773
10774
10775
10776
10777
10778
10779
10780
10781
10782
10783
10784
10785
10786
10787
10788
10789
10790
10791
10792
10793
10794
10795
10796
10797
10798
10799
10800
10801
10802
10803
10804
10805
10806
10807
10808
10809
10810
10811
10812
10813
10814
10815
10816
10817
10818
10819
10820
10821
10822
10823
10824
10825
10826
10827
10828
10829
10830
10831
10832
10833
10834
10835
10836
10837
10838
10839
10840
10841
10842
10843
10844
10845
10846
10847
10848
10849
10850
10851
10852
10853
10854
10855
10856
10857
10858
10859
10860
10861
10862
10863
10864
10865
10866
10867
10868
10869
10870
10871
10872
10873
10874
10875
10876
10877
10878
10879
10880
10881
10882
10883
10884
10885
10886
10887
10888
10889
10890
10891
10892
10893
10894
10895
10896
10897
10898
10899
10900
10901
10902
10903
10904
10905
10906
10907
10908
10909
10910
10911
10912
10913
10914
10915
10916
10917
10918
10919
10920
10921
10922
10923
10924
10925
10926
10927
10928
10929
10930
10931
10932
10933
10934
10935
10936
10937
10938
10939
10940
10941
10942
10943
10944
10945
10946
10947
10948
10949
10950
10951
10952
10953
10954
10955
10956
10957
10958
10959
10960
10961
10962
10963
10964
10965
10966
10967
10968
10969
10970
10971
10972
10973
10974
10975
10976
10977
10978
10979
10980
10981
10982
10983
10984
10985
10986
10987
10988
10989
10990
10991
10992
10993
10994
10995
10996
10997
10998
10999
11000
11001
11002
11003
11004
11005
11006
11007
11008
11009
11010
11011
11012
11013
11014
11015
11016
11017
11018
11019
11020
11021
11022
11023
11024
11025
11026
11027
11028
11029
11030
11031
11032
11033
11034
11035
11036
11037
11038
11039
11040
11041
11042
11043
11044
11045
11046
11047
11048
11049
11050
11051
11052
11053
11054
11055
11056
11057
11058
11059
11060
11061
11062
11063
11064
11065
11066
11067
11068
11069
11070
11071
11072
11073
11074
11075
11076
11077
11078
11079
11080
11081
11082
11083
11084
11085
11086
11087
11088
11089
11090
11091
11092
11093
11094
11095
11096
11097
11098
11099
11100
11101
11102
11103
11104
11105
11106
11107
11108
11109
11110
11111
11112
11113
11114
11115
11116
11117
11118
11119
11120
11121
11122
11123
11124
11125
11126
11127
11128
11129
11130
11131
11132
11133
11134
11135
11136
11137
11138
11139
11140
11141
11142
11143
11144
11145
11146
11147
11148
11149
11150
11151
11152
11153
11154
11155
11156
11157
11158
11159
11160
11161
11162
11163
11164
11165
11166
11167
11168
11169
11170
11171
11172
11173
11174
11175
11176
11177
11178
11179
11180
11181
11182
11183
11184
11185
11186
11187
11188
11189
11190
11191
11192
11193
11194
11195
11196
11197
11198
11199
11200
11201
11202
11203
11204
11205
11206
11207
11208
11209
11210
11211
11212
11213
11214
11215
11216
11217
11218
11219
11220
11221
11222
11223
11224
11225
11226
11227
11228
11229
11230
11231
11232
11233
11234
11235
11236
11237
11238
11239
11240
11241
11242
11243
11244
11245
11246
11247
11248
11249
11250
11251
11252
11253
11254
11255
11256
11257
11258
11259
11260
11261
11262
11263
11264
11265
11266
11267
11268
11269
11270
11271
11272
11273
11274
11275
11276
11277
11278
11279
11280
11281
11282
11283
11284
11285
11286
11287
11288
11289
11290
11291
11292
11293
11294
11295
11296
11297
11298
11299
11300
11301
11302
11303
11304
11305
11306
11307
11308
11309
11310
11311
11312
11313
11314
11315
11316
11317
11318
11319
11320
11321
11322
11323
11324
11325
11326
11327
11328
11329
11330
11331
11332
11333
11334
11335
11336
11337
11338
11339
11340
11341
11342
11343
11344
11345
11346
11347
11348
11349
11350
11351
11352
11353
11354
11355
11356
11357
11358
11359
11360
11361
11362
11363
11364
11365
11366
11367
11368
11369
11370
11371
11372
11373
11374
11375
11376
11377
11378
11379
11380
11381
11382
11383
11384
11385
11386
11387
11388
11389
11390
11391
11392
11393
11394
11395
11396
11397
11398
11399
11400
11401
11402
11403
11404
11405
11406
11407
11408
11409
11410
11411
11412
11413
11414
11415
11416
11417
11418
11419
11420
11421
11422
11423
11424
11425
11426
11427
11428
11429
11430
11431
11432
11433
11434
11435
11436
11437
11438
11439
11440
11441
11442
11443
11444
11445
11446
11447
11448
11449
11450
11451
11452
11453
11454
11455
11456
11457
11458
11459
11460
11461
11462
11463
11464
11465
11466
11467
11468
11469
11470
11471
11472
11473
11474
11475
11476
11477
11478
11479
11480
11481
11482
11483
11484
11485
11486
11487
11488
11489
11490
11491
11492
11493
11494
11495
11496
11497
11498
11499
11500
11501
11502
11503
11504
11505
11506
11507
11508
11509
11510
11511
11512
11513
11514
11515
11516
11517
11518
11519
11520
11521
11522
11523
11524
11525
11526
11527
11528
11529
11530
11531
11532
11533
11534
11535
11536
11537
11538
11539
11540
11541
11542
11543
11544
11545
11546
11547
11548
11549
11550
11551
11552
11553
11554
11555
11556
11557
11558
11559
11560
11561
11562
11563
11564
11565
11566
11567
11568
11569
11570
11571
11572
11573
11574
11575
11576
11577
11578
11579
11580
11581
11582
11583
11584
11585
11586
11587
11588
11589
11590
11591
11592
11593
11594
11595
11596
11597
11598
11599
11600
11601
11602
11603
11604
11605
11606
11607
11608
11609
11610
11611
11612
11613
11614
11615
11616
11617
11618
11619
11620
11621
11622
11623
11624
11625
11626
11627
11628
11629
11630
11631
11632
11633
11634
11635
11636
11637
11638
11639
11640
11641
11642
11643
11644
11645
11646
11647
11648
11649
11650
11651
11652
11653
11654
11655
11656
11657
11658
11659
11660
11661
11662
11663
11664
11665
11666
11667
11668
11669
11670
11671
11672
11673
11674
11675
11676
11677
11678
11679
11680
11681
11682
11683
11684
11685
11686
11687
11688
11689
11690
11691
11692
11693
11694
11695
11696
11697
11698
11699
11700
11701
11702
11703
11704
11705
11706
11707
11708
11709
11710
11711
11712
11713
11714
11715
11716
11717
11718
11719
11720
11721
11722
11723
11724
11725
11726
11727
11728
11729
11730
11731
11732
11733
11734
11735
11736
11737
11738
11739
11740
11741
11742
11743
11744
11745
11746
11747
11748
11749
11750
11751
11752
11753
11754
11755
11756
11757
11758
11759
11760
11761
11762
11763
11764
11765
11766
11767
11768
11769
11770
11771
11772
11773
11774
11775
11776
11777
11778
11779
11780
11781
11782
11783
11784
11785
11786
11787
11788
11789
11790
11791
11792
11793
11794
11795
11796
11797
11798
11799
11800
11801
11802
11803
11804
11805
11806
11807
11808
11809
11810
11811
11812
11813
11814
11815
11816
11817
11818
11819
11820
11821
11822
11823
11824
11825
11826
11827
11828
11829
11830
11831
11832
11833
11834
11835
11836
11837
11838
11839
11840
11841
11842
11843
11844
11845
11846
11847
11848
11849
11850
11851
11852
11853
11854
11855
11856
11857
11858
11859
11860
11861
11862
11863
11864
11865
11866
11867
11868
11869
11870
11871
11872
11873
11874
11875
11876
11877
11878
11879
11880
11881
11882
11883
11884
11885
11886
11887
11888
11889
11890
11891
11892
11893
11894
11895
11896
11897
11898
11899
11900
11901
11902
11903
11904
11905
11906
11907
11908
11909
11910
11911
11912
11913
11914
11915
11916
11917
11918
11919
11920
11921
11922
11923
11924
11925
11926
11927
11928
11929
11930
11931
11932
11933
11934
11935
11936
11937
11938
11939
11940
11941
11942
11943
11944
11945
11946
11947
11948
11949
11950
11951
11952
11953
11954
11955
11956
11957
11958
11959
11960
11961
11962
11963
11964
11965
11966
11967
11968
11969
11970
11971
11972
11973
11974
11975
11976
11977
11978
11979
11980
11981
11982
11983
11984
11985
11986
11987
11988
11989
11990
11991
11992
11993
11994
11995
11996
11997
11998
11999
12000
12001
12002
12003
12004
12005
12006
12007
12008
12009
12010
12011
12012
12013
12014
12015
12016
12017
12018
12019
12020
12021
12022
12023
12024
12025
12026
12027
12028
12029
12030
12031
12032
12033
12034
12035
12036
12037
12038
12039
12040
12041
12042
12043
12044
12045
12046
12047
12048
12049
12050
12051
12052
12053
12054
12055
12056
12057
12058
12059
12060
12061
12062
12063
12064
12065
12066
12067
12068
12069
12070
12071
12072
12073
12074
12075
12076
12077
12078
12079
12080
12081
12082
12083
12084
12085
12086
12087
12088
12089
12090
12091
12092
12093
12094
12095
12096
12097
12098
12099
12100
12101
12102
12103
12104
12105
12106
12107
12108
12109
12110
12111
12112
12113
12114
12115
12116
12117
12118
12119
12120
12121
12122
12123
12124
12125
12126
12127
12128
12129
12130
12131
12132
12133
12134
12135
12136
12137
12138
12139
12140
12141
12142
12143
12144
12145
12146
12147
12148
12149
12150
12151
12152
12153
12154
12155
12156
12157
12158
12159
12160
12161
12162
12163
12164
12165
12166
12167
12168
12169
12170
12171
12172
12173
12174
12175
12176
12177
12178
12179
12180
12181
12182
12183
12184
12185
12186
12187
12188
12189
12190
12191
12192
12193
12194
12195
12196
12197
12198
12199
12200
12201
12202
12203
12204
12205
12206
12207
12208
12209
12210
12211
12212
12213
12214
12215
12216
12217
12218
12219
12220
12221
12222
12223
12224
12225
12226
12227
12228
12229
12230
12231
12232
12233
12234
12235
12236
12237
12238
12239
12240
12241
12242
12243
12244
12245
12246
12247
12248
12249
12250
12251
12252
12253
12254
12255
12256
12257
12258
12259
12260
12261
12262
12263
12264
12265
12266
12267
12268
12269
12270
12271
12272
12273
12274
12275
12276
12277
12278
12279
12280
12281
12282
12283
12284
12285
12286
12287
12288
12289
12290
12291
12292
12293
12294
12295
12296
12297
12298
12299
12300
12301
12302
12303
12304
12305
12306
12307
12308
12309
12310
12311
12312
12313
12314
12315
12316
12317
12318
12319
12320
12321
12322
12323
12324
12325
12326
12327
12328
12329
12330
12331
12332
12333
12334
12335
12336
12337
12338
12339
12340
12341
12342
12343
12344
12345
12346
12347
12348
12349
12350
12351
12352
12353
12354
12355
12356
12357
12358
12359
12360
12361
12362
12363
12364
12365
12366
12367
12368
12369
12370
12371
12372
12373
12374
12375
12376
12377
12378
12379
12380
12381
12382
12383
12384
12385
12386
12387
12388
12389
12390
12391
12392
12393
12394
12395
12396
12397
12398
12399
12400
12401
12402
12403
12404
12405
12406
12407
12408
12409
12410
12411
12412
12413
12414
12415
12416
12417
12418
12419
12420
12421
12422
12423
12424
12425
12426
12427
12428
12429
12430
12431
12432
12433
12434
12435
12436
12437
12438
12439
12440
12441
12442
12443
12444
12445
12446
12447
12448
12449
12450
12451
12452
12453
12454
12455
12456
12457
12458
12459
12460
12461
12462
12463
12464
12465
12466
12467
12468
12469
12470
12471
12472
12473
12474
12475
12476
12477
12478
12479
12480
12481
12482
12483
12484
12485
12486
12487
12488
12489
12490
12491
12492
12493
12494
12495
12496
12497
12498
12499
12500
12501
12502
12503
12504
12505
12506
12507
12508
12509
12510
12511
12512
12513
12514
12515
12516
12517
12518
12519
12520
12521
12522
12523
12524
12525
12526
12527
12528
12529
12530
12531
12532
12533
12534
12535
12536
12537
12538
12539
12540
12541
12542
12543
12544
12545
12546
12547
12548
12549
12550
12551
12552
12553
12554
12555
12556
12557
12558
12559
12560
12561
12562
12563
12564
12565
12566
12567
12568
12569
12570
12571
12572
12573
12574
12575
12576
12577
12578
12579
12580
12581
12582
12583
12584
12585
12586
12587
12588
12589
12590
12591
12592
12593
12594
12595
12596
12597
12598
12599
12600
12601
12602
12603
12604
12605
12606
12607
12608
12609
12610
12611
12612
12613
12614
12615
12616
12617
12618
12619
12620
12621
12622
12623
12624
12625
12626
12627
12628
12629
12630
12631
12632
12633
12634
12635
12636
12637
12638
12639
12640
12641
12642
12643
12644
12645
12646
12647
12648
12649
12650
12651
12652
12653
12654
12655
12656
12657
12658
12659
12660
12661
12662
12663
12664
12665
12666
12667
12668
12669
12670
12671
12672
12673
12674
12675
12676
12677
12678
12679
12680
12681
12682
12683
12684
12685
12686
12687
12688
12689
12690
12691
12692
12693
12694
12695
12696
12697
12698
12699
12700
12701
12702
12703
12704
12705
12706
12707
12708
12709
12710
12711
12712
12713
12714
12715
12716
12717
12718
12719
12720
12721
12722
12723
12724
12725
12726
12727
12728
12729
12730
12731
12732
12733
12734
12735
12736
12737
12738
12739
12740
12741
12742
12743
12744
12745
12746
12747
12748
12749
12750
12751
12752
12753
12754
12755
12756
12757
12758
12759
12760
12761
12762
12763
12764
12765
12766
12767
12768
12769
12770
12771
12772
12773
12774
12775
12776
12777
12778
12779
12780
12781
12782
12783
12784
12785
12786
12787
12788
12789
12790
12791
12792
12793
12794
12795
12796
12797
12798
12799
12800
12801
12802
12803
12804
12805
12806
12807
12808
12809
12810
12811
12812
12813
12814
12815
12816
12817
12818
12819
12820
12821
12822
12823
12824
12825
12826
12827
12828
12829
12830
12831
12832
12833
12834
12835
12836
12837
12838
12839
12840
12841
12842
12843
12844
12845
12846
12847
12848
12849
12850
12851
12852
12853
12854
12855
12856
12857
12858
12859
12860
12861
12862
12863
12864
12865
12866
12867
12868
12869
12870
12871
12872
12873
12874
12875
12876
12877
12878
12879
12880
12881
12882
12883
12884
12885
12886
12887
12888
12889
12890
12891
12892
12893
12894
12895
12896
12897
12898
12899
12900
12901
12902
12903
12904
12905
12906
12907
12908
12909
12910
12911
12912
12913
12914
12915
12916
12917
12918
12919
12920
12921
12922
12923
12924
12925
12926
12927
12928
12929
12930
12931
12932
12933
12934
12935
12936
12937
12938
12939
12940
12941
12942
12943
12944
12945
12946
12947
12948
12949
12950
12951
12952
12953
12954
12955
12956
12957
12958
12959
12960
12961
12962
12963
12964
12965
12966
12967
12968
12969
12970
12971
12972
12973
12974
12975
12976
12977
12978
12979
12980
12981
12982
12983
12984
12985
12986
12987
12988
12989
12990
12991
12992
12993
12994
12995
12996
12997
12998
12999
13000
13001
13002
13003
13004
13005
13006
13007
13008
13009
13010
13011
13012
13013
13014
13015
13016
13017
13018
13019
13020
13021
13022
13023
13024
13025
13026
13027
13028
13029
13030
13031
13032
13033
13034
13035
13036
13037
13038
13039
13040
13041
13042
13043
13044
13045
13046
13047
13048
13049
13050
13051
13052
13053
13054
13055
13056
13057
13058
13059
13060
13061
13062
13063
13064
13065
13066
13067
13068
13069
13070
13071
13072
13073
13074
13075
13076
13077
13078
13079
13080
13081
13082
13083
13084
13085
13086
13087
13088
13089
13090
13091
13092
13093
13094
13095
13096
13097
13098
13099
13100
13101
13102
13103
13104
13105
13106
13107
13108
13109
13110
13111
13112
13113
13114
13115
13116
13117
13118
13119
13120
13121
13122
13123
13124
13125
13126
13127
13128
13129
13130
13131
13132
13133
13134
13135
13136
13137
13138
13139
13140
13141
13142
13143
13144
13145
13146
13147
13148
13149
13150
13151
13152
13153
13154
13155
13156
13157
13158
13159
13160
13161
13162
13163
13164
13165
13166
13167
13168
13169
13170
13171
13172
13173
13174
13175
13176
13177
13178
13179
13180
13181
13182
13183
13184
13185
13186
13187
13188
13189
13190
13191
13192
13193
13194
13195
13196
13197
13198
13199
13200
13201
13202
13203
13204
13205
13206
13207
13208
13209
13210
13211
13212
13213
13214
13215
13216
13217
13218
13219
13220
13221
13222
13223
13224
13225
13226
13227
13228
13229
13230
13231
13232
13233
13234
13235
13236
13237
13238
13239
13240
13241
13242
13243
13244
13245
13246
13247
13248
13249
13250
13251
13252
13253
13254
13255
13256
13257
13258
13259
13260
13261
13262
13263
13264
13265
13266
13267
13268
13269
13270
13271
13272
13273
13274
13275
13276
13277
13278
13279
13280
13281
13282
13283
13284
13285
13286
13287
13288
13289
13290
13291
13292
13293
13294
13295
13296
13297
13298
13299
13300
13301
13302
13303
13304
13305
13306
13307
13308
13309
13310
13311
13312
13313
13314
13315
13316
13317
13318
13319
13320
13321
13322
13323
13324
13325
13326
13327
13328
13329
13330
13331
13332
13333
13334
13335
13336
13337
13338
13339
13340
13341
13342
13343
13344
13345
13346
13347
13348
13349
13350
13351
13352
13353
13354
13355
13356
13357
13358
13359
13360
13361
13362
13363
13364
13365
13366
13367
13368
13369
13370
13371
13372
13373
13374
13375
13376
13377
13378
13379
13380
13381
13382
13383
13384
13385
13386
13387
13388
13389
13390
13391
13392
13393
13394
13395
13396
13397
13398
13399
13400
13401
13402
13403
13404
13405
13406
13407
13408
13409
13410
13411
13412
13413
13414
13415
13416
13417
13418
13419
13420
13421
13422
13423
13424
13425
13426
13427
13428
13429
13430
13431
13432
13433
13434
13435
13436
13437
13438
13439
13440
13441
13442
13443
13444
13445
13446
13447
13448
13449
13450
13451
13452
13453
13454
13455
13456
13457
13458
13459
13460
13461
13462
13463
13464
13465
13466
13467
13468
13469
13470
13471
13472
13473
13474
13475
13476
13477
13478
13479
13480
13481
13482
13483
13484
13485
13486
13487
13488
13489
13490
13491
13492
13493
13494
13495
13496
13497
13498
13499
13500
13501
13502
13503
13504
13505
13506
13507
13508
13509
13510
13511
13512
13513
13514
13515
13516
13517
13518
13519
13520
13521
13522
13523
13524
13525
13526
13527
13528
13529
13530
13531
13532
13533
13534
13535
13536
13537
13538
13539
13540
13541
13542
13543
13544
13545
13546
13547
13548
13549
13550
13551
13552
13553
13554
13555
13556
13557
13558
13559
13560
13561
13562
13563
13564
13565
13566
13567
13568
13569
13570
13571
13572
13573
13574
13575
13576
13577
13578
13579
13580
13581
13582
13583
13584
13585
13586
13587
13588
13589
13590
13591
13592
13593
13594
13595
13596
13597
13598
13599
13600
13601
13602
13603
13604
13605
13606
13607
13608
13609
13610
13611
13612
13613
13614
13615
13616
13617
13618
13619
13620
13621
13622
13623
13624
13625
13626
13627
13628
13629
13630
13631
13632
13633
13634
13635
13636
13637
13638
13639
13640
13641
13642
13643
13644
13645
13646
13647
13648
13649
13650
13651
13652
13653
13654
13655
13656
13657
13658
13659
13660
13661
13662
13663
13664
13665
13666
13667
13668
13669
13670
13671
13672
13673
13674
13675
13676
13677
13678
13679
13680
13681
13682
13683
13684
13685
13686
13687
13688
13689
13690
13691
13692
13693
13694
13695
13696
13697
13698
13699
13700
13701
13702
13703
13704
13705
13706
13707
13708
13709
13710
13711
13712
13713
13714
13715
13716
13717
13718
13719
13720
13721
13722
13723
13724
13725
13726
13727
13728
13729
13730
13731
13732
13733
13734
13735
13736
13737
13738
13739
13740
13741
13742
13743
13744
13745
13746
13747
13748
13749
13750
13751
13752
13753
13754
13755
13756
13757
13758
13759
13760
13761
13762
13763
13764
13765
13766
13767
13768
13769
13770
13771
13772
13773
13774
13775
13776
13777
13778
13779
13780
13781
13782
13783
13784
13785
13786
13787
13788
13789
13790
13791
13792
13793
13794
13795
13796
13797
13798
13799
13800
13801
13802
13803
13804
13805
13806
13807
13808
13809
13810
13811
13812
13813
13814
13815
13816
13817
13818
13819
13820
13821
13822
13823
13824
13825
13826
13827
13828
13829
13830
13831
13832
13833
13834
13835
13836
13837
13838
13839
13840
13841
13842
13843
13844
13845
13846
13847
13848
13849
13850
13851
13852
13853
13854
13855
13856
13857
13858
13859
13860
13861
13862
13863
13864
13865
13866
13867
13868
13869
13870
13871
13872
13873
13874
13875
13876
13877
13878
13879
13880
13881
13882
13883
13884
13885
13886
13887
13888
13889
13890
13891
13892
13893
13894
13895
13896
13897
13898
13899
13900
13901
13902
13903
13904
13905
13906
13907
13908
13909
13910
13911
13912
13913
13914
13915
13916
13917
13918
13919
13920
13921
13922
13923
13924
13925
13926
13927
13928
13929
13930
13931
13932
13933
13934
13935
13936
13937
13938
13939
13940
13941
13942
13943
13944
13945
13946
13947
13948
13949
13950
13951
13952
13953
13954
13955
13956
13957
13958
13959
13960
13961
13962
13963
13964
13965
13966
13967
13968
13969
13970
13971
13972
13973
13974
13975
13976
13977
13978
13979
13980
13981
13982
13983
13984
13985
13986
13987
13988
13989
13990
13991
13992
13993
13994
13995
13996
13997
13998
13999
14000
14001
14002
14003
14004
14005
14006
14007
14008
14009
14010
14011
14012
14013
14014
14015
14016
14017
14018
14019
14020
14021
14022
14023
14024
14025
14026
14027
14028
14029
14030
14031
14032
14033
14034
14035
14036
14037
14038
14039
14040
14041
14042
14043
14044
14045
14046
14047
14048
14049
14050
14051
14052
14053
14054
14055
14056
14057
14058
14059
14060
14061
14062
14063
14064
14065
14066
14067
14068
14069
14070
14071
14072
14073
14074
14075
14076
14077
14078
14079
14080
14081
14082
14083
14084
14085
14086
14087
14088
14089
14090
14091
14092
14093
14094
14095
14096
14097
14098
14099
14100
14101
14102
14103
14104
14105
14106
14107
14108
14109
14110
14111
14112
14113
14114
14115
14116
14117
14118
14119
14120
14121
14122
14123
14124
14125
14126
14127
14128
14129
14130
14131
14132
14133
14134
14135
14136
14137
14138
14139
14140
14141
14142
14143
14144
14145
14146
14147
14148
14149
14150
14151
14152
14153
14154
14155
14156
14157
14158
14159
14160
14161
14162
14163
14164
14165
14166
14167
14168
14169
14170
14171
14172
14173
14174
14175
14176
14177
14178
14179
14180
14181
14182
14183
14184
14185
14186
14187
14188
14189
14190
14191
14192
14193
14194
14195
14196
14197
14198
14199
14200
14201
14202
14203
14204
14205
14206
14207
14208
14209
14210
14211
14212
14213
14214
14215
14216
14217
14218
14219
14220
14221
14222
14223
14224
14225
14226
14227
14228
14229
14230
14231
14232
14233
14234
14235
14236
14237
14238
14239
14240
14241
14242
14243
14244
14245
14246
14247
14248
14249
14250
14251
14252
14253
14254
14255
14256
14257
14258
14259
14260
14261
14262
14263
14264
14265
14266
14267
14268
14269
14270
14271
14272
14273
14274
14275
14276
14277
14278
14279
14280
14281
14282
14283
14284
14285
14286
14287
14288
14289
14290
14291
14292
14293
14294
14295
14296
14297
14298
14299
14300
14301
14302
14303
14304
14305
14306
14307
14308
14309
14310
14311
14312
14313
14314
14315
14316
14317
14318
14319
14320
14321
14322
14323
14324
14325
14326
14327
14328
14329
14330
14331
14332
14333
14334
14335
14336
14337
14338
14339
14340
14341
14342
14343
14344
14345
14346
14347
14348
14349
14350
14351
14352
14353
14354
14355
14356
14357
14358
14359
14360
14361
14362
14363
14364
14365
14366
14367
14368
14369
14370
14371
14372
14373
14374
14375
14376
14377
14378
14379
14380
14381
14382
14383
14384
14385
14386
14387
14388
14389
14390
14391
14392
14393
14394
14395
14396
14397
14398
14399
14400
14401
14402
14403
14404
14405
14406
14407
14408
14409
14410
14411
14412
14413
14414
14415
14416
14417
14418
14419
14420
14421
14422
14423
14424
14425
14426
14427
14428
14429
14430
14431
14432
14433
14434
14435
14436
14437
14438
14439
14440
14441
14442
14443
14444
14445
14446
14447
14448
14449
14450
14451
14452
14453
14454
14455
14456
14457
14458
14459
14460
14461
14462
14463
14464
14465
14466
14467
14468
14469
14470
14471
14472
14473
14474
14475
14476
14477
14478
14479
14480
14481
14482
14483
14484
14485
14486
14487
14488
14489
14490
14491
14492
14493
14494
14495
14496
14497
14498
14499
14500
14501
14502
14503
14504
14505
14506
14507
14508
14509
14510
14511
14512
14513
14514
14515
14516
14517
14518
14519
14520
14521
14522
14523
14524
14525
14526
14527
14528
14529
14530
14531
14532
14533
14534
14535
14536
14537
14538
14539
14540
14541
14542
14543
14544
14545
14546
14547
14548
14549
14550
14551
14552
14553
14554
14555
14556
14557
14558
14559
14560
14561
14562
14563
14564
14565
14566
14567
14568
14569
14570
14571
14572
14573
14574
14575
14576
14577
14578
14579
14580
14581
14582
14583
14584
14585
14586
14587
14588
14589
14590
14591
14592
14593
14594
14595
14596
14597
14598
14599
14600
14601
14602
14603
14604
14605
14606
14607
14608
14609
14610
14611
14612
14613
14614
14615
14616
14617
14618
14619
14620
14621
14622
14623
14624
14625
14626
14627
14628
14629
14630
14631
14632
14633
14634
14635
14636
14637
14638
14639
14640
14641
14642
14643
14644
14645
14646
14647
14648
14649
14650
14651
14652
14653
14654
14655
14656
14657
14658
14659
14660
14661
14662
14663
14664
14665
14666
14667
14668
14669
14670
14671
14672
14673
14674
14675
14676
14677
14678
14679
14680
14681
14682
14683
14684
14685
14686
14687
14688
14689
14690
14691
14692
14693
14694
14695
14696
14697
14698
14699
14700
14701
14702
14703
14704
14705
14706
14707
14708
14709
14710
14711
14712
14713
14714
14715
14716
14717
14718
14719
14720
14721
14722
14723
14724
14725
14726
14727
14728
14729
14730
14731
14732
14733
14734
14735
14736
14737
14738
14739
14740
14741
14742
14743
14744
14745
14746
14747
14748
14749
14750
14751
14752
14753
14754
14755
14756
14757
14758
14759
14760
14761
14762
14763
14764
14765
14766
14767
14768
14769
14770
14771
14772
14773
14774
14775
14776
14777
14778
14779
14780
14781
14782
14783
14784
14785
14786
14787
14788
14789
14790
14791
14792
14793
14794
14795
14796
14797
14798
14799
14800
14801
14802
14803
14804
14805
14806
14807
14808
14809
14810
14811
14812
14813
14814
14815
14816
14817
14818
14819
14820
14821
14822
14823
14824
14825
14826
14827
14828
14829
14830
14831
14832
14833
14834
14835
14836
14837
14838
14839
14840
14841
14842
14843
14844
14845
14846
14847
14848
14849
14850
14851
14852
14853
14854
14855
14856
14857
14858
14859
14860
14861
14862
14863
14864
14865
14866
14867
14868
14869
14870
14871
14872
14873
14874
14875
14876
14877
14878
14879
14880
14881
14882
14883
14884
14885
14886
14887
14888
14889
14890
14891
14892
14893
14894
14895
14896
14897
14898
14899
14900
14901
14902
14903
14904
14905
14906
14907
14908
14909
14910
14911
14912
14913
14914
14915
14916
14917
14918
14919
14920
14921
14922
14923
14924
14925
14926
14927
14928
14929
14930
14931
14932
14933
14934
14935
14936
14937
14938
14939
14940
14941
14942
14943
14944
14945
14946
14947
14948
14949
14950
14951
14952
14953
14954
14955
14956
14957
14958
14959
14960
14961
14962
14963
14964
14965
14966
14967
14968
14969
14970
14971
14972
14973
14974
14975
14976
14977
14978
14979
14980
14981
14982
14983
14984
14985
14986
14987
14988
14989
14990
14991
14992
14993
14994
14995
14996
14997
14998
14999
15000
15001
15002
15003
15004
15005
15006
15007
15008
15009
15010
15011
15012
15013
15014
15015
15016
15017
15018
15019
15020
15021
15022
15023
15024
15025
15026
15027
15028
15029
15030
15031
15032
15033
15034
15035
15036
15037
15038
15039
15040
15041
15042
15043
15044
15045
15046
15047
15048
15049
15050
15051
15052
15053
15054
15055
15056
15057
15058
15059
15060
15061
15062
15063
15064
15065
15066
15067
15068
15069
15070
15071
15072
15073
15074
15075
15076
15077
15078
15079
15080
15081
15082
15083
15084
15085
15086
15087
15088
15089
15090
15091
15092
15093
15094
15095
15096
15097
15098
15099
15100
15101
15102
15103
15104
15105
15106
15107
15108
15109
15110
15111
15112
15113
15114
15115
15116
15117
15118
15119
15120
15121
15122
15123
15124
15125
15126
15127
15128
15129
15130
15131
15132
15133
15134
15135
15136
15137
15138
15139
15140
15141
15142
15143
15144
15145
15146
15147
15148
15149
15150
15151
15152
15153
15154
15155
15156
15157
15158
15159
15160
15161
15162
15163
15164
15165
15166
15167
15168
15169
15170
15171
15172
15173
15174
15175
15176
15177
15178
15179
15180
15181
15182
15183
15184
15185
15186
15187
15188
15189
15190
15191
15192
15193
15194
15195
15196
15197
15198
15199
15200
15201
15202
15203
15204
15205
15206
15207
15208
15209
15210
15211
15212
15213
15214
15215
15216
15217
15218
15219
15220
15221
15222
15223
15224
15225
15226
15227
15228
15229
15230
15231
15232
15233
15234
15235
15236
15237
15238
15239
15240
15241
15242
15243
15244
15245
15246
15247
15248
15249
15250
15251
15252
15253
15254
15255
15256
15257
15258
15259
15260
15261
15262
15263
15264
15265
15266
15267
15268
15269
15270
15271
15272
15273
15274
15275
15276
15277
15278
15279
15280
15281
15282
15283
15284
15285
15286
15287
15288
15289
15290
15291
15292
15293
15294
15295
15296
15297
15298
15299
15300
15301
15302
15303
15304
15305
15306
15307
15308
15309
15310
15311
15312
15313
15314
15315
15316
15317
15318
15319
15320
15321
15322
15323
15324
15325
15326
15327
15328
15329
15330
15331
15332
15333
15334
15335
15336
15337
15338
15339
15340
15341
15342
15343
15344
15345
15346
15347
15348
15349
15350
15351
15352
15353
15354
15355
15356
15357
15358
15359
15360
15361
15362
15363
15364
15365
15366
15367
15368
15369
15370
15371
15372
15373
15374
15375
15376
15377
15378
15379
15380
15381
15382
15383
15384
15385
15386
15387
15388
15389
15390
15391
15392
15393
15394
15395
15396
15397
15398
15399
15400
15401
15402
15403
15404
15405
15406
15407
15408
15409
15410
15411
15412
15413
15414
15415
15416
15417
15418
15419
15420
15421
15422
15423
15424
15425
15426
15427
15428
15429
15430
15431
15432
15433
15434
15435
15436
15437
15438
15439
15440
15441
15442
15443
15444
15445
15446
15447
15448
15449
15450
15451
15452
15453
15454
15455
15456
15457
15458
15459
15460
15461
15462
15463
15464
15465
15466
15467
15468
15469
15470
15471
15472
15473
15474
15475
15476
15477
15478
15479
15480
15481
15482
15483
15484
15485
15486
15487
15488
15489
15490
15491
15492
15493
15494
15495
15496
15497
15498
15499
15500
15501
15502
15503
15504
15505
15506
15507
15508
15509
15510
15511
15512
15513
15514
15515
15516
15517
15518
15519
15520
15521
15522
15523
15524
15525
15526
15527
15528
15529
15530
15531
15532
15533
15534
15535
15536
15537
15538
15539
15540
15541
15542
15543
15544
15545
15546
15547
15548
15549
15550
15551
15552
15553
15554
15555
15556
15557
15558
15559
15560
15561
15562
15563
15564
15565
15566
15567
15568
15569
15570
15571
15572
15573
15574
15575
15576
15577
15578
15579
15580
15581
15582
15583
15584
15585
15586
15587
15588
15589
15590
15591
15592
15593
15594
15595
15596
15597
15598
15599
15600
15601
15602
15603
15604
15605
15606
15607
15608
15609
15610
15611
15612
15613
15614
15615
15616
15617
15618
15619
15620
15621
15622
15623
15624
15625
15626
15627
15628
15629
15630
15631
15632
15633
15634
15635
15636
15637
15638
15639
15640
15641
15642
15643
15644
15645
15646
15647
15648
15649
15650
15651
15652
15653
15654
15655
15656
15657
15658
15659
15660
15661
15662
15663
15664
15665
15666
15667
15668
15669
15670
15671
15672
15673
15674
15675
15676
15677
15678
15679
15680
15681
15682
15683
15684
15685
15686
15687
15688
15689
15690
15691
15692
15693
15694
15695
15696
15697
15698
15699
15700
15701
15702
15703
15704
15705
15706
15707
15708
15709
15710
15711
15712
15713
15714
15715
15716
15717
15718
15719
15720
15721
15722
15723
15724
15725
15726
15727
15728
15729
15730
15731
15732
15733
15734
15735
15736
15737
15738
15739
15740
15741
15742
15743
15744
15745
15746
15747
15748
15749
15750
15751
15752
15753
15754
15755
15756
15757
15758
15759
15760
15761
15762
15763
15764
15765
15766
15767
15768
15769
15770
15771
15772
15773
15774
15775
15776
15777
15778
15779
15780
15781
15782
15783
15784
15785
15786
15787
15788
15789
15790
15791
15792
15793
15794
15795
15796
15797
15798
15799
15800
15801
15802
15803
15804
15805
15806
15807
15808
15809
15810
15811
15812
15813
15814
15815
15816
15817
15818
15819
15820
15821
15822
15823
15824
15825
15826
15827
15828
15829
15830
15831
15832
15833
15834
15835
15836
15837
15838
15839
15840
15841
15842
15843
15844
15845
15846
15847
15848
15849
15850
15851
15852
15853
15854
15855
15856
15857
15858
15859
15860
15861
15862
15863
15864
15865
15866
15867
15868
15869
15870
15871
15872
15873
15874
15875
15876
15877
15878
15879
15880
15881
15882
15883
15884
15885
15886
15887
15888
15889
15890
15891
15892
15893
15894
15895
15896
15897
15898
15899
15900
15901
15902
15903
15904
15905
15906
15907
15908
15909
15910
15911
15912
15913
15914
15915
15916
15917
15918
15919
15920
15921
15922
15923
15924
15925
15926
15927
15928
15929
15930
15931
15932
15933
15934
15935
15936
15937
15938
15939
15940
15941
15942
15943
15944
15945
15946
15947
15948
15949
15950
15951
15952
15953
15954
15955
15956
15957
15958
15959
15960
15961
15962
15963
15964
15965
15966
15967
15968
15969
15970
15971
15972
15973
15974
15975
15976
15977
15978
15979
15980
15981
15982
15983
15984
15985
15986
15987
15988
15989
15990
15991
15992
15993
15994
15995
15996
15997
15998
15999
16000
16001
16002
16003
16004
16005
16006
16007
16008
16009
16010
16011
16012
16013
16014
16015
16016
16017
16018
16019
16020
16021
16022
16023
16024
16025
16026
16027
16028
16029
16030
16031
16032
16033
16034
16035
16036
16037
16038
16039
16040
16041
16042
16043
16044
16045
16046
16047
16048
16049
16050
16051
16052
16053
16054
16055
16056
16057
16058
16059
16060
16061
16062
16063
16064
16065
16066
16067
16068
16069
16070
16071
16072
16073
16074
16075
16076
16077
16078
16079
16080
16081
16082
16083
16084
16085
16086
16087
16088
16089
16090
16091
16092
16093
16094
16095
16096
16097
16098
16099
16100
16101
16102
16103
16104
16105
16106
16107
16108
16109
16110
16111
16112
16113
16114
16115
16116
16117
16118
16119
16120
16121
16122
16123
16124
16125
16126
16127
16128
16129
16130
16131
16132
16133
16134
16135
16136
16137
16138
16139
16140
16141
16142
16143
16144
16145
16146
16147
16148
16149
16150
16151
16152
16153
16154
16155
16156
16157
16158
16159
16160
16161
16162
16163
16164
16165
16166
16167
16168
16169
16170
16171
16172
16173
16174
16175
16176
16177
16178
16179
16180
16181
16182
16183
16184
16185
16186
16187
16188
16189
16190
16191
16192
16193
16194
16195
16196
16197
16198
16199
16200
16201
16202
16203
16204
16205
16206
16207
16208
16209
16210
16211
16212
16213
16214
16215
16216
16217
16218
16219
16220
16221
16222
16223
16224
16225
16226
16227
16228
16229
16230
16231
16232
16233
16234
16235
16236
16237
16238
16239
16240
16241
16242
16243
16244
16245
16246
16247
16248
16249
16250
16251
16252
16253
16254
16255
16256
16257
16258
16259
16260
16261
16262
16263
16264
16265
16266
16267
16268
16269
16270
16271
16272
16273
16274
16275
16276
16277
16278
16279
16280
16281
16282
16283
16284
16285
16286
16287
16288
16289
16290
16291
16292
16293
16294
16295
16296
16297
16298
16299
16300
16301
16302
16303
16304
16305
16306
16307
16308
16309
16310
16311
16312
16313
16314
16315
16316
16317
16318
16319
16320
16321
16322
16323
16324
16325
16326
16327
16328
16329
16330
16331
16332
16333
16334
16335
16336
16337
16338
16339
16340
16341
16342
16343
16344
16345
16346
16347
16348
16349
16350
16351
16352
16353
16354
16355
16356
16357
16358
16359
16360
16361
16362
16363
16364
16365
16366
16367
16368
16369
16370
16371
16372
16373
16374
16375
16376
16377
16378
16379
16380
16381
16382
16383
16384
16385
16386
16387
16388
16389
16390
16391
16392
16393
16394
16395
16396
16397
16398
16399
16400
16401
16402
16403
16404
16405
16406
16407
16408
16409
16410
16411
16412
16413
16414
16415
16416
16417
16418
16419
16420
16421
16422
16423
16424
16425
16426
16427
16428
16429
16430
16431
16432
16433
16434
16435
16436
16437
16438
16439
16440
16441
16442
16443
16444
16445
16446
16447
16448
16449
16450
16451
16452
16453
16454
16455
16456
16457
16458
16459
16460
16461
16462
16463
16464
16465
16466
16467
16468
16469
16470
16471
16472
16473
16474
16475
16476
16477
16478
16479
16480
16481
16482
16483
16484
16485
16486
16487
16488
16489
16490
16491
16492
16493
16494
16495
16496
16497
16498
16499
16500
16501
16502
16503
16504
16505
16506
16507
16508
16509
16510
16511
16512
16513
16514
16515
16516
16517
16518
16519
16520
16521
16522
16523
16524
16525
16526
16527
16528
16529
16530
16531
16532
16533
16534
16535
16536
16537
16538
16539
16540
16541
16542
16543
16544
16545
16546
16547
16548
16549
16550
16551
16552
16553
16554
16555
16556
16557
16558
16559
16560
16561
16562
16563
16564
16565
16566
16567
16568
16569
16570
16571
16572
16573
16574
16575
16576
16577
16578
16579
16580
16581
16582
16583
16584
16585
16586
16587
16588
16589
16590
16591
16592
16593
16594
16595
16596
16597
16598
16599
16600
16601
16602
16603
16604
16605
16606
16607
16608
16609
16610
16611
16612
16613
16614
16615
16616
16617
16618
16619
16620
16621
16622
16623
16624
16625
16626
16627
16628
16629
16630
16631
16632
16633
16634
16635
16636
16637
16638
16639
16640
16641
16642
16643
16644
16645
16646
16647
16648
16649
16650
16651
16652
16653
16654
16655
16656
16657
16658
16659
16660
16661
16662
16663
16664
16665
16666
16667
16668
16669
16670
16671
16672
16673
16674
16675
16676
16677
16678
16679
16680
16681
16682
16683
16684
16685
16686
16687
16688
16689
16690
16691
16692
16693
16694
16695
16696
16697
16698
16699
16700
16701
16702
16703
16704
16705
16706
16707
16708
16709
16710
16711
16712
16713
16714
16715
16716
16717
16718
16719
16720
16721
16722
16723
16724
16725
16726
16727
16728
16729
16730
16731
16732
16733
16734
16735
16736
16737
16738
16739
16740
16741
16742
16743
16744
16745
16746
16747
16748
16749
16750
16751
16752
16753
16754
16755
16756
16757
16758
16759
16760
16761
16762
16763
16764
16765
16766
16767
16768
16769
16770
16771
16772
16773
16774
16775
16776
16777
16778
16779
16780
16781
16782
16783
16784
16785
16786
16787
16788
16789
16790
16791
16792
16793
16794
16795
16796
16797
16798
16799
16800
16801
16802
16803
16804
16805
16806
16807
16808
16809
16810
16811
16812
16813
16814
16815
16816
16817
16818
16819
16820
16821
16822
16823
16824
16825
16826
16827
16828
16829
16830
16831
16832
16833
16834
16835
16836
16837
16838
16839
16840
16841
16842
16843
16844
16845
16846
16847
16848
16849
16850
16851
16852
16853
16854
16855
16856
16857
16858
16859
16860
16861
16862
16863
16864
16865
16866
16867
16868
16869
16870
16871
16872
16873
16874
16875
16876
16877
16878
16879
16880
16881
16882
16883
16884
16885
16886
16887
16888
16889
16890
16891
16892
16893
16894
16895
16896
16897
16898
16899
16900
16901
16902
16903
16904
16905
16906
16907
16908
16909
16910
16911
16912
16913
16914
16915
16916
16917
16918
16919
16920
16921
16922
16923
16924
16925
16926
16927
16928
16929
16930
16931
16932
16933
16934
16935
16936
16937
16938
16939
16940
16941
16942
16943
16944
16945
16946
16947
16948
16949
16950
16951
16952
16953
16954
16955
16956
16957
16958
16959
16960
16961
16962
16963
16964
16965
16966
16967
16968
16969
16970
16971
16972
16973
16974
16975
16976
16977
16978
16979
16980
16981
16982
16983
16984
16985
16986
16987
16988
16989
16990
16991
16992
16993
16994
16995
16996
16997
16998
16999
17000
17001
17002
17003
17004
17005
17006
17007
17008
17009
17010
17011
17012
17013
17014
17015
17016
17017
17018
17019
17020
17021
17022
17023
17024
17025
17026
17027
17028
17029
17030
17031
17032
17033
17034
17035
17036
17037
17038
17039
17040
17041
17042
17043
17044
17045
17046
17047
17048
17049
17050
17051
17052
17053
17054
17055
17056
17057
17058
17059
17060
17061
17062
17063
17064
17065
17066
17067
17068
17069
17070
17071
17072
17073
17074
17075
17076
17077
17078
17079
17080
17081
17082
17083
17084
17085
17086
17087
17088
17089
17090
17091
17092
17093
17094
17095
17096
17097
17098
17099
17100
17101
17102
17103
17104
17105
17106
17107
17108
17109
17110
17111
17112
17113
17114
17115
17116
17117
17118
17119
17120
17121
17122
17123
17124
17125
17126
17127
17128
17129
17130
17131
17132
17133
17134
17135
17136
17137
17138
17139
17140
17141
17142
17143
17144
17145
17146
17147
17148
17149
17150
17151
17152
17153
17154
17155
17156
17157
17158
17159
17160
17161
17162
17163
17164
17165
17166
17167
17168
17169
17170
17171
17172
17173
17174
17175
17176
17177
17178
17179
17180
17181
17182
17183
17184
17185
17186
17187
17188
17189
17190
17191
17192
17193
17194
17195
17196
17197
17198
17199
17200
17201
17202
17203
17204
17205
17206
17207
17208
17209
17210
17211
17212
17213
17214
17215
17216
17217
17218
17219
17220
17221
17222
17223
17224
17225
17226
17227
17228
17229
17230
17231
17232
17233
17234
17235
17236
17237
17238
17239
17240
17241
17242
17243
17244
17245
17246
17247
17248
17249
17250
17251
17252
17253
17254
17255
17256
17257
17258
17259
17260
17261
17262
17263
17264
17265
17266
17267
17268
17269
17270
17271
17272
17273
17274
17275
17276
17277
17278
17279
17280
17281
17282
17283
17284
17285
17286
17287
17288
17289
17290
17291
17292
17293
17294
17295
17296
17297
17298
17299
17300
17301
17302
17303
17304
17305
17306
17307
17308
17309
17310
17311
17312
17313
17314
17315
17316
17317
17318
17319
17320
17321
17322
17323
17324
17325
17326
17327
17328
17329
17330
17331
17332
17333
17334
17335
17336
17337
17338
17339
17340
17341
17342
17343
17344
17345
17346
17347
17348
17349
17350
17351
17352
17353
17354
17355
17356
17357
17358
17359
17360
17361
17362
17363
17364
17365
17366
17367
17368
17369
17370
17371
17372
17373
17374
17375
17376
17377
17378
17379
17380
17381
17382
17383
17384
17385
17386
17387
17388
17389
17390
17391
17392
17393
17394
17395
17396
17397
17398
17399
17400
17401
17402
17403
17404
17405
17406
17407
17408
17409
17410
17411
17412
17413
17414
17415
17416
17417
17418
17419
17420
17421
17422
17423
17424
17425
17426
17427
17428
17429
17430
17431
17432
17433
17434
17435
17436
17437
17438
17439
17440
17441
17442
17443
17444
17445
17446
17447
17448
17449
17450
17451
17452
17453
17454
17455
17456
17457
17458
17459
17460
17461
17462
17463
17464
17465
17466
17467
17468
17469
17470
17471
17472
17473
17474
17475
17476
17477
17478
17479
17480
17481
17482
17483
17484
17485
17486
17487
17488
17489
17490
17491
17492
17493
17494
17495
17496
17497
17498
17499
17500
17501
17502
17503
17504
17505
17506
17507
17508
17509
17510
17511
17512
17513
17514
17515
17516
17517
17518
17519
17520
17521
17522
17523
17524
17525
17526
17527
17528
17529
17530
17531
17532
17533
17534
17535
17536
17537
17538
17539
17540
17541
17542
17543
17544
17545
17546
17547
17548
17549
17550
17551
17552
17553
17554
17555
17556
17557
17558
17559
17560
17561
17562
17563
17564
17565
17566
17567
17568
17569
17570
17571
17572
17573
17574
17575
17576
17577
17578
17579
17580
17581
17582
17583
17584
17585
17586
17587
17588
17589
17590
17591
17592
17593
17594
17595
17596
17597
17598
17599
17600
17601
17602
17603
17604
17605
17606
17607
17608
17609
17610
17611
17612
17613
17614
17615
17616
17617
17618
17619
17620
17621
17622
17623
17624
17625
17626
17627
17628
17629
17630
17631
17632
17633
17634
17635
17636
17637
17638
17639
17640
17641
17642
17643
17644
17645
17646
17647
17648
17649
17650
17651
17652
17653
17654
17655
17656
17657
17658
17659
17660
17661
17662
17663
17664
17665
17666
17667
17668
17669
17670
17671
17672
17673
17674
17675
17676
17677
17678
17679
17680
17681
17682
17683
17684
17685
17686
17687
17688
17689
17690
17691
17692
17693
17694
17695
17696
17697
17698
17699
17700
17701
17702
17703
17704
17705
17706
17707
17708
17709
17710
17711
17712
17713
17714
17715
17716
17717
17718
17719
17720
17721
17722
17723
17724
17725
17726
17727
17728
17729
17730
17731
17732
17733
17734
17735
17736
17737
17738
17739
17740
17741
17742
17743
17744
17745
17746
17747
17748
17749
17750
17751
17752
17753
17754
17755
17756
17757
17758
17759
17760
17761
17762
17763
17764
17765
17766
17767
17768
17769
17770
17771
17772
17773
17774
17775
17776
17777
17778
17779
17780
17781
17782
17783
17784
17785
17786
17787
17788
17789
17790
17791
17792
17793
17794
17795
17796
17797
17798
17799
17800
17801
17802
17803
17804
17805
17806
17807
17808
17809
17810
17811
17812
17813
17814
17815
17816
17817
17818
17819
17820
17821
17822
17823
17824
17825
17826
17827
17828
17829
17830
17831
17832
17833
17834
17835
17836
17837
17838
17839
17840
17841
17842
17843
17844
17845
17846
17847
17848
17849
17850
17851
17852
17853
17854
17855
17856
17857
17858
17859
17860
17861
17862
17863
17864
17865
17866
17867
17868
17869
17870
17871
17872
17873
17874
17875
17876
17877
17878
17879
17880
17881
17882
17883
17884
17885
17886
17887
17888
17889
17890
17891
17892
17893
17894
17895
17896
17897
17898
17899
17900
17901
17902
17903
17904
17905
17906
17907
17908
17909
17910
17911
17912
17913
17914
17915
17916
17917
17918
17919
17920
17921
17922
17923
17924
17925
17926
17927
17928
17929
17930
17931
17932
17933
17934
17935
17936
17937
17938
17939
17940
17941
17942
17943
17944
17945
17946
17947
17948
17949
17950
17951
17952
17953
17954
17955
17956
17957
17958
17959
17960
17961
17962
17963
17964
17965
17966
17967
17968
17969
17970
17971
17972
17973
17974
17975
17976
17977
17978
17979
17980
17981
17982
17983
17984
17985
17986
17987
17988
17989
17990
17991
17992
17993
17994
17995
17996
17997
17998
17999
18000
18001
18002
18003
18004
18005
18006
18007
18008
18009
18010
18011
18012
18013
18014
18015
18016
18017
18018
18019
18020
18021
18022
18023
18024
18025
18026
18027
18028
18029
18030
18031
18032
18033
18034
18035
18036
18037
18038
18039
18040
18041
18042
18043
18044
18045
18046
18047
18048
18049
18050
18051
18052
18053
18054
18055
18056
18057
18058
18059
18060
18061
18062
18063
18064
18065
18066
18067
18068
18069
18070
18071
18072
18073
18074
18075
18076
18077
18078
18079
18080
18081
18082
18083
18084
18085
18086
18087
18088
18089
18090
18091
18092
18093
18094
18095
18096
18097
18098
18099
18100
18101
18102
18103
18104
18105
18106
18107
18108
18109
18110
18111
18112
18113
18114
18115
18116
18117
18118
18119
18120
18121
18122
18123
18124
18125
18126
18127
18128
18129
18130
18131
18132
18133
18134
18135
18136
18137
18138
18139
18140
18141
18142
18143
18144
18145
18146
18147
18148
18149
18150
18151
18152
18153
18154
18155
18156
18157
18158
18159
18160
18161
18162
18163
18164
18165
18166
18167
18168
18169
18170
18171
18172
18173
18174
18175
18176
18177
18178
18179
18180
18181
18182
18183
18184
18185
18186
18187
18188
18189
18190
18191
18192
18193
18194
18195
18196
18197
18198
18199
18200
18201
18202
18203
18204
18205
18206
18207
18208
18209
18210
18211
18212
18213
18214
18215
18216
18217
18218
18219
18220
18221
18222
18223
18224
18225
18226
18227
18228
18229
18230
18231
18232
18233
18234
18235
18236
18237
18238
18239
18240
18241
18242
18243
18244
18245
18246
18247
18248
18249
18250
18251
18252
18253
18254
18255
18256
18257
18258
18259
18260
18261
18262
18263
18264
18265
18266
18267
18268
18269
18270
18271
18272
18273
18274
18275
18276
18277
18278
18279
18280
18281
18282
18283
18284
18285
18286
18287
18288
18289
18290
18291
18292
18293
18294
18295
18296
18297
18298
18299
18300
18301
18302
18303
18304
18305
18306
18307
18308
18309
18310
18311
18312
18313
18314
18315
18316
18317
18318
18319
18320
18321
18322
18323
18324
18325
18326
18327
18328
18329
18330
18331
18332
18333
18334
18335
18336
18337
18338
18339
18340
18341
18342
18343
18344
18345
18346
18347
18348
18349
18350
18351
18352
18353
18354
18355
18356
18357
18358
18359
18360
18361
18362
18363
18364
18365
18366
18367
18368
18369
18370
18371
18372
18373
18374
18375
18376
18377
18378
18379
18380
18381
18382
18383
18384
18385
18386
18387
18388
18389
18390
18391
18392
18393
18394
18395
18396
18397
18398
18399
18400
18401
18402
18403
18404
18405
18406
18407
18408
18409
18410
18411
18412
18413
18414
18415
18416
18417
18418
18419
18420
18421
18422
18423
18424
18425
18426
18427
18428
18429
18430
18431
18432
18433
18434
18435
18436
18437
18438
18439
18440
18441
18442
18443
18444
18445
18446
18447
18448
18449
18450
18451
18452
18453
18454
18455
18456
18457
18458
18459
18460
18461
18462
18463
18464
18465
18466
18467
18468
18469
18470
18471
18472
18473
18474
18475
18476
18477
18478
18479
18480
18481
18482
18483
18484
18485
18486
18487
18488
18489
18490
18491
18492
18493
18494
18495
18496
18497
18498
18499
18500
18501
18502
18503
18504
18505
18506
18507
18508
18509
18510
18511
18512
18513
18514
18515
18516
18517
18518
18519
18520
18521
18522
18523
18524
18525
18526
18527
18528
18529
18530
18531
18532
18533
18534
18535
18536
18537
18538
18539
18540
18541
18542
18543
18544
18545
18546
18547
18548
18549
18550
18551
18552
18553
18554
18555
18556
18557
18558
18559
18560
18561
18562
18563
18564
18565
18566
18567
18568
18569
18570
18571
18572
18573
18574
18575
18576
18577
18578
18579
18580
18581
18582
18583
18584
18585
18586
18587
18588
18589
18590
18591
18592
18593
18594
18595
18596
18597
18598
18599
18600
18601
18602
18603
18604
18605
18606
18607
18608
18609
18610
18611
18612
18613
18614
18615
18616
18617
18618
18619
18620
18621
18622
18623
18624
18625
18626
18627
18628
18629
18630
18631
18632
18633
18634
18635
18636
18637
18638
18639
18640
18641
18642
18643
18644
18645
18646
18647
18648
18649
18650
18651
18652
18653
18654
18655
18656
18657
18658
18659
18660
18661
18662
18663
18664
18665
18666
18667
18668
18669
18670
18671
18672
18673
18674
18675
18676
18677
18678
18679
18680
18681
18682
18683
18684
18685
18686
18687
18688
18689
18690
18691
18692
18693
18694
18695
18696
18697
18698
18699
18700
18701
18702
18703
18704
18705
18706
18707
18708
18709
18710
18711
18712
18713
18714
18715
18716
18717
18718
18719
18720
18721
18722
18723
18724
18725
18726
18727
18728
18729
18730
18731
18732
18733
18734
18735
18736
18737
18738
18739
18740
18741
18742
18743
18744
18745
18746
18747
18748
18749
18750
18751
18752
18753
18754
18755
18756
18757
18758
18759
18760
18761
18762
18763
18764
18765
18766
18767
18768
18769
18770
18771
18772
18773
18774
18775
18776
18777
18778
18779
18780
18781
18782
18783
18784
18785
18786
18787
18788
18789
18790
18791
18792
18793
18794
18795
18796
18797
18798
18799
18800
18801
18802
18803
18804
18805
18806
18807
18808
18809
18810
18811
18812
18813
18814
18815
18816
18817
18818
18819
18820
18821
18822
18823
18824
18825
18826
18827
18828
18829
18830
18831
18832
18833
18834
18835
18836
18837
18838
18839
18840
18841
18842
18843
18844
18845
18846
18847
18848
18849
18850
18851
18852
18853
18854
18855
18856
18857
18858
18859
18860
18861
18862
18863
18864
18865
18866
18867
18868
18869
18870
18871
18872
18873
18874
18875
18876
18877
18878
18879
18880
18881
18882
18883
18884
18885
18886
18887
18888
18889
18890
18891
18892
18893
18894
18895
18896
18897
18898
18899
18900
18901
18902
18903
18904
18905
18906
18907
18908
18909
18910
18911
18912
18913
18914
18915
18916
18917
18918
18919
18920
18921
18922
18923
18924
18925
18926
18927
18928
18929
18930
18931
18932
18933
18934
18935
18936
18937
18938
18939
18940
18941
18942
18943
18944
18945
18946
18947
18948
18949
18950
18951
18952
18953
18954
18955
18956
18957
18958
18959
18960
18961
18962
18963
18964
18965
18966
18967
18968
18969
18970
18971
18972
18973
18974
18975
18976
18977
18978
18979
18980
18981
18982
18983
18984
18985
18986
18987
18988
18989
18990
18991
18992
18993
18994
18995
18996
18997
18998
18999
19000
19001
19002
19003
19004
19005
19006
19007
19008
19009
19010
19011
19012
19013
19014
19015
19016
19017
19018
19019
19020
19021
19022
19023
19024
19025
19026
19027
19028
19029
19030
19031
19032
19033
19034
19035
19036
19037
19038
19039
19040
19041
19042
19043
19044
19045
19046
19047
19048
19049
19050
19051
19052
19053
19054
19055
19056
19057
19058
19059
19060
19061
19062
19063
19064
19065
19066
19067
19068
19069
19070
19071
19072
19073
19074
19075
19076
19077
19078
19079
19080
19081
19082
19083
19084
19085
19086
19087
19088
19089
19090
19091
19092
19093
19094
19095
19096
19097
19098
19099
19100
19101
19102
19103
19104
19105
19106
19107
19108
19109
19110
19111
19112
19113
19114
19115
19116
19117
19118
19119
19120
19121
19122
19123
19124
19125
19126
19127
19128
19129
19130
19131
19132
19133
19134
19135
19136
19137
19138
19139
19140
19141
19142
19143
19144
19145
19146
19147
19148
19149
19150
19151
19152
19153
19154
19155
19156
19157
19158
19159
19160
19161
19162
19163
19164
19165
19166
19167
19168
19169
19170
19171
19172
19173
19174
19175
19176
19177
19178
19179
19180
19181
19182
19183
19184
19185
19186
19187
19188
19189
19190
19191
19192
19193
19194
19195
19196
19197
19198
19199
19200
19201
19202
19203
19204
19205
19206
19207
19208
19209
19210
19211
19212
19213
19214
19215
19216
19217
19218
19219
19220
19221
19222
19223
19224
19225
19226
19227
19228
19229
19230
19231
19232
19233
19234
19235
19236
19237
19238
19239
19240
19241
19242
19243
19244
19245
19246
19247
19248
19249
19250
19251
19252
19253
19254
19255
19256
19257
19258
19259
19260
19261
19262
19263
19264
19265
19266
19267
19268
19269
19270
19271
19272
19273
19274
19275
19276
19277
19278
19279
19280
19281
19282
19283
19284
19285
19286
19287
19288
19289
19290
19291
19292
19293
19294
19295
19296
19297
19298
19299
19300
19301
19302
19303
19304
19305
19306
19307
19308
19309
19310
19311
19312
19313
19314
19315
19316
19317
19318
19319
19320
19321
19322
19323
19324
19325
19326
19327
19328
19329
19330
19331
19332
19333
19334
19335
19336
19337
19338
19339
19340
19341
19342
19343
19344
19345
19346
19347
19348
19349
19350
19351
19352
19353
19354
19355
19356
19357
19358
19359
19360
19361
19362
19363
19364
19365
19366
19367
19368
19369
19370
19371
19372
19373
19374
19375
19376
19377
19378
19379
19380
19381
19382
19383
19384
19385
19386
19387
19388
19389
19390
19391
19392
19393
19394
19395
19396
19397
19398
19399
19400
19401
19402
19403
19404
19405
19406
19407
19408
19409
19410
19411
19412
19413
19414
19415
19416
19417
19418
19419
19420
19421
19422
19423
19424
19425
19426
19427
19428
19429
19430
19431
19432
19433
19434
19435
19436
19437
19438
19439
19440
19441
19442
19443
19444
19445
19446
19447
19448
19449
19450
19451
19452
19453
19454
19455
19456
19457
19458
19459
19460
19461
19462
19463
19464
19465
19466
19467
19468
19469
19470
19471
19472
19473
19474
19475
19476
19477
19478
19479
19480
19481
19482
19483
19484
19485
19486
19487
19488
19489
19490
19491
19492
19493
19494
19495
19496
19497
19498
19499
19500
19501
19502
19503
19504
19505
19506
19507
19508
19509
19510
19511
19512
19513
19514
19515
19516
19517
19518
19519
19520
19521
19522
19523
19524
19525
19526
19527
19528
19529
19530
19531
19532
19533
19534
19535
19536
19537
19538
19539
19540
19541
19542
19543
19544
19545
19546
19547
19548
19549
19550
19551
19552
19553
19554
19555
19556
19557
19558
19559
19560
19561
19562
19563
19564
19565
19566
19567
19568
19569
19570
19571
19572
19573
19574
19575
19576
19577
19578
19579
19580
19581
19582
19583
19584
19585
19586
19587
19588
19589
19590
19591
19592
19593
19594
19595
19596
19597
19598
19599
19600
19601
19602
19603
19604
19605
19606
19607
19608
19609
19610
19611
19612
19613
19614
19615
19616
19617
19618
19619
19620
19621
19622
19623
19624
19625
19626
19627
19628
19629
19630
19631
19632
19633
19634
19635
19636
19637
19638
19639
19640
19641
19642
19643
19644
19645
19646
19647
19648
19649
19650
19651
19652
19653
19654
19655
19656
19657
19658
19659
19660
19661
19662
19663
19664
19665
19666
19667
19668
19669
19670
19671
19672
19673
19674
19675
19676
19677
19678
19679
19680
19681
19682
19683
19684
19685
19686
19687
19688
19689
19690
19691
19692
19693
19694
19695
19696
19697
19698
19699
19700
19701
19702
19703
19704
19705
19706
19707
19708
19709
19710
19711
19712
19713
19714
19715
19716
19717
19718
19719
19720
19721
19722
19723
19724
19725
19726
19727
19728
19729
19730
19731
19732
19733
19734
19735
19736
19737
19738
19739
19740
19741
19742
19743
19744
19745
19746
19747
19748
19749
19750
19751
19752
19753
19754
19755
19756
19757
19758
19759
19760
19761
19762
19763
19764
19765
19766
19767
19768
19769
19770
19771
19772
19773
19774
19775
19776
19777
19778
19779
19780
19781
19782
19783
19784
19785
19786
19787
19788
19789
19790
19791
19792
19793
19794
19795
19796
19797
19798
19799
19800
19801
19802
19803
19804
19805
19806
19807
19808
19809
19810
19811
19812
19813
19814
19815
19816
19817
19818
19819
19820
19821
19822
19823
19824
19825
19826
19827
19828
19829
19830
19831
19832
19833
19834
19835
19836
19837
19838
19839
19840
19841
19842
19843
19844
19845
19846
19847
19848
19849
19850
19851
19852
19853
19854
19855
19856
19857
19858
19859
19860
19861
19862
19863
19864
19865
19866
19867
19868
19869
19870
19871
19872
19873
19874
19875
19876
19877
19878
19879
19880
19881
19882
19883
19884
19885
19886
19887
19888
19889
19890
19891
19892
19893
19894
19895
19896
19897
19898
19899
19900
19901
19902
19903
19904
19905
19906
19907
19908
19909
19910
19911
19912
19913
19914
19915
19916
19917
19918
19919
19920
19921
19922
19923
19924
19925
19926
19927
19928
19929
19930
19931
19932
19933
19934
19935
19936
19937
19938
19939
19940
19941
19942
19943
19944
19945
19946
19947
19948
19949
19950
19951
19952
19953
19954
19955
19956
19957
19958
19959
19960
19961
19962
19963
19964
19965
19966
19967
19968
19969
19970
19971
19972
19973
19974
19975
19976
19977
19978
19979
19980
19981
19982
19983
19984
19985
19986
19987
19988
19989
19990
19991
19992
19993
19994
19995
19996
19997
19998
19999
20000
20001
20002
20003
20004
20005
20006
20007
20008
20009
20010
20011
20012
20013
20014
20015
20016
20017
20018
20019
20020
20021
20022
20023
20024
20025
20026
20027
20028
20029
20030
20031
20032
20033
20034
20035
20036
20037
20038
20039
20040
20041
20042
20043
20044
20045
20046
20047
20048
20049
20050
20051
20052
20053
20054
20055
20056
20057
20058
20059
20060
20061
20062
20063
20064
20065
20066
20067
20068
20069
20070
20071
20072
20073
20074
20075
20076
20077
20078
20079
20080
20081
20082
20083
20084
20085
20086
20087
20088
20089
20090
20091
20092
20093
20094
20095
20096
20097
20098
20099
20100
20101
20102
20103
20104
20105
20106
20107
20108
20109
20110
20111
20112
20113
20114
20115
20116
20117
20118
20119
20120
20121
20122
20123
20124
20125
20126
20127
20128
20129
20130
20131
20132
20133
20134
20135
20136
20137
20138
20139
20140
20141
20142
20143
20144
20145
20146
20147
20148
20149
20150
20151
20152
20153
20154
20155
20156
20157
20158
20159
20160
20161
20162
20163
20164
20165
20166
20167
20168
20169
20170
20171
20172
20173
20174
20175
20176
20177
20178
20179
20180
20181
20182
20183
20184
20185
20186
20187
20188
20189
20190
20191
20192
20193
20194
20195
20196
20197
20198
20199
20200
20201
20202
20203
20204
20205
20206
20207
20208
20209
20210
20211
20212
20213
20214
20215
20216
20217
20218
20219
20220
20221
20222
20223
20224
20225
20226
20227
20228
20229
20230
20231
20232
20233
20234
20235
20236
20237
20238
20239
20240
20241
20242
20243
20244
20245
20246
20247
20248
20249
20250
20251
20252
20253
20254
20255
20256
20257
20258
20259
20260
20261
20262
20263
20264
20265
20266
20267
20268
20269
20270
20271
20272
20273
20274
20275
20276
20277
20278
20279
20280
20281
20282
20283
20284
20285
20286
20287
20288
20289
20290
20291
20292
20293
20294
20295
20296
20297
20298
20299
20300
20301
20302
20303
20304
20305
20306
20307
20308
20309
20310
20311
20312
20313
20314
20315
20316
20317
20318
20319
20320
20321
20322
20323
20324
20325
20326
20327
20328
20329
20330
20331
20332
20333
20334
20335
20336
20337
20338
20339
20340
20341
20342
20343
20344
20345
20346
20347
20348
20349
20350
20351
20352
20353
20354
20355
20356
20357
20358
20359
20360
20361
20362
20363
20364
20365
20366
20367
20368
20369
20370
20371
20372
20373
20374
20375
20376
20377
20378
20379
20380
20381
20382
20383
20384
20385
20386
20387
20388
20389
20390
20391
20392
20393
20394
20395
20396
20397
20398
20399
20400
20401
20402
20403
20404
20405
20406
20407
20408
20409
20410
20411
20412
20413
20414
20415
20416
20417
20418
20419
20420
20421
20422
20423
20424
20425
20426
20427
20428
20429
20430
20431
20432
20433
20434
20435
20436
20437
20438
20439
20440
20441
20442
20443
20444
20445
20446
20447
20448
20449
20450
20451
20452
20453
20454
20455
20456
20457
20458
20459
20460
20461
20462
20463
20464
20465
20466
20467
20468
20469
20470
20471
20472
20473
20474
20475
20476
20477
20478
20479
20480
20481
20482
20483
20484
20485
20486
20487
20488
20489
20490
20491
20492
20493
20494
20495
20496
20497
20498
20499
20500
20501
20502
20503
20504
20505
20506
20507
20508
20509
20510
20511
20512
20513
20514
20515
20516
20517
20518
20519
20520
20521
20522
20523
20524
20525
20526
20527
20528
20529
20530
20531
20532
20533
20534
20535
20536
20537
20538
20539
20540
20541
20542
20543
20544
20545
20546
20547
20548
20549
20550
20551
20552
20553
20554
20555
20556
20557
20558
20559
20560
20561
20562
20563
20564
20565
20566
20567
20568
20569
20570
20571
20572
20573
20574
20575
20576
20577
20578
20579
20580
20581
20582
20583
20584
20585
20586
20587
20588
20589
20590
20591
20592
20593
20594
20595
20596
20597
20598
20599
20600
20601
20602
20603
20604
20605
20606
20607
20608
20609
20610
20611
20612
20613
20614
20615
20616
20617
20618
20619
20620
20621
20622
20623
20624
20625
20626
20627
20628
20629
20630
20631
20632
20633
20634
20635
20636
20637
20638
20639
20640
20641
20642
20643
20644
20645
20646
20647
20648
20649
20650
20651
20652
20653
20654
20655
20656
20657
20658
20659
20660
20661
20662
20663
20664
20665
20666
20667
20668
20669
20670
20671
20672
20673
20674
20675
20676
20677
20678
20679
20680
20681
20682
20683
20684
20685
20686
20687
20688
20689
20690
20691
20692
20693
20694
20695
20696
20697
20698
20699
20700
20701
20702
20703
20704
20705
20706
20707
20708
20709
20710
20711
20712
20713
20714
20715
20716
20717
20718
20719
20720
20721
20722
20723
20724
20725
20726
20727
20728
20729
20730
20731
20732
20733
20734
20735
20736
20737
20738
20739
20740
20741
20742
20743
20744
20745
20746
20747
20748
20749
20750
20751
20752
20753
20754
20755
20756
20757
20758
20759
20760
20761
20762
20763
20764
20765
20766
20767
20768
20769
20770
20771
20772
20773
20774
20775
20776
20777
20778
20779
20780
20781
20782
20783
20784
20785
20786
20787
20788
20789
20790
20791
20792
20793
20794
20795
20796
20797
20798
20799
20800
20801
20802
20803
20804
20805
20806
20807
20808
20809
20810
20811
20812
20813
20814
20815
20816
20817
20818
20819
20820
20821
20822
20823
20824
20825
20826
20827
20828
20829
20830
20831
20832
20833
20834
20835
20836
20837
20838
20839
20840
20841
20842
20843
20844
20845
20846
20847
20848
20849
20850
20851
20852
20853
20854
20855
20856
20857
20858
20859
20860
20861
20862
20863
20864
20865
20866
20867
20868
20869
20870
20871
20872
20873
20874
20875
20876
20877
20878
20879
20880
20881
20882
20883
20884
20885
20886
20887
20888
20889
20890
20891
20892
20893
20894
20895
20896
20897
20898
20899
20900
20901
20902
20903
20904
20905
20906
20907
20908
20909
20910
20911
20912
20913
20914
20915
20916
20917
20918
20919
20920
20921
20922
20923
20924
20925
20926
20927
20928
20929
20930
20931
20932
20933
20934
20935
20936
20937
20938
20939
20940
20941
20942
20943
20944
20945
20946
20947
20948
20949
20950
20951
20952
20953
20954
20955
20956
20957
20958
20959
20960
20961
20962
20963
20964
20965
20966
20967
20968
20969
20970
20971
20972
20973
20974
20975
20976
20977
20978
20979
20980
20981
20982
20983
20984
20985
20986
20987
20988
20989
20990
20991
20992
20993
20994
20995
20996
20997
20998
20999
21000
21001
21002
21003
21004
21005
21006
21007
21008
21009
21010
21011
21012
21013
21014
21015
21016
21017
21018
21019
21020
21021
21022
21023
21024
21025
21026
21027
21028
21029
21030
21031
21032
21033
21034
21035
21036
21037
21038
21039
21040
21041
21042
21043
21044
21045
21046
21047
21048
21049
21050
21051
21052
21053
21054
21055
21056
21057
21058
21059
21060
21061
21062
21063
21064
21065
21066
21067
21068
21069
21070
21071
21072
21073
21074
21075
21076
21077
21078
21079
21080
21081
21082
21083
21084
21085
21086
21087
21088
21089
21090
21091
21092
21093
21094
21095
21096
21097
21098
21099
21100
21101
21102
21103
21104
21105
21106
21107
21108
21109
21110
21111
21112
21113
21114
21115
21116
21117
21118
21119
21120
21121
21122
21123
21124
21125
21126
21127
21128
21129
21130
21131
21132
21133
21134
21135
21136
21137
21138
21139
21140
21141
21142
21143
21144
21145
21146
21147
21148
21149
21150
21151
21152
21153
21154
21155
21156
21157
21158
21159
21160
21161
21162
21163
21164
21165
21166
21167
21168
21169
21170
21171
21172
21173
21174
21175
21176
21177
21178
21179
21180
21181
21182
21183
21184
21185
21186
21187
21188
21189
21190
21191
21192
21193
21194
21195
21196
21197
21198
21199
21200
21201
21202
21203
21204
21205
21206
21207
21208
21209
21210
21211
21212
21213
21214
21215
21216
21217
21218
21219
21220
21221
21222
21223
21224
21225
21226
21227
21228
21229
21230
21231
21232
21233
21234
21235
21236
21237
21238
21239
21240
21241
21242
21243
21244
21245
21246
21247
21248
21249
21250
21251
21252
21253
21254
21255
21256
21257
21258
21259
21260
21261
21262
21263
21264
21265
21266
21267
21268
21269
21270
21271
21272
21273
21274
21275
21276
21277
21278
21279
21280
21281
21282
21283
21284
21285
21286
21287
21288
21289
21290
21291
21292
21293
21294
21295
21296
21297
21298
21299
21300
21301
21302
21303
21304
21305
21306
21307
21308
21309
21310
21311
21312
21313
21314
21315
21316
21317
21318
21319
21320
21321
21322
21323
21324
21325
21326
21327
21328
21329
21330
21331
21332
21333
21334
21335
21336
21337
21338
21339
21340
21341
21342
21343
21344
21345
21346
21347
21348
21349
21350
21351
21352
21353
21354
21355
21356
21357
21358
21359
21360
21361
21362
21363
21364
21365
21366
21367
21368
21369
21370
21371
21372
21373
21374
21375
21376
21377
21378
21379
21380
21381
21382
21383
21384
21385
21386
21387
21388
21389
21390
21391
21392
21393
21394
21395
21396
21397
21398
21399
21400
21401
21402
21403
21404
21405
21406
21407
21408
21409
21410
21411
21412
21413
21414
21415
21416
21417
21418
21419
21420
21421
21422
21423
21424
21425
21426
21427
21428
21429
21430
21431
21432
21433
21434
21435
21436
21437
21438
21439
21440
21441
21442
21443
21444
21445
21446
21447
21448
21449
21450
21451
21452
21453
21454
21455
21456
21457
21458
21459
21460
21461
21462
21463
21464
21465
21466
21467
21468
21469
21470
21471
21472
21473
21474
21475
21476
21477
21478
21479
21480
21481
21482
21483
21484
21485
21486
21487
21488
21489
21490
21491
21492
21493
21494
21495
21496
21497
21498
21499
21500
21501
21502
21503
21504
21505
21506
21507
21508
21509
21510
21511
21512
21513
21514
21515
21516
21517
21518
21519
21520
21521
21522
21523
21524
21525
21526
21527
21528
21529
21530
21531
21532
21533
21534
21535
21536
21537
21538
21539
21540
21541
21542
21543
21544
21545
21546
21547
21548
21549
21550
21551
21552
21553
21554
21555
21556
21557
21558
21559
21560
21561
21562
21563
21564
21565
21566
21567
21568
21569
21570
21571
21572
21573
21574
21575
21576
21577
21578
21579
21580
21581
21582
21583
21584
21585
21586
21587
21588
21589
21590
21591
21592
21593
21594
21595
21596
21597
21598
21599
21600
21601
21602
21603
21604
21605
21606
21607
21608
21609
21610
|
commit e5a55dbf265354e7c94be3e2be53c2d5c8fba056
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 11 15:53:36 2012 -0700
Use ft/s for imperial speeds
Bob Brown thinks this unit will be more useful than mph
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 73d05650eae1d3958e02e9ffde2020a2438eccbb
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 11 15:30:45 2012 -0700
Add Version 1.1 release notes.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7ae3e4cea1cd180ff18b5293a67b4520cc8292be
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 11 01:00:05 2012 -0700
altosui: Imperial units for graphs too
Just to be consistent
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 95268d681c9a6652d84db383f55a4fe8a4ac5173
Author: Tom Marble <tmarble@info9.net>
Date: Tue Sep 11 12:54:31 2012 -0500
Reverted package name to 'altosui' from 'AltosUI'
Also added emacs backup regex (*~) to .gitignore
commit 13c64f6fb5764c6a0f3520cf4e48a75d78e163db
Author: Tom Marble <tmarble@info9.net>
Date: Tue Sep 11 12:44:24 2012 -0500
Add appropriate Java build deps as given from autoconf
commit 8e506274a35eccacd2d4523faa08d279a201753f
Merge: 0bc3ed5 1fc97dd
Author: Tom Marble <tmarble@info9.net>
Date: Tue Sep 11 11:39:22 2012 -0500
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 0bc3ed53aa8972c7080d6335f609cd9d0df1c79d
Author: Tom Marble <tmarble@info9.net>
Date: Tue Sep 11 11:37:14 2012 -0500
Use explicit build deps for altosui (avoids * wildcarding)
commit 1fc97dd9875a7639533a34438c4c7c999412eb3a
Merge: 8397d2b 4420d4a
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Sep 11 10:35:04 2012 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 8397d2b041824ddf1cc0b82926f10da8aae3264f
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Sep 11 10:34:00 2012 -0600
update Debian build-deps in preparation for 1.1 release
commit 4420d4a9fc011ed970af506ef771dfb81580b666
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 11 00:49:48 2012 -0700
Fix Latin-1 encoded copyright symbols in AltosDroid java code
Otherwise, we get complaints when compiling these files.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 708e7937cba52982b91244cf89bfbff46d346135
Author: Tom Marble <tmarble@info9.net>
Date: Mon Sep 10 16:54:27 2012 -0500
Changed package name from altosui to AltosUI
commit c2ebebc4967043b16380b8ec8800862993005358
Author: Tom Marble <tmarble@info9.net>
Date: Mon Sep 10 14:50:37 2012 -0500
Test commit (comment) to confirm push works
commit 67da878f740a387d0092631ad672e024d26e4192
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 10 09:16:04 2012 -0700
altosui: Use units conversion functions everywhere.
Provide a configuration option to select imperial units and use them everywhere
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 66a1e07efcac9324d33a1eca0dfb58a2724b667a
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 10 09:14:03 2012 -0700
altoslib: Add imperial units conversion support
"Redneck" mode support
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 51836cedce41d8b36eac34c69370489162aaa2b5
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 9 14:02:57 2012 -0700
Bump version to 1.0.9.7
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e45c47c52f9cc9c43b81148e0e58fdedb3af1eb8
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 9 14:01:21 2012 -0700
altos/telelco: Search for available firing nodes at boot time
Query for available firing nodes, limiting device selections to those found.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 77775711d414227b3ed97859d1b21ab1c689a724
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 9 13:58:29 2012 -0700
altos/telefire: Add steady warble when the LCO arm switch is on
And make debugging a run-time option too.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f2933103be122414a9b1795b37003b7a2aa9f3d7
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 9 13:57:16 2012 -0700
altos/stm: Fix basic time interval to 10ms -- was 10.1ms
Counting from 0 to 100 takes 10.1ms, so count to 99 instead.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0339583996fc57a666f8d3007a0f4b1034039a73
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 9 13:56:35 2012 -0700
altos/spiradio: Label LEDs so that the radio code can use them
Mark which should be on for TX and which for RX
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3fa71c497a5bf576974e70af06762f75734e6699
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 9 13:50:56 2012 -0700
altos: Try to get remote cmac time closer to reality
Record the time after the packet was sent, but before the return
packet arrives to try and more closely approximate the time the packet
arrived at the other end.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 27ab744c6eec9243b7aa14161eec2fbf7003531e
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 9 13:46:23 2012 -0700
altos: Clean up flight data definitions
These just shuffle the various definitions of data macros around to
make the include files more sensible looking.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ced6a020d6d94b1c63837a7ab5b0091b7b8ea3c9
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 9 13:43:45 2012 -0700
altos: include ao_arch_funcs.h at the very end of ao.h
Move it below the definition of the ms5607 init function
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e053da3e7cb5a4c9ebbffd245cb5d83932183b22
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 9 13:11:57 2012 -0700
altos: Allow products without MS5607
The define for a missing MS5607 was wrong, so anything using the fancy
multi-sensor data code would break without an MS5607 in place.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bb5ab29b6744b382bb2f09486a7a6db7d12a3608
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 9 13:10:07 2012 -0700
ao_tools/ao-send-telem: Only start real-time on valid states
Check state to make sure it is < ao_flight_landed to keep invalid
states from switching to real-time playback mode.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 47d87872c11a63a435fe5b703a4ce33503790d96
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 9 13:09:27 2012 -0700
altoslib: Add in a bunch of java files mising after Mike's cleanups
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e2b458a448106ba1ab207f0ea6824b56927d8547
Merge: 9682e9e 3fe9322
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 9 13:03:47 2012 -0700
Merge remote-tracking branch 'mjb/altoslib_mjb'
commit 9682e9e6fe730417a77b47795fbe1f06c9a51177
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 9 12:29:32 2012 -0700
altosui: Use helper functions to access arrays in AltosLib class
These deal with out-of-range values correctly, instead of causing
exceptions that will just break stuff.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d65d921b9b2340fa23d3b55b4ae755324d392303
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 9 12:20:08 2012 -0700
altosui: Catch errors in state value when saving flight logs
Use AltosLib.state_name() instead of directly accessing the
state_to_string array so that any invalid state values are caught and
replaced with 'invalid' instead of raising an exception.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3fe932206f40f4d6f83a4ef49e064109a7a3de92
Author: Mike Beattie <mike@ethernal.org>
Date: Fri Sep 7 18:19:43 2012 +1200
altoslib: move distinct classes to separate files.
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit da053875c12b25b627e83430c3a956a994b435d5
Author: Mike Beattie <mike@ethernal.org>
Date: Fri Sep 7 18:19:07 2012 +1200
altoslib: remove obsolete class
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 218c73b5bd5bd5673dc6f259f62b39541c52d6ff
Author: Mike Beattie <mike@ethernal.org>
Date: Fri Sep 7 18:11:13 2012 +1200
altoslib: move distinct classes to separate files
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 42170d0e3a3b68a9d3db69714e043f7273a714fb
Author: Mike Beattie <mike@ethernal.org>
Date: Fri Sep 7 18:10:21 2012 +1200
altoslib: remove duplicate AltosGPSQuery class
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 82f798e7b1343a56203af2e89790f6de9ab9f98d
Author: Mike Beattie <mike@ethernal.org>
Date: Fri Sep 7 18:09:37 2012 +1200
altoslib: remove duplicate AltosIdleMonitor class
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 88667f7b7dff52eaf5e30f8f83fed0d7f767268d
Author: Mike Beattie <mike@ethernal.org>
Date: Fri Sep 7 18:07:45 2012 +1200
altoslib: rename AltosIdleRecordTM.java to AltosGPSQuery.java
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit bbbe1846346b4ba61330f535a12b7a5029877ee6
Author: Mike Beattie <mike@ethernal.org>
Date: Fri Sep 7 17:53:20 2012 +1200
altoslib: remove dead code
(if object creation fails, an exception will be thrown - not return null)
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 02d31db3d3255568cc348a41aa37a461d63ffde2
Author: Mike Beattie <mike@ethernal.org>
Date: Fri Sep 7 17:52:27 2012 +1200
altoslib: resolve argument/variable ambiguity
(and comment out set_flags() which had no corresponding variable anyway)
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 639f3e5e5171769429eac9e2f17a7b315fd62135
Author: Mike Beattie <mike@ethernal.org>
Date: Fri Sep 7 17:39:25 2012 +1200
altoslib: comment out unused methods
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 369c5e23ac6d65bab4b456ed86737576ac61102f
Author: Mike Beattie <mike@ethernal.org>
Date: Fri Sep 7 17:35:29 2012 +1200
altoslib: access static variables via class, not instance
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit b02c17b26e028a6f3a46781211a86a18272da4d0
Author: Mike Beattie <mike@ethernal.org>
Date: Fri Sep 7 17:34:17 2012 +1200
altoslib: comment out un-used variables
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 20bc23ddb90f8a6da1f7ea70f02cf3a038059d32
Author: Mike Beattie <mike@ethernal.org>
Date: Fri Sep 7 17:32:07 2012 +1200
altoslib: Remove un-needed imports
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit c5e98d2b226824f2012e5710ac4b1596b9f0bfb1
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 6 18:07:33 2012 -0700
altos: Fix radio slave to run lights in the normal way
These were left in a debug mode, toggling instead of flashing.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 01820c3e95fe85d2bee648d41809f1a753f81020
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 1 00:15:16 2012 -0500
Revert "first work on PWM input to TeleScience, 'p' command displays timer 1"
PWM bits not suitable for master
This reverts commit e93c6bcc799d76d4ff425815e2601a25e6796229.
commit 3ccc4a13e3f76bec864d61b0cdfd57c76c6baadb
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 1 00:15:02 2012 -0500
Revert "Timer 3 working with slower clock and all 16 bits."
PWM bits not suitable for master
This reverts commit 49b1ff4c614d24977b33cd17b583acc87acff476.
commit 8c743857525eff778d067068356dec486b9fefa2
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 1 00:14:49 2012 -0500
Revert "ICP3 working"
PWM bits not suitable for master
This reverts commit 75d6aa6f798606f1a6c5a46542065dda81e63b2a.
commit 294b1ec85a37e375a0ac70cbffc6398309d63a7f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 1 00:14:27 2012 -0500
Revert "telescience: correctly calculating rate values with higher resolution"
PWM bits not suitable for master
This reverts commit ada6f2dfc045e77cb9499f20cdec1b4a54ef0db1.
commit ec9e1186dce079a2f2b7be8050216ddb1bc1af66
Merge: 503eabd 6d31f8d
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 31 22:24:16 2012 -0500
Merge remote-tracking branch 'mjb/freq_menu'
commit 503eabd0e351ecdffda1416b7d00f8ef1d6913c9
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 31 22:19:40 2012 -0500
altos: Get mma655x driver limping along
This appears to drive the chip correctly to see values from the accelerometer.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 48a3e6e073e927e456ef4e456e512f6fb8e3b9ee
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 31 21:02:13 2012 -0500
altos: Fix mma665x pin assigment for mma655x
It's on PE13-PE15, not PA5-PA7
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f9af7819de086d9179c3a4d1df7c88ab67a7d7c7
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 31 21:01:21 2012 -0500
altos: Add custom panic noise for self-test failures
Make it easier to tell which component is failing self test
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6d31f8d15ef4bf75ae039dd7b1a6a615d00eb215
Author: Mike Beattie <mike@ethernal.org>
Date: Fri Aug 31 17:53:53 2012 +1200
altoslib: add missing manufacturer parsing for AltosConfigData
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 4e3ac2b624f68dd5a8f6dd7a33eb10cd78497964
Author: Mike Beattie <mike@ethernal.org>
Date: Fri Aug 31 17:42:22 2012 +1200
altosdroid: invert channel/freq ordering
Matches Channel Selector in altosui
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 80bc985f79e616e5327aed4f7acc9bca71b8db54
Author: Mike Beattie <mike@ethernal.org>
Date: Fri Aug 31 16:50:53 2012 +1200
altosdroid: also display channel numbers
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit b6a21856c68ca8cca93eb755285be1927acb91e7
Author: Mike Beattie <mike@ethernal.org>
Date: Fri Aug 31 16:39:10 2012 +1200
ao-send-telem: fix frequency set command
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 543ecb530d6fdf188a746ac59b72544e69bad830
Author: Mike Beattie <mike@ethernal.org>
Date: Fri Aug 31 16:38:21 2012 +1200
altosdroid: complete frequency change dialog
Also implement Service IPC to action request.
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit f1a9fff865e0b226a97ad5d6eaaac64bd5e5d410
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 30 23:07:43 2012 -0500
altosdroid: Start a hacked-up frequency dialog
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6d8858ca1899c8b64f107ebb45711efbb7b8d62a
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 30 16:30:04 2012 -0500
altos: another .gitignore file
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ab9d5bf13e6f1735a0463f4bcab13d65170b7015
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 30 16:28:53 2012 -0500
altos: ao_cc_spi.h isn't necessary for telelco
The SPI radio defines are in ao_radio_spi.h
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b635cb26ba54c8f5c6a958e0ab0bc4d34d33b635
Merge: 354c1fe a8ecf3a
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 30 16:24:38 2012 -0500
Merge remote-tracking branch 'mjb/master'
commit 354c1fed7f06c2c45c661e7265c2ac4bc47e2750
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 30 16:22:51 2012 -0500
altos: Add a bunch of .gitignore entries
Clean up the git status output
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2c59954fdf204f443d9bb28c4a66a30f925ef348
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 30 16:16:52 2012 -0500
altos: Shuffle LCO functions around, add telelco first cut
Pull LCO functions shared between LCO UI and command line into
ao_lco_funcs.c.
Import bits for telelco.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 72d44d14aefcb754b871835aec8d265771357212
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 30 16:14:57 2012 -0500
altos: Disable debug printfs and fix pad ignite time for telefire
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a8ecf3aa4e88d4c76643fb541fb1d5535a454aba
Author: Mike Beattie <mike@ethernal.org>
Date: Thu Aug 30 21:08:41 2012 +1200
altosdroid: Implement voice just like altosui
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 2e6af70c87e7cc62a92b09bbbde745a31d83b5eb
Author: Mike Beattie <mike@ethernal.org>
Date: Thu Aug 30 21:08:06 2012 +1200
altosdroid: Move bluetooth check to first task
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 519887571cee2840024c5c8f4b7f0e5c352d3323
Author: Mike Beattie <mike@ethernal.org>
Date: Thu Aug 30 13:23:29 2012 +1200
altosdroid: add rssi/serial/flight, and re-work UI ordering
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 14022b002d2201fb3ca28292d976c90e2d9a15a2
Author: Mike Beattie <mike@ethernal.org>
Date: Thu Aug 30 13:23:04 2012 +1200
altosdroid: rename ambiguous TextView name
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 91606c89828e60d8cf9a5ea4ff75b951d6fc042a
Author: Mike Beattie <mike@ethernal.org>
Date: Thu Aug 30 13:21:38 2012 +1200
altosdroid: formatting/whitespace, correct ids
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 2137a112b4217d84041f749b8aa5eb8f4d330ba0
Author: Mike Beattie <mike@ethernal.org>
Date: Thu Aug 30 13:20:10 2012 +1200
altosdroid: rework lat/lon to more common format
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit c32325af6605e78c1d1147d466f3ea12ce94124a
Author: Mike Beattie <mike@ethernal.org>
Date: Thu Aug 30 13:19:41 2012 +1200
altosdroid: rename azimuth/altitude to elevation/height respectively.
(Matches altoslib, altosui, altos)
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 8ffa4f9a474026f5a6523b26919a78565e0ed74c
Author: Mike Beattie <mike@ethernal.org>
Date: Thu Aug 30 13:13:20 2012 +1200
altosdroid: move units into code, to match altosui
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 583458772746317b98fced907ec780edff465888
Merge: aea10c1 17b6ffb
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 29 11:29:24 2012 -0700
Merge remote-tracking branch 'mjb/master'
Pull in Mike's fancy new AltosDroid bits
commit aea10c107dff2643677a9c8d1fc41e14f4a66049
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 29 11:25:36 2012 -0700
altos: spiradio debug serial is port 1, not port 0
The SPI link uses port 0; it seems like the having the two try to
share the same wires is a bad plan.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3e7e8e21f2bb823cb6e74c73d0feddbc3a891107
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 29 11:23:13 2012 -0700
altos: SPI radio - use 1->0 for 'done' and 0->1 for 'ready'
This changes how the SPI radio protocol uses the interrupt
line. Instead of a pulse indicating operation done, this now uses a 0
value for done and a 1 value for ready. The key distinction is that
the master can tell when the slave is waiting for the next command
instead of hoping that it got done 'soon enough'.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1b6ed262460ee75fb5bb684d13d19c26c7ea750b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 29 11:22:02 2012 -0700
altos: fix ao_pad debug output for query command
Igniter status is an array these days.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 442f1bfc89528103e2c28f768c954b956e39afc5
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 29 11:21:09 2012 -0700
altos: Use updated pad protocol for lco commands
Stop using the older single-channel protocol and switch to the new
multi-channel protocol
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7f64e62356bcfcd6ba8a88b09251793481bcd56c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 29 11:19:17 2012 -0700
altos: Note changes to configured AES key for SPI radio convenience
Keep a sequence number to mark when the AES key is changed so that the
radio code can avoid sending the key before every CMAC radio operation.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1a7d2faf76a46271532102e217c2dd5515e38b72
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 29 11:16:42 2012 -0700
altos: Wait for IN dma complete on slave SPI send
SPI send double buffered, so the DMA completes one byte too early. Use
the recv DMA to know when the SPI transfer is complete.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 17b6ffb6c090112367eac944494f0fa58da453c7
Author: Mike Beattie <mike@ethernal.org>
Date: Thu Aug 30 01:01:06 2012 +1200
altosdroid: initial attempt at a UI.
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 98f65994ee547feb8cca63ff4ed0fefd3fb2d37d
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 28 23:05:02 2012 -0700
altos: Oops. forgot ao_data.c
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3a3982ceb721910c6a4f75badebb62baa6c6568e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 28 22:43:10 2012 -0700
altos: Add spiradio Makefile
git add doesn't add Makefile by default.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fc9841ee5e92318471b6bec09b7075a788ab8872
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 28 18:13:02 2012 -0700
altos: Mostly working SPI radio link
This includes long delays to avoid overrunning the cc1111 input,
otherwise it works pretty well. The delays mean that we can't capture
the reply to a cmac command though, so more work is needed.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 27a879b4069ccedf8bbe39d7dbecf45000f29d8c
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 28 18:12:27 2012 -0700
altos: Include the radio_cmac debug commands in telefire
Just temporary debugging
Signed-off-by: Keith Packard <keithp@keithp.com>
commit eb1a9a8c3f3d3993d5986925bc4ad112c2bbc119
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 28 18:10:34 2012 -0700
altos: Explicitly erase memory in STM eeprom driver.
This seems to make the STM32L152 happier
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3fe5a70d9ac2114ee554813b1dbb3019a3e4aff7
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 28 18:08:59 2012 -0700
altos: Track protocol changes to ao_pad debug messages
Make the debug output build again.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 18b5021e99c1eef32d2d85f619c84e89cecae7a7
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 28 18:07:55 2012 -0700
altos: Stop providing debug commands in seven-segment driver
The radio_cmac debug commands use the same letter, and this code works now...
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 78cd26eec77adda23ef1b5ca2d91027f1e059868
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 28 18:07:05 2012 -0700
altos: Move radio_cmac test funcs from ao_lco_cmd.c to new file
These are useful in the firing node for testing as well, so move them
to be shared.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f2d919a2147025daa332957cda6d91959e4731ab
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 28 18:05:10 2012 -0700
altos: When sharing radio DMA for AES, use it for in instead of out
We look at the out_done value, but not the in_done value; if we use
the radio DMA for out, we would have to use ao_radio_dma_done to check
for completion. This way, we can ignore that value and use the
existing ao_aes_dma_out_done value.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 31b42b99edbb976534ac432c07e218f13d1f5f9b
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 28 18:03:52 2012 -0700
altos: Fix ao_delay function and move from per-chip code to ao_task.c
ao_delay hasn't been chip-specific for a long time, and it had a bug
in not calling ao_clear_alarm.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ac5d053e6d766d243b7a425ae19779810c350125
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 28 18:02:25 2012 -0700
ao-stmload: Always round up load amount to 4 byte boundary
The flashing code doesn't deal with partial writes.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 68df2b1173e82d48f7857ad2e9325e6a9cbbedfd
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 27 22:45:47 2012 -0700
altos: Enable STM SYSCFG when routing EXTI
The EXTI routing information is in the syscfg unit, so that needs to
be powered up or writes to its registers will be lost.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c677f26852b70bcbb303382c306ce06664fde028
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 27 22:45:20 2012 -0700
altos: No need to initialize EXTI priorities at startup time
They all get set to the correct value when enabled.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5ed88fb72c3e3ecf3333c700d838667db71cfbdc
Merge: adbe64c 621d093
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Aug 28 23:39:53 2012 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Conflicts:
debian/control
commit adbe64c5a9402b7c5075a444a12629131b663877
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Aug 28 23:37:00 2012 -0600
libelf-dev added to build deps
commit cb8f01745c9e8f258f96358b46e1caf17d6b0c9f
Author: Mike Beattie <mike@ethernal.org>
Date: Tue Aug 28 23:20:04 2012 +1200
altosdroid: update Makefile.am for source file changes.
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit c220369953d351f49a5f45bfb5e317859d3a9843
Author: Mike Beattie <mike@ethernal.org>
Date: Tue Aug 28 22:26:12 2012 +1200
altosdroid: Add Dumper class for testing
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 6c985c2b0433a08add3bbf55fdb30102157b4ede
Author: Mike Beattie <mike@ethernal.org>
Date: Tue Aug 28 22:10:26 2012 +1200
altosdroid: add timer to stop service
* Stops when no UI clients, and no bluetooth connection remains
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 781bdb6c15b7dd3cc2280b08a2f47ce0f92cf53f
Author: Mike Beattie <mike@ethernal.org>
Date: Tue Aug 28 22:09:34 2012 +1200
altosdroid: do service start/bind/unbind in start/stop, not create/destroy.
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit ea5fe9e95a888d623329d17d048ee360ea114ad1
Author: Mike Beattie <mike@ethernal.org>
Date: Tue Aug 28 22:08:49 2012 +1200
altosdroid: move methods around
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit c6d667a6ac0decfde5bc8a180b14774e9942dd0c
Author: Mike Beattie <mike@ethernal.org>
Date: Tue Aug 28 22:08:19 2012 +1200
altosdroid: tidy up old messages
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 5c7370dcd7a65c81a3c903a71167e07cfcbade53
Author: Mike Beattie <mike@ethernal.org>
Date: Tue Aug 28 22:07:39 2012 +1200
altosdroid: stop sending device name, just send config data
* Kinda complicated, but ultimately more sensible
* Just send the config data as an arg to MSG_CONNECTED
* keep retrying connection till we actually get config data
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 5ce8c63850dbc6462d7c41ce917e0e06672ec0ab
Author: Mike Beattie <mike@ethernal.org>
Date: Tue Aug 28 22:00:14 2012 +1200
altosdroid: whitespace
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit df7b74909c3794b7b2397275e7fce9226cb99489
Author: Mike Beattie <mike@ethernal.org>
Date: Tue Aug 28 21:59:40 2012 +1200
altosdroid: override add_reply() to add android based debugging
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 9d0f187f06c411f0d82e13ee4f2faea789ed9e79
Author: Mike Beattie <mike@ethernal.org>
Date: Tue Aug 28 21:59:15 2012 +1200
altosdroid: more logical name for connection_lost() method.
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 7664ecc0003151d3f05537f17914df2bf48e4275
Author: Mike Beattie <mike@ethernal.org>
Date: Tue Aug 28 21:58:47 2012 +1200
altosdroid: rework ConnectThread
* Start input_thread after connection, otherwise it's painful to kill
on connect failure.
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 502b24eb2c9c76e4e2bdcc79be0b71a869488b37
Author: Mike Beattie <mike@ethernal.org>
Date: Tue Aug 28 21:55:40 2012 +1200
altosdroid: fix a connection retry having a null pointer
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit c7bef83fd553987f83c0bf7ff37ef941872564fe
Author: Mike Beattie <mike@ethernal.org>
Date: Tue Aug 28 21:54:05 2012 +1200
altosdroid: fix double call of stopAltosBluetooth()
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 150a726e125aa7d181c00348ddd1791fd84164e5
Author: Mike Beattie <mike@ethernal.org>
Date: Tue Aug 28 21:53:01 2012 +1200
altosdroid: Miscellaneous comments/debug/etc cleanup
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 162c640d382b9f823573578fe97584adc94cd9b6
Author: Mike Beattie <mike@ethernal.org>
Date: Tue Aug 28 17:37:45 2012 +1200
altosdroid: miscellaneous cleanup
* Copyright info
* whitespace
* comments
* unused imports
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit ae03d8e87985b9f746e9e22b2394a0a5b4f39f1c
Author: Mike Beattie <mike@ethernal.org>
Date: Tue Aug 28 17:36:41 2012 +1200
altosdroid: Add passing of Device Config at connect
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 03563c765d8b0ab3689c91b2b533c68e11650577
Author: Mike Beattie <mike@ethernal.org>
Date: Tue Aug 28 17:35:11 2012 +1200
altosdroid: Add new "TelemetryReader" class to handle Telemetry
* Add MSG_TELEMETRY messages to both AltosDroid and TelemetryService
to handle passing of AltosState object all the way back to the UI.
* Remove linkedblockinglist from TelemetryService
* (MSG_TELEMETRY is a rename of MSG_INCOMING_TELEM in AltosDroid)
* commented code in case statement inside AltosDroind - won't work with
the objects it is currently passed.
* Add new "MSG_DEVCONFIG" message to AltosDroid - allows TelemetryService
to pass information about the connected device back to the UI.
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit ed653a1e6dc8884cb171af1406fd0999ef125a4d
Author: Mike Beattie <mike@ethernal.org>
Date: Tue Aug 28 17:26:09 2012 +1200
altosdroid: create connected() method
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 621d0930244f25165d2ac5da596dcc87e253b965
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 27 13:52:11 2012 -0700
altos: Add spiradio product
Implements the SPI radio protocol
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 61d094f281431e9f11f806454981da8e1245fb5c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 27 13:51:53 2012 -0700
altos: sdcdb rc file for telefire
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c31d07fb35a5b4d283facf649bed3f0f9802d1fc
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 27 13:49:07 2012 -0700
altos: Add SPI linked radio API
Forward the necessary radio functions over the SPI link
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0f3483f93137f41a61f3fcbe06afcaffb1b9e17b
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 27 13:47:16 2012 -0700
altos: Clean up radio APIs
Move api to ao_radio_cmac.h include file.
Expose ao_radio_test as standard API.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 85fd7ab504a9fac1de90bbe7df8ea477a092c2b0
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 27 13:45:56 2012 -0700
altos: Build telelco and spiradio when possible
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 467acda662de8b96e7d0df729c2e4761686b82a1
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 27 13:44:35 2012 -0700
altos: Expose a signed version of the tick count
Useful when doing time comparisons.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e7443bf350afe273e87a884915ea1e7662630cd3
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 27 13:42:38 2012 -0700
altos: Specify the LCD duty cycle for stm-demo
This is the demo for the large 7-segment displays and needs static drive
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 708d49e498bbdc59bb5af9bf4ca5fcea5689547a
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 27 13:41:13 2012 -0700
altos: Test multiple quadrature devices. Export quadrature count.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8bfe8157cd9fe488d1ee961f200ffa0866322f2c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 27 13:38:44 2012 -0700
altos: Seven segment display driver
Hex numbers and the decimal point.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 28c3923b6180e24a77aecc7162bb2852cec7d770
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 27 13:37:14 2012 -0700
altos: More SPI slave changes for cc1111 driver
Don't enable DMA in the other direction when doing slave transfers.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a27b9b5c36cf748e415ba210c8d8ae72d8227a98
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 27 13:35:39 2012 -0700
altos: Add SPI slave get/put macros to cc1111
Theese don't try to drive the chip select line
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 304909b7534768bfc8da62954effb37ba86806ea
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 27 13:34:12 2012 -0700
altos: Provide interface for STM LCD driver.
This provides a simple function interface for driving the LCD segments
in the STM chip. It also uses the update complete interrupt to block
LCD users during flush.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c1168f40223ca09df23215f2e2fc445a8a03aea9
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 27 13:32:41 2012 -0700
altos: Rename drivers/ao_lco to drivers/ao_lco_cmd
These contain command line functions for testing the cmac and lco
features. Now that there's a telelco-specific ao_lco interface file,
it's useful to have both for testing.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fa8668931cbbc1506560222f2db7e427b514a351
Author: Mike Beattie <mike@ethernal.org>
Date: Mon Aug 27 19:41:47 2012 +1200
altosdroid: Let a freshly connected client know what the device name is!
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 9a41508d92f95012a37bb75603e6e48a2c405204
Author: Mike Beattie <mike@ethernal.org>
Date: Mon Aug 27 19:41:29 2012 +1200
altosdroid: Add Connected/Connect_failed messages
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit e121ec3ae634f41979717281a28af5e4a38e8f3a
Author: Mike Beattie <mike@ethernal.org>
Date: Mon Aug 27 19:40:30 2012 +1200
altosdroid: don't need keys for Bundles anymore
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit afac4d6c82916eea67ac838cd22806bd73db00a9
Author: Mike Beattie <mike@ethernal.org>
Date: Mon Aug 27 19:39:53 2012 +1200
altosdroid: Toast() requests don't need Bundles
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 18c380120fe37a4bdc8f295e86c6c4413d1aa037
Author: Mike Beattie <mike@ethernal.org>
Date: Mon Aug 27 19:39:09 2012 +1200
altosdroid: really don't need to store a local copy of the device name
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 6441437d3b0e848b225a3d6c78ab00e2590c6988
Author: Mike Beattie <mike@ethernal.org>
Date: Mon Aug 27 19:37:16 2012 +1200
altosdroid: remove complexity around message passing
* Don't really need to use bundles
* TelemetryService: Use a local variable to store the bluetooth device object
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit f89e7de20374141b367205aa517a08ee203bfaf3
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 26 09:53:16 2012 -0700
altos: Trigger sample complete when all data are ready
This has each sensor mark a bit in the current data record which is
then sent for processing when all of the data are present.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dec1481786ad54e22634e32109b5ed6e5483938e
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 26 09:52:27 2012 -0700
altos: Shrink STM stack size
512 bytes should be enough for anybody.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d13d0fbfcb0fd6d8a1af46f6270a968d746c830e
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 26 09:49:34 2012 -0700
altos: Make ao_cur_task_index track ao_cur_task in ao_yield
This keeps the two main task references (index and pointer) in
agreement during task switching, avoiding an extra assignment at the
end of the task switching loop.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1c9baa88d6cd931c66d453674322908eb267ba4c
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 26 09:47:05 2012 -0700
altos: Make 'pad' driver useful with telefire v0.1
This reports correct status bits over the radio and to the LEDs for
all four channels, and also makes the firing test command control all
four relays.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ea4db73328e865fd658b573da256ca0004c69c61
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 26 09:45:03 2012 -0700
altos: Add debug command for 74hc597 driver
This dumps the current state of the 74hc597 chip.
Note that this shows that the 74hc597 driver doesn't work, and that
the circuit used in telefire v0.1 can't work.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 89f1a685a02c7808cf03853aa9a5ee50c6baf49e
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 26 09:43:34 2012 -0700
altos: Allow sharing of radio DMA with aes engine
otherwise, telefire doesn't have enough DMA channels.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 58d2b70575f3616a056d2356a737b3be15ed3d66
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 23:38:33 2012 +1200
altosdroid: begin adding TextToSpeech support.
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 11896d22b7bc6e34e3f6109d28f8b6a2d37e6c25
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 23:38:10 2012 +1200
altosdroid: whitespace cleanup
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit f8211fee3c8a5de6925eadca2679441801ac793e
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 23:37:58 2012 +1200
altosdroid: Send device name and connected state back to TelemetryService
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 8fdde3e74c6dce35f90f4575ce6914516fc56aba
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 23:37:33 2012 +1200
altosdroid: re-work connect/thread handling in AltosBluetooth
* Much more resilient to failure
* handles multiple blocked threads better
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit dba71db022ae4a9f7c5fd128b90caa73aa4e99da
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 23:34:59 2012 +1200
altosdroid: remove old commented code
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 38827db5131a2681243649c76bfd1d7d9801f9ba
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 23:34:45 2012 +1200
altosdroid: add handling when restarting BT. delay start after stop.
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 30d107882b62edf4e6d48923209da6ce3dabeef7
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 23:34:28 2012 +1200
altosdroid: set devicename and pass on to clients
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit d95b84b56c63002788939b93b6ce949d921a4892
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 23:30:45 2012 +1200
altosdroid: Send current state to client on connect
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit cf94a86f37284b53e89b13a7eeb871db647c61ba
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 23:30:00 2012 +1200
altosdroid: add missing break; (just in case!)
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 24fe48f66f94c99b8197a612afe6f98e980e9796
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 23:29:25 2012 +1200
altosdroid: debugging statements
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 2ef1723091b0c491ef445474844376185ca4102b
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 23:28:59 2012 +1200
altosdroid: forgot change to IncomingHandler constructor call. oops!
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit d40f96fcc961cfbf6af67fc84591d2660d065ca0
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 23:28:26 2012 +1200
altosdroid: Strings and Layout changes
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 3d6fc5fe462531e05ca4b9be1a421490e067a28b
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 23:26:58 2012 +1200
altosdroid: lots of debugging statements
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 31bffa435cec2098c7ab5c42c829ba6e1578b5d2
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 23:24:13 2012 +1200
altosdroid: need sendMessageToClients() for setState().. oops!
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit a9ec3c96288b7ea4e40586321a0a98edf0c8fee5
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 23:23:33 2012 +1200
altosdroid: Need access to handler inside AltosBluetooth
* Also move add_monitor() call
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit d7173e814c49826f39bba1ff6b024819c555860c
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 23:20:01 2012 +1200
altosdroid: reflect change in message name
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 215d78f06093bd8a8b08a85cae0f1f34aee2a6ec
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 23:19:06 2012 +1200
altosdroid: begin adding state support
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit fe6680dd3b4c31b3d4edc3f06a142f02bcb879df
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 23:16:49 2012 +1200
altosdroid: init device variable... oops!
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 2c5513c51b187ad26a59b193b401f38c35141d27
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 23:16:04 2012 +1200
altosdroid: Rename Connect message, add connected message
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit a6373e84393312ed0fbf22285c704819c2011588
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 23:14:09 2012 +1200
altosdroid: init telem blocking list.. oops!
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 21359f600354e8ee840e839e61ef97d30f3586fc
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 23:13:33 2012 +1200
altosdroid: disable NotificationManager stuff for now
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 54baecc208a40606e3242b2cbd5e66567053646f
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 23:12:48 2012 +1200
altosdroid: Convert handlers to use weakreferences
* Also renamed bluetooth start/stop methods
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit bf7def1a7b93867dfe16fe6499ee028747634c41
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 15:28:58 2012 +1200
altosdroid: Remove Binder import from TelemetryService
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 5f4c47389a3d0d10d659a2e00fc74a150b5fed88
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 15:28:36 2012 +1200
altosdroid: Add State constants for future usage
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 6ffcc82d8d18d3f05d4f5881e50dda298b43c114
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 15:28:09 2012 +1200
altosdroid: begin adding IPC to TelemetryService
* And add imports for LinkedBlockingQueue... oops!
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit a33333b97e810f50db36f345aab71a3200feccc3
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 15:24:19 2012 +1200
altosdroid: remove old Binder from TelemetryService
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit b69796991c1da6baf245349fcc4392668b9b5570
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 15:23:17 2012 +1200
altosdroid: begin adding IPC to main thread
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit bcd53483ccf4bbb2f163a011faae6d19a7bbed0d
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 15:22:23 2012 +1200
altosdroid: Add TBT initialisation to AltosBluetooth
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit ef29a197ce3318404f37e8a0b24d235e8b024a1f
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 15:21:57 2012 +1200
altosdroid: Add debugging statements to AltosBluetooth
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit fb8cd14cca61ca59b95c23e71505607b4509d4ed
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 15:21:36 2012 +1200
altosdroid: Add input thread for reading from TBT
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 5ce132b3366cd120499fcbe22b5fbe96d21b8584
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 15:20:42 2012 +1200
altosdroid: Move constructor for AltosBluetooth
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit b59e7d0b201290f2cb0fd494ef28c1402e11ba3b
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 15:18:44 2012 +1200
altosdroid: clean up stub functions in AltosBluetooth.java
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit d184638be79dafd6fb43df21040eb52402f54ea5
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 15:11:12 2012 +1200
altosdroid: AltosBluetooth.java
* clean up variables/comments
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit bad155538c4630c62ade80afd20830aad37c287e
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 15:10:15 2012 +1200
altosdroid: AltosBluetooth.java
* Clean up imports
* Convert from reflection to using Well Known UUID for SPP.
* clean up local variables
* Add debug conditionals to logging
* remove references to socket type
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit c9689a3ef65ea9da5a7009834add789737ffb6a9
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 15:03:54 2012 +1200
altosdroid: Clean up imports in TelemetryService
* Begin adding AltosLib usage
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit ffdfc08c317f503e30604d058749b24c3ca7bafa
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 15:00:23 2012 +1200
altosdroid: Add service start/bind/unbind to AltosDroid
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 95a34caa8343997bcf7d8969ee8ae3124efcb573
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 14:57:04 2012 +1200
altosdroid: Remove AltosLib import from main thread
commit cfe93315fc0e4b01a95b8e59f24aca96b5a66daf
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 14:55:19 2012 +1200
altosdroid: whitespace
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 3f3da6626ef41b2cab116d6299d2a89cbf7718a9
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 14:54:54 2012 +1200
altosdroid: Re-locate TextView initialisation
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 917f519a4e876087590a3a260fbbccf4c0ac3e31
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 14:54:06 2012 +1200
altosdroid: remove UI components/imports no longer used
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 80bf63702175322053f2b38c4fff56b653ab7c70
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 14:52:30 2012 +1200
altosdroid: excise BluetoothChatService example code
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 372840b4ebfd3da3cd713b6bc6a8ffc8cd6b6b8c
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 14:48:48 2012 +1200
altosdroid: remove TelemetryService activities
service start/stop will be handled by AltosDroid/itself now.
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 24503eb330bf887f5c76afe2aaa9c9f2ce177460
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 14:44:09 2012 +1200
altosdroid: whitespace (spaces to tabs) (part2)
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 7aab6e6b6e361455a7515fe6db7b0e9a6e4c786c
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 14:29:36 2012 +1200
altosdroid: whitespace (spaces to tabs) (part1)
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 0f3597389977f86a8c1bdff1b7f46107c43ef306
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Aug 26 12:41:24 2012 +1200
altosdroid: Update copyrights
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 7ecb429fe4682faf209452b1738ff3c8096fc5d5
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 24 00:46:55 2012 -0700
altos: Configure telefire SPI and LEDs correctly
This places the telefire SPI bus on USART1 option 2 and
marks the various LED functions with symbolic names.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 310c1d0bf83448eb12e5d64ac09a4279c25fd258
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 24 00:44:35 2012 -0700
altos: telelaunch doesn't need ao_radio_cmac_init
This function was used to initialize the LCO functions, which were
moved to ao_lco.c a few commits back, so ao_radio_cmac_init doesn't
even exist anymore.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6581fa1641882198c870c2f7b1340794b9d47f29
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 24 00:42:32 2012 -0700
altos: Get ao_pad.c working on telefire v0.1
Monitor all four channels, allow any channel to be fired.
Turn on power LED at startup time.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 83e0d4352041b3964ea7a133b0f67da9ebaa1c77
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 24 00:40:27 2012 -0700
altos: Split out LCO functions from ao_radio_cmac.c to ao_lco.c
These functions are not used in the telelaunch or telefire nodes, so
don't force them to be included.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c64999c39d6d9242f98bdc9312436c3333115bfd
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 24 00:39:46 2012 -0700
altos: Have radio_cmac turn on LEDs as appropriate
Use AO_LED_RX and AO_LED_TX defines if present to control LEDs during
radio operations.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a8e9906513227600599da12b268ff5f807ae98c7
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 24 00:34:55 2012 -0700
altos: Add 'ao_led_set_mask' in the PCA9922 driver
This lets a subset of the LEDs be controlled independent of other LED settings.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 50b58d703b8b48005a3ca9ad4e3603d6f7ac1430
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 24 00:33:38 2012 -0700
altos: Make cc1111 SPI pins configurable
Allow either USART in any configuration. Still only supports one SPI
bus though.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7a0ed0ff4192060854d69e640de2c30105eb2f62
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 24 00:27:13 2012 -0700
altos: Disable telefire 'pad' listener when testing radio
Ensures that the radio testing won't block waiting for a firing mode
packet to arrive.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 659c0cd3ee4b9581c12ac2cd1b4162bf07a921ce
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 19 10:02:16 2012 -0700
altosui: Check for JRE 1.7 in Windows installer
altosui runs fine with version 1.7 (on Linux at least), so allow that
version to satisfy the java check instead of requiring the user to
down-grade to 1.6
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ab1279cc6a683595631d7ac8bed7b36e0c8a691c
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 18 22:51:47 2012 -0700
Here's the button driver and event queue logic
These were neglected in the commit which was supposed to include them
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 93db8febda03d9a02c5c1ccdc6ad44eaf00a433b
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 18 21:26:34 2012 -0700
altos: Add MMA655X driver
Just debug code at this point, will complete on real hardware
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8457ca81adc9d62a7ffe56a7c0c36f2fcadaa682
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 18 21:25:34 2012 -0700
altos/cc1111: Document SPI bus pin options
Just a comment in the source code about which pins each option selects.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f46d94ca5c969c88dd307d1b684d6fafa2157020
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 18 21:24:16 2012 -0700
altos: Use split SPI bus for MS5607 sensor
Leave CS low while releasing the SPI bus when waiting for conversion
complete -- other SPI bus users will use another set of pins.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a1a48aa9ee0bf7fa6720b34c0f544485caea7cac
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 18 21:21:58 2012 -0700
altos: Allow STM SPI bus on multiple pin sets
This allows multiple STM pin groups to be used for each SPI
bus. Useful for the MS5607 sensor which signals conversion complete on
the MISO line.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 00abbbb79de67dc95176fe48b23ce3e8614e8d3a
Author: Mike Beattie <mike@ethernal.org>
Date: Wed Aug 8 07:07:49 2012 +1200
ao-send-telem: make --realtime work
(add "break;" to the case statement for options)
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 9456332fc16269270a2e9b7ef0b54523800cfe27
Merge: bd02349 4d4ad34
Author: Mike Beattie <mike@ethernal.org>
Date: Wed Aug 8 06:49:15 2012 +1200
Merge branch 'master' of git://git.gag.com/fw/altos
commit 4d4ad34aec0c75c66162b992f1e52947e4685730
Merge: c7f2285 8e4ebd1
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 7 11:48:20 2012 -0700
Merge remote-tracking branch 'mjb/master'
commit bd02349111ae0f39b320e6a10a330051ddc39fdf
Merge: 8e4ebd1 c7f2285
Author: Mike Beattie <mike@ethernal.org>
Date: Wed Aug 8 06:46:56 2012 +1200
Merge branch 'master' of git://git.gag.com/fw/altos
commit 8e4ebd1f6eb928b5cb7bcda4ed88851aa9e61bdf
Author: Mike Beattie <mike@ethernal.org>
Date: Wed Aug 8 06:45:03 2012 +1200
Add ao-send-telem to .gitignore
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit c7f228503870c44dfd278ede8b0980dbac73d3c7
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 7 11:32:16 2012 -0700
altos: Fix .sdcdbrc file for telebt-v0.1
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c58f3d1a373b20fac3f51037008bcc40955f1348
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 7 11:30:47 2012 -0700
altos: Oops. Serial 1 stdin was busted by typo
A typo in the symbol used to enable stdin wakeups from serial1 caused
the input to pend until some other wakeup occurred.
This also makes the serial1 hw flow control pin selects in config 2
work right, although those aren't used by any current product
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 46f87373bc8c28442273ee4f8da3a352223150f5
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 6 22:53:52 2012 -0700
altos: Add button driver and event queue
With this, a single task can wait for any button or quadrature input
device.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 11046bc89b3ce6386f1005fc8476b08f54d6f5fb
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 6 21:54:58 2012 -0700
altos: Support multiple quadrature encoders.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5f7e61c749b02ed16e368502062e39b0471e9257
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 6 20:20:32 2012 -0700
altos: Fix up quadrature driver
Mostly works now, should work reliably with a bit of input filtering.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ab379493dbe9923db8e458d2f4e0344df17d331c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 6 19:35:02 2012 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
altos: Test quadrature driver
commit b0b52ca73bc836336ecc70247a9ed1dd633920d9
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 6 19:34:34 2012 -0700
altos: Add quadrature driver
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6171892fa32e8a662a494ec6ba28a82fddc68589
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 6 19:33:44 2012 -0700
altos: Add ao_gpio_get and ao_exti_set_mode
Needed to support general GPIO interrupts
Signed-off-by: Keith Packard <keithp@keithp.com>
commit de701d5a234cd21930cf92c9cabebb0e230da9b5
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 5 14:58:40 2012 -0700
altos: Build ao_kalman.h from cc1111 subdirs as needed
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fc9aed1ef3485d259722c9b89e19969e0afe257c
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Feb 26 22:30:09 2012 +1300
Adjust service to be persistent.
* Run as a foreground service -> high priority
* Notification set to display as "Ongoing".
Changed logo to be in colour at keithp's request. Greyscale logos still present as *_g.png
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit b80d1f4e8a2df3ace64468a38a815a4f982aa179
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Jun 10 20:04:24 2012 -0600
move from Debian packaged sdcc to new cc1111 package forked from 2.9.0-5
commit 0f82021186565fda10df7893b95deae4a1f32778
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 5 12:17:25 2012 -0700
src/cc1111: Enable SPI slave mode
This is untested...
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 39594fdb3e30a1a25dd894c217e3d9d773bab972
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 5 12:16:25 2012 -0700
src/cc1111: Allow serial0 without serial1
The ao_serial_speed structure is needed by serial0 too.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2610b316eb939c1532061646b05207fcd54d984f
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 5 12:15:36 2012 -0700
src/cc1111: Add ao_gpio_set macro
Allows general GPIO-using code to run on cc1111
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 82a37d70e3cacf792c1aa18f8c0d2a19d6f321ed
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 4 22:58:48 2012 -0700
altosui: Move 'implements Runnable' from AltosSerial to AltosLink
AltosLink is the class providing the 'run' method, after all...
Signed-off-by: Keith Packard <keithp@keithp.com>
commit af34baf5dc587bee4cffa699ef383f85dde8c7cd
Author: Mike Beattie <mike@ethernal.org>
Date: Thu Aug 2 23:38:26 2012 +1200
Reduce size of textview.
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 359d7353fd7b7d4d537db04c5e89724502333ff8
Author: Mike Beattie <mike@ethernal.org>
Date: Thu Aug 2 22:09:24 2012 +1200
AltosDroid: Begin re-working Bluetooth code
* Move to using explicit 'magic' UUID, rather than java reflection
* Re-work UI to make it more useful for testing
* Use Insecure RFCOMM only, and remove code that differentiates.
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit c5304ac976dd44344a0b70ae3622e1f2d112a147
Author: Mike Beattie <mike@ethernal.org>
Date: Thu Aug 2 21:20:23 2012 +1200
Fix min/target SDK versions
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 7481d06bebc2dc1473f451971d8b744c9da4e726
Merge: 599e28b c56dead
Author: Mike Beattie <mike@ethernal.org>
Date: Thu Aug 2 21:18:15 2012 +1200
Merge branch 'master' of ssh://mjb@git.ethernal.org/~/git/altos
commit 599e28b2242c79bdd0960ef16e580e51a2fa3795
Author: Mike Beattie <mike@ethernal.org>
Date: Thu Aug 2 21:16:54 2012 +1200
Re-work external lib support for newer Android SDK
* Remove older *.properties methods of locating lib dir
* clean up Eclipse classpath file
* adjust Makefile.am to link AltosLib.jar into libs/
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit c56dead72f65e7468017656347dba531ab2ca480
Author: Mike Beattie <mike@ethernal.org>
Date: Tue Jul 31 20:05:35 2012 +1200
Ignore autogenerated file: altosui/Info.plist
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit fb79f8fb358f8df25674336cd558fc3998cb7d9e
Author: Mike Beattie <mike@ethernal.org>
Date: Tue Jul 31 20:04:34 2012 +1200
Don't build ao-stmload if stlink is not available.
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 2e7e304e67bc1e094282c8668fa8cccf09f9c9b4
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jul 29 19:48:08 2012 -0700
altos: Add driver for STM internal flash
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 843fcab46d633e5bb6959286adeb68e41a4c30a3
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jul 29 19:44:56 2012 -0700
altos: Add telefire-v0.1
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e4d244eefa4c779cd9c8a91389bf998c54705b72
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jul 29 19:42:53 2012 -0700
altos: Add software AES implementation
This is untested
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 21e39811bd234c6f66ab7644864fcc1b8c316998
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jul 29 19:36:50 2012 -0700
altos/cc1111: Fix serial 0 option 2 pins definitions
tx/rx are 4/5, rts/cts are 2/3
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 743dca54012758d3ae54312d542b34afa88495cd
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jul 29 19:35:15 2012 -0700
altosui: Remove duplicate values from info table. Add altitude
No need to have state/call/serial/flight data, those are all in the
header. Having altitude makes Monitor Idle slightly more useful.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0bf21399d3d47d58410df4c6ce89fc20fcd42c89
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jul 29 19:34:00 2012 -0700
altosui: Handle Monitor Idle errors better
Deal with missing data by checking for MISSING in more places.
Handle serial communication failures during send by reporting back
from libaltos.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 59588ba34159b27c02e1a886b46497ecfa0cf4d3
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jul 29 16:22:23 2012 -0700
Add ability to re-play telemetry through TeleDongle
This adds a new command to TeleDongle to send arbitrary data, and then
creates a new tool, 'ao-send-telem' that replays existing telemetry
files through TeleDongle.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 52e920bc7a98edf5c6f2ad0bd59d581011dcd5c9
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jul 22 15:18:27 2012 -0700
altos: Move ao_radio_cmac.c to core (it doesn't depend on hardware)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 233ab58df8ac8e1fdeab8d4c2f6c8c9d3f6e7be1
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jul 22 11:53:44 2012 -0700
altosui: Move AltosIgnite.java to altoslib
To be shared with altosdroid eventually
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 38f66a31174dd367e39d717c527f555add60a9d4
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 20 12:04:17 2012 -0700
tools: Use pkgconfig to find stlink for ao-stmload
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e033a72d3f420e18ed24354c7dfc7e1317a03fb6
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 20 11:08:22 2012 -0700
Add stlink pinout
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 15ebd9c75aa57572040e3b1ee41e6f3eb8cf92ee
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 19 09:46:20 2012 -0700
altosui: Delay starting KML output for flight and GPS coords
Don't start outputing KML data until the telem record containing
flight number and GPS coordinates are present.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ada6f2dfc045e77cb9499f20cdec1b4a54ef0db1
Author: Robert Garbee <robert@gag.com>
Date: Wed Jul 18 18:41:00 2012 -0600
telescience: correctly calculating rate values with higher resolution
commit e2b472bbb2418fc13be42dbc7c52beb88479c46d
Merge: 75d6aa6 b242f27
Author: Robert Garbee <robert@gag.com>
Date: Wed Jul 18 14:25:27 2012 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 75d6aa6f798606f1a6c5a46542065dda81e63b2a
Author: Robert Garbee <robert@gag.com>
Date: Wed Jul 18 14:24:05 2012 -0600
ICP3 working
commit 49b1ff4c614d24977b33cd17b583acc87acff476
Author: Robert Garbee <robert@gag.com>
Date: Wed Jul 18 13:41:27 2012 -0600
Timer 3 working with slower clock and all 16 bits.
commit b242f2756a8d9419a9bdba890b9e6b73560bdc19
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 18 00:03:54 2012 -0700
altosdroid: Start adding an AltosLink subclass for android
Will talks over bluetooth while providing an AltosLink APi
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f164e48cbeff521d45737794e2046a08322951d6
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 18 00:01:51 2012 -0700
altosui: Make scan UI handle incremental telem data
The new telem format doesn't send everything in each telem packet, so
we need to handle updating information incrementally in the scan
results. This involved clearing old scan data when switching
frequencies and then updating existing entries with new data as it arrives.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a698cd68968fc0be5f96b1729cdea2f65d2ccbf6
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 17 23:59:13 2012 -0700
altos: Toggling telemetry monitoring would replay the telem queue
Using the 'm' command to turn telem off and back on would end up going
around the whole telemetry queue replaying everything there as the
wait loop would exit when disabling monitoring even if the ring was empty.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9fd5e3c28fb0fd6da8641e7dd18b9912866d1b75
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 17 21:06:07 2012 -0700
altos: With debug cables disconnected, CC1120 seems happy at +16dBm
Let's see how it goes...
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 700818c8ff0518e79bff2f0e80b2cc3cb3b48bf0
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 17 21:04:58 2012 -0700
altosui: Accept variations in spacing for igniter status reply
Megametrum uses different white space; just deal with it here.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f6921c9040b1f1fc4408d163532b0695a3611195
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 17 21:04:23 2012 -0700
altoslib: Move idle monitor managing code to altoslib
More stuff to be shared (potentially)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b4be63627e146c7c868b5b3468d34880a561cfba
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 17 20:44:55 2012 -0700
altos: Megametrum ADC values are 12 bits, discard low 4 for telemetry
We've only got space for 8 bits for the ADC values for pyro channels,
discard the low 4 bits instead of the low 8 bits.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 97c1cfee929a35dd1596dc02ce519b80132f3c5c
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 17 20:43:31 2012 -0700
altoslib: Don't use MISSING values in max computations
Early telemetry state may be missing critical data, don't use MISSING
values in computing max ranges.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 99b7eaf8d1b312443b842d078fb8464032b3a39b
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 17 20:42:42 2012 -0700
altoslib: Fix MM conversion functions
Pressure is already reported in Pa, no need to convert that.
Voltage divider computations were backwards.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e93c6bcc799d76d4ff425815e2601a25e6796229
Author: Robert Garbee <robert@gag.com>
Date: Tue Jul 17 13:23:48 2012 -0600
first work on PWM input to TeleScience, 'p' command displays timer 1
commit a5d873d47b3b16ca32559b4de668bf07b25eddb0
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 17 01:24:52 2012 -0700
altos: Place STM config values at fixed addresses for re-use
Just like cc1111, stick the serial number and radio calibration values
at known fixed addresses so that when re-flashing the board, we can go
find the existing values.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 20877ae9de8bb5d3a29e2a96024e53afbd396f55
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 17 01:18:45 2012 -0700
Add ao-stmload tool
This loads an ELF image through the STlink programming interface using
the stlink utility library
Signed-off-by: Keith Packard <keithp@keithp.com>
commit eda636c5f309b85282b4142118ee65673d28d137
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 16 15:36:20 2012 -0700
altosui: Skip unknown data when parsing ADC for idle monitoring
This resolves an infinite loop when talking to megametrum.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 52196975c447851f14619213c1de5101d334eebc
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 16 15:35:11 2012 -0700
altosui: Move serial datastream parser to altoslib
instead of having it in altosui
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0edb5616a70fd480317acc99ec3c28c662aa8556
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 16 15:34:01 2012 -0700
altos: megametrum depends on ao_companion.h
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5860f75677ee20fcf35ab89a6b62f3e14a1c32f5
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 16 15:32:26 2012 -0700
altos: Enable pyro channel control in telepyro
This should make the board actually work now.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3ce645a79b54e22d7835c6e390a22a5ad501a339
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 16 15:30:29 2012 -0700
altos: Add manual firing command for extra pyro channels
In parallel with the existing igniter commands, this tests the
programmable pyro channels
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6581eefbdbd8d3e94f615bdf11652a000d131c8e
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 16 15:27:58 2012 -0700
altos: Use 'HAS_ORIENT' to enable orientation selection in pyro code
Don't expose orientation options when no orientation data is available
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1887ca3d7d4a0259686f8c1e68d1e47c47b4ab84
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 16 15:25:47 2012 -0700
altos: Pass flight dynamics to companion boards
Necessary for TelePyro
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 90507d4f7ef77b0870a032b1d9809898c2924721
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 16 15:24:21 2012 -0700
altos: Make ao_tick_count visible
Necessary to fetch it when interrupts are already disabled as we can't
call ao_time then.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 184e2ff4790974733df57facdeeb96bfe692ab54
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 16 15:21:21 2012 -0700
altos: Remove some debug code from avr ADC driver
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e7ca3a7849b3cbbb38143d35fe86972290bd4e61
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 16 15:18:12 2012 -0700
altos: Make sure telepyro ao_product.h is built before .o files
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4de789331098abc24abcb9390a35aef889a41784
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 16 14:47:53 2012 -0700
altos: Make storage addresses datatype configurable
No sense using 32 bits for tiny hardware
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 84d5e00d417af4924594908d19346bb965089cdd
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 16 14:44:40 2012 -0700
src: Add driver for AVR internal eeprom. Use for telepyro config.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2a23030031c31267fc4f14accd9220f285c03b61
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 16 14:40:49 2012 -0700
altos: No space for pyro help on TP v0.1
AVR doesn't have enough ram to hold the help messages, and we can't
use them in flash.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 366217e86a4c353012b5102322ee6927f7b27a21
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 16 14:39:05 2012 -0700
altos: Remove unused 'func' from ao_config_set
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 81b7b58c9df01847fa47747deeff8c3c91304ad1
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 16 14:37:58 2012 -0700
altos/avr: Remove debugging command from USB driver
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 42a51becf4b76f23dbd4f5f80f8879ce696aa543
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 16 14:36:51 2012 -0700
altos/avr: Remove debugging printf in avr stdio startup
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0cfd22baa6af44e053428c30c1a95cf5551b68af
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 14 02:44:17 2012 -0700
src: Add explicit 'pin' argument to ao_enable_output
This lets the cc1111 use the atomic bit operation instead of a mask,
which is immune to interrupt issues as well as being a shorter code sequence.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 37032e4b0cbac4c823e3dd18e60ad8900e9ceff1
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 14 01:29:50 2012 -0700
altos/megametrum: Support the four additional pyro channels
These use the new pyro code to allow for some flexibility in programming.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 82b50fc1b7f2c6af7264fbad2c35508abc15e81e
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 14 01:28:55 2012 -0700
altos/stm: Expose ao_gpio_set which sets a specific GPIO pin
Will need versions for other architectures
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 726e0f2c547b6bae1f1e640e2c1155c0b9631a9b
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 14 01:28:31 2012 -0700
stm: running out of memory in MM -- reduce stack to 668 bytes
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d90587535676f9492f0fde6b974353158104ef88
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 14 01:26:38 2012 -0700
altos: Add arbitrary pyro channel support
Programmed by specifying a conjunction of flight conditions that
trigger the igniter to fire.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 09633cac697e37d770b2b666ab20cab30628484f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 14 01:24:14 2012 -0700
altos/stm: Force STM stack to start at the top of RAM
Using a fixed size means crashing if there's not enough space for
that, or wasting memory if there's too much.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b5f6d4e5251a825395c93916afa3af659c678498
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 11 19:15:32 2012 -0700
altosui: Abstract remote connection timeout stuff
This moves some of the logic for managing when to present the 'cancel'
dialog for remote operations to altoslib.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f078a591cf2fafe89bb1bb883f49d80750129d44
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 11 14:28:53 2012 -0700
altosui: Remove a bunch of debugging printfs
These aren't useful at this point.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 846a6298e4a8bfbe87bb24d7b0802c0bf6f233be
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 11 13:53:30 2012 -0700
Report RSSI values in monitor idle UI (trac #44)
This adds a new 's' command to TeleDongle to report RSSI value from last
received packet, and then has AltosUI request that value when closing
the remote link.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cf44ea354c2d1780cee343132c6058e11e9eefa3
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 11 13:52:32 2012 -0700
altos: Fix gcc compiler warnings in GPS code
unused variables and mis-matches in printf format codes.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fe70611c3c7d4b8cce3b5292f0ec549f3191bf86
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 11 13:50:56 2012 -0700
altos: Create macros to convert from/to radio RSSI representation
AO_RSSI_FROM_RADIO and AO_RADIO_FROM_RSSI.
Removes a bunch of open-coded versions of the same function.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 18431c88c8a6cb267922b97192e8b7ddb88d0e7e
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 11 13:49:26 2012 -0700
altos: Have 'make clean' remove all programs, even old ones
This makes sure that changing version numbers doesn't leave old
compiled output lying around.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 726f47c8a07f060aed930e1d102a1e8b5a5c7aed
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 11 13:47:25 2012 -0700
altos: remove optimization for 'help' that confuses cc1111 compiler
The cc1111 compiler gets this very wrong and prints piles of garbage
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7be98836e69a222b2f9f4baacddcf12d168e2207
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 11 13:40:54 2012 -0700
Add megametrum outline to doc dir
And install it alongside telemetrum-outline
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cc5d106f014f714a9a2d5f595a2de0da8f7da80a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 11 13:40:07 2012 -0700
altos: Ignore megametrum built files
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 675ccd41e3b668cd4e1d2dd282dd317a00d00151
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 11 00:35:21 2012 -0700
Get AltOS version numbers into Mac 'about' dialog
Generate Info.plist from Info.plist.in to correctly set the VERSION
information. This also changes some strings around to make them look better
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 46407f7f3e4d2b6e74b3a2e90b38736a792cfc54
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 10 22:41:59 2012 -0700
altos: Force 434.550Mhz by connecting debug gnd and clk (trac #41)
Check for pin P2_2 low at startup and set the frequency to
434.550MHz. This value won't get written to flash, so rebooting again
will restore the configured frequency.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit aa305da7e5dc182c99c09e422c053d85ed48d5d5
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 10 22:09:44 2012 -0700
altos: Continuously update ground state while on pad (trac #42)
Average data for 5 seconds, wait 5 seconds and if still in pad mode,
replace the existing data with the new data. This should avoid
averaging in boost data while still keeping things reasonably current.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0b92164143aaf0d2aa3d5d742484391c16545289
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 10 22:08:28 2012 -0700
altos: Set HAS_FLIGHT_DEBUG=1 to include the flight debugging commands
This leaves USB enabled, and adds the 'F' command to dump
internal flight state.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fb60d87b02c0fc83a0b4268212f0b6b740c984e3
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 10 20:35:19 2012 -0700
altos: Signal continuity over radio in pad mode (trac #40)
This is especially useful for telemini which has no beeper, allowing
you to hear the continuity signal while at the pad over the air.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bca72b782a2909ecedef15ad589292647221ca56
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 10 20:34:02 2012 -0700
altos: Add 'void' parameter to ao_fec_decode callback parameter
This keeps the compiler from whinging about the lack of a prototype.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit aafa8859ecb27383f697b98f6991643b44f4721a
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 10 20:32:31 2012 -0700
altos: Save some memory.
A few minor space savings in ao_cmd.c and ao_config.c. Don't build
unused conversion functions ao_altitude_to_pres and ao_temp_to_dC
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a60c5a728530e4659a6750d8d5b87000735d4531
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 10 15:15:00 2012 -0700
altos: Improve ao_flight_test a bit
Add -i flag to include flight description
Have run-tests know how many failures to expect
Add run_baro to plot a single flight using the baro-only mode
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b89d37d357273b97050c00d7fe12022e32799fa8
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 10 15:13:55 2012 -0700
altos: add some (unused) test code for different soft-decision sizes
This lets us experiment with hard-decision and other possible
soft_decision bit depths.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6694cedd560a7ea9520ef11472c2770b489187c0
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 10 15:13:18 2012 -0700
altos: Eliminate compiler warnings when building ao_flight_test
We turn on a pile of warnings for that.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1ae3f467a1d7be2fc3b1a45ba12568a3a25a0099
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 10 15:11:36 2012 -0700
altos: Rename *_mm.c back to *.c
Was just a temporary hack to keep cc1111 products building during MM development.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 702ca87983594880d7926d2317d63802af82746e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 10 15:07:34 2012 -0700
altos: remove stale ao_flight.c and ao_sample.c
The mega-metrum versions are now the official versions
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 31b05454ec8d90b89fa3039563ff0e86ae80b2a0
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 3 21:02:20 2012 -0700
altos: Move profiling settings to Makefile
Instead of splitting the changes across Makefile and ao_pins.h, put
them both in Makefile to simplify enabling profiling.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 939ad8bfd640ed55116703a58f87af06e75ef87e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 3 21:01:01 2012 -0700
altos: Crank up the gaussian noise in the FEC test
This lets us check to make sure our receive performance isn't
degrading at all, instead of just making sure we can receive
perfect packets well.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e8ab00cc45e48230e3b2018ce959114d3fedd228
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 3 20:59:35 2012 -0700
altos: Viterbi performance improvments. Down to 5.7ms for command decode
Stealing more of Phil's good ideas, decoding a command mode packet has
been reduced from 9ms to 5.7ms. Lots more comments to help future-me
figure out how this code works.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ea957f9e6144f8411ac84ee2905700f55f5a6e8a
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 3 00:29:43 2012 -0700
altosui: Fix flight data download for TM. Look for MM flights when graphing
A couple of minor fixes, the first to not force the log format so that
TM/Tm data will be downloaded correctly and the second to expand the
set of files to include '.mega' files when plotting data.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 933fc7e4c2f617e49e1cfdf45b83695290b51456
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 2 23:44:10 2012 -0700
altos: Do not block igniters on the radio mutex.
Blocking igniters on the radio mutex fails when doing igniter testing
over the RF link; the packet receiver task will never release the
mutex and the CPU at the same time, causing the system to lock up.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 50b343d389039eae082e82b8ac0b76ae3e2b3ad4
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Jul 1 23:24:20 2012 -0600
extend cross-compiler availability logic to all target CPUs, not just ARM
commit f0ec8416f2e308e40e1b9f34a7c2549989fee5fb
Author: Bdale Garbee <bdale@gag.com>
Date: Sat Jun 30 13:00:33 2012 -0600
conditionalize build of ARM binaries on presence of arm-none-eabi-gcc in PATH
commit edbc5d27c8c2936b59ff5289276d9198b501ebc8
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 28 17:43:36 2012 -0700
altos: Declare cc1111 accel_ref as unsigned so the math works
If accel_ref is signed, then the careful shifting and dividing dance
necessary to correct for changes in the relationship between the 5V
and 3.3V supplies always generates zero.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ccf64117662fc800a07b3a25e52255b80f8b5eaf
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 28 16:42:59 2012 -0700
Update version to 1.0.9.6
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ca1bc20735a170a77066f5f37e0ad728899a3989
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 28 16:05:56 2012 -0700
altos: Disable MS5607 interrupt in the handler
Avoids having the interrupt re-raised multiple times until the reading
task finally wakes up.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 572e1664938c7ce6c308b36779f6a412959e03f1
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 27 23:11:27 2012 -0700
altos: Track missed HMC5883 interrupts
When it fails to signal conversion complete to the CPU, keep track of
that and report it with the rest of the current data.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 79dbe1a5e46d7f0b8929400897631ab969cd2bc0
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 27 23:09:16 2012 -0700
altos: Increase default STM stack to 648 bytes
512 seems cozy given the printf implementation we're using and the
extensive interrupts.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit aab7b31b71aa7c87c5a5003084e4b7773c30835f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 27 23:05:36 2012 -0700
altos: panic if MPU6000 self test fails
Don't try to fly if the board isn't working right.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f9f65211c378849270a6138fda05ed2a166f7d82
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 27 23:04:25 2012 -0700
altos: Disable mag sensor for megametrum
It doesn't work unless USB is connected or occasionally while the
debug port is enabled. It's mystic.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dd623b21cb904238c6d903b6936ff2f8ebf6f339
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 27 23:03:33 2012 -0700
altos: Allow megametrum to be built without using the mag sensor
I'm having trouble getting it working reliably, so we'll like disable it
for now. This patch makes that possible.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bd21c050fd8b96b33ab6859c942bf55cf2b91868
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 27 19:47:52 2012 -0700
altos: Make profiling Viterbi decoder more useful
This blocks starting the decoder until all of the data have arrived so
that the time spent in the decoder is easily computed.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 407cefae9cb95c5910b3bd79851776c48729e06b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 27 19:45:22 2012 -0700
altos: Unroll viterbi state loop for >30% performance boost
9.3ms vs 14.7ms, a clear win.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4f258fe565dc3e58b83761bfa1a2276946012163
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 27 17:18:57 2012 -0700
altos: Clean up STM I2C clock computations
Fix both clock time and rise time.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 84f9a525c64491afa9b7a565e3c10a4cee106e14
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 27 17:17:44 2012 -0700
altos: Clean up radio CRC handling
Make the FEC code just set the CRC_OK bit like the cc1111 radio does;
eliminates a bunch of weird conventions across the FEC API.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b0b7f5da2d29716959c6793d744e47a3d435c247
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 27 14:38:35 2012 -0700
altos: get MPU6000 I2C link working reliably
This slows the i2c bus to 100kHz (yuck), sets the rise time to spec
(it was way off) and adds more delays during bus setup. I've run this
for hours now without trouble. Will try to adjust things back to fast
mode and see if I can make that work as 100kHz isn't fast enough to
reliably get data at 100 samples/sec.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e63d624f9670b5e2e002fcd5f24b80cf7f1effdf
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 27 14:35:56 2012 -0700
altos: reorder stm USB state stores to avoid races
Must set ao_usb_in_pending before telling USB about new data or an
interrupt could arrive at the wrong time to clear it.
Same for ao_usb_in_flushed.
Without these changes, I've seen the USB bus lock up on occasion,
waiting for an IN packet to consume data, but with no IN data pending
in the hardware.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 08a4ed8fe794a2b2b52147bd5535fe0954822e95
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 27 14:34:53 2012 -0700
altos: include targe SPI speed in get request
STM needs it to be provided when enabling the SPI device, so just fix
AVR and cc1111 to do the same.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1a1d4a557a30e2e743936b828b654187ec562ca8
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 27 02:46:27 2012 -0700
altos: Wait for i2c START condition before setting interrupt bits
This seems better than the random loop that it replaces, but I still
have no idea why this is required; it doesn't coorespond to the docs
at all...
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9695a217e13f9d194b6dc40e2696017e5f8e8176
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 27 01:22:32 2012 -0700
altos: disable FEC debug on MM
Seems to work; we'll leave the code around in case something bad
happens later.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b96eece8e42df0713fc92d47b6bb27604c0168a2
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 27 01:22:00 2012 -0700
altos: Clean up cc1120 driver a bit
Make some variables static, remove stale debug code
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a00aff5ee93ea9763b5c0466fcecc823cad135ef
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 27 01:20:43 2012 -0700
altos: Don't try to grab radio while firing MM igniters
If you're in idle mode, you stop forever as the packet mode receiver
will own the radio mutex forever.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8fc643c9768f0db31a248331681af9490f5715af
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 27 01:19:05 2012 -0700
altos: stm i2c debug code was calling flush() even when disabled
The fancy stm i2c debugging code had calls to flush() that were
invoked outside of the conditionals leading to all kinds of fun --
flush() may re-enable interrupts, yield or do all kinds of wacky
stuff, none of which is appropriate from the middle of a device driver
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0285696e5280fc64774b6c3a2fcdaa36bd36ae7c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 27 01:17:51 2012 -0700
altos: mpu6000 requires a delay during start
I have no idea why this is required, but the mpu6000 will not come up
and run if this isn't present.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4847595e0383e5ff9c5a373f3c7f2af8c210c50a
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 26 23:25:00 2012 -0700
altos: ao_ignite.c is no longer cc1111 specific
Move it to core
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8efac8eb99a9aabb45d9fbf742e4be91e4b331a5
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 26 23:21:04 2012 -0700
altos: Add debugging code to check for stack overflow
Stack overflow often happens from interrupt handlers sitting on top of
a task stack. Check for this during ao_wakeup as that is often called
during interrupt processing.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ebeac02a990da3fa6dd71487141d0bc6f78b42de
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 26 23:20:17 2012 -0700
altos: Enable full flight computer functionality in MegaMetrum
This turns on everything that currently works
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fb2b83fcd28199d8c686e676d46d6ecfbf706f37
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 26 23:18:44 2012 -0700
altos: Create a 32-bit 1MHz timer for use in profiling execution
This provides a simple method for getting high-resolution timer data
to use in performance tuning code. It's not used by default anywhere.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 097b337eb9b7deff13d5dcdafddec9bec3868b93
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 26 23:17:00 2012 -0700
altos: Abort radio receive when using flash memory on megametrum
Radio receive camps on the SPI bus, making it impossible to access
flash memory. Abort any pending receive operation when trying to get
to the flash part.
Yes, this is a total hack.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1ae69a1c2ce7e45db9d9c175bc63867eff68ebe5
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 26 23:15:54 2012 -0700
altos: Make gcc happy with ao_telemetry_set_interval
Using unsigned locals made GCC sad as it was compared with a signed value.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c4036bf6e7997b618f89a05dd1214c16066ba2b2
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 26 23:14:13 2012 -0700
altos: Turn radio-related bits of ao_flight_mm.c
Now that MM has full radio functionality, we can make it work right.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b5f5fd92109ac6f4909a81303d52bc9220cc2520
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 26 23:13:14 2012 -0700
altos: custom hex printer for telemetry packets
Using printf is way too slow with pdclib; just hand-write hex byte output.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f1ae622eff60e05c1f5d8f822a3cf6a85750c6cc
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 26 23:11:10 2012 -0700
altos: Optimize FEC encode and decode
Integrate interleaving, CRC and padding within the decode/encode
functions.
Provide for ISR priorities so that the 1120 RX interrupt takes
precedence over the other interrupts or we risk losing bits.
Optimize the viterbi decoder a bit (goes from 10ms per packet to 7ms
per packet).
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 936ecad62596f34773afb7460b10f63df7d0896d
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 26 23:07:38 2012 -0700
altos: Add GPS logging code for MegaMetrum
MM uses a different logging format with larger log blocks, so
restructure the GPS logging code to fill them up
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 33f8f7add27a02d24b0671da353b59762224c1ee
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 26 23:05:42 2012 -0700
altos: Make cc1111 radio control functions static
No need to publish these; they're all private to cc1111
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 03dc80d15a2f8fe9d7340351226dadd8bc3cfdb9
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 26 23:01:58 2012 -0700
altos: Clean up usage of port parameters
Make stm port parameters always be pointers; this avoids the confusion
where some macros took '&port' and others took a bare 'port', and also
unifies code to run on other processors in a consistent fashion.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f11f05c5d634de2a80c34d0d3dc93925980f52e6
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 26 22:20:50 2012 -0700
altosui: Make libaltos recognise new USB ids
libaltos has a small range of 'AltusMetrum' products to avoid opening
other devices. We've got more IDs, so open up the range.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9dcb4e2ab60ecf0cc7371c1b1a620be952fa8776
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 26 22:19:01 2012 -0700
altosui: AltosSerial and AltosLink both tried to provide frequency setting
AltosLink owns all of the device configuration, so remove that from
AltosSerial and make sure that AltosLink provides the right function
signatures (wasn't using the new direct frequency setting command).
Signed-off-by: Keith Packard <keithp@keithp.com>
commit eab18714ed9eabbcef0ff81b07427da042a58ccc
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 26 22:16:44 2012 -0700
altos: rename ao_viterbi.c to ao_fec_rx.c
Keep it parallel with ao_fec_tx.c
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 09761fe0f6ed40ff74317fbb47d6a74068fb4ce4
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 25 06:51:36 2012 -0700
altos: Incremental viterbi decode
Decode radio input one interleave block at a time. This overlaps the
decode computation with the packet reception, leading to lower latency
in an attempt to keep up with the transmitter.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 628076aa90e7bc9a894646e417dd8e1fe149b60d
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 25 06:38:34 2012 -0700
altos: decode cc1120 received packets
Call the fec decode function, compute RSSI and check CRC
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 70cf32e89df19bde5185339fc703532c8a5b8be6
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 25 05:03:34 2012 -0700
altos: Get cc1120 packet reception working
Interrupt-per-bit, but it seems to work
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 246174b32bb6cf827d240c32d6a51c3513a08c37
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 25 05:03:16 2012 -0700
altos: Forgot ao_telemetry.h
Not much builds without this...
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b292c14790fc225029cba3f80ce8ad6c5652bc4e
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 23 16:05:42 2012 -0700
altos: improve FEC apis to reduce data copying
Integrate interleaving and whitening into encode and decode steps.
Add CRC checking function for receive.
Make ao_fec_test program round-trip the data and verify correctness.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 74f6a1a8c8fa9d5bb8d74c99782310b431dd4727
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 23 02:24:30 2012 -0700
altos: Add ao_viterbi.c to megametrum build
It's not used yet, just wanted to see how big the resulting object
file was (492 bytes).
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 566a0c277de01963922cabc80db8ec3a129923bd
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 23 02:23:08 2012 -0700
altos: fix comment about decoding last byte of FEC data
There aren't *any* forward bits to use when decoding the last byte.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 83549f8bde42c3fddbdc817540c869dc8aefd013
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 23 02:13:52 2012 -0700
altos: Make ao_fec_tx_test build cleanly with -Wall
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f7bf07dfdad260c1f219064957ef08fb480bf20f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 23 02:12:58 2012 -0700
altos: optimize Viterbi implementation
Minimize data usage, make data arrays static
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ff8de3af193839de4bacfd07ade7a5f9ac0bf5b3
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 23 00:54:42 2012 -0700
altos: incremental viterbi decode
Decode bits incrementally. Don't bother decoding the last byte; it's
always a pad byte.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 047e95421c87c5d056038797b48f759bedabf245
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 22 23:31:11 2012 -0700
altos: Start optimizing viterbi decoder
Only need two cost arrays (previous and next). Create constant
full-width decoder table instead of expanding bits into bytes for each
decode step.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cbf79a0f9cb859d04e8e03d627219cb2bf49611f
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 22 23:12:02 2012 -0700
altos: Add the simplest possible viterbi decoder
I think I understand how it works now. It's not exactly speedy, and it
uses a lot of memory.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 75e4521ec42a368cebc67a07f8713d7a854ea265
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 21 09:52:37 2012 -0700
altos: Move FEC code to core
It's not a driver as it's not specific to the 1120 chip
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0b5548d6ced67201311e1072d37fbedd3d9929c9
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 21 09:51:17 2012 -0700
ao-tools: Support MM telemetry packets in ao-telem
Parse the new packet formats
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6f421818fd7062f03bfaf9e606d6a4cfdcb13b49
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 21 09:50:18 2012 -0700
altosui: Support MM telemetry packets
Required restructuring the whole telemetry system to provide abstract
interfaces to flight data.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ff5b0ba90e73a83360a2e8a7e9969ed2c3ce1514
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 21 09:46:50 2012 -0700
altos: Crank down STM SPI speed for MM
The cc1120 is noisy enough to break SPI data transfers at 4MHz, so
crank things down to 1MHz. It's "stable" now, but clearly needs a
filter and shorter traces.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d2bd95edb6f77daeb1e8f043c4a239c248728e0c
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 21 09:45:42 2012 -0700
altos: Add full MM telemetry
Create two new telemetry packets to hold all of the MM data.
This patch also splits the telemetry structures out of ao.h
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 419a801131c1034f1fa149a67850290431cbda72
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 21 09:39:10 2012 -0700
altos: Configure STM LCD driver for giant LCD digits
These devices require static mode.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 611f37607fadcdc9908d67456f844a452ad4a87a
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 17 19:11:35 2012 -0700
altos: Make sure ao_storage_config is set before reading config block
ao_storage_read does in fact call ao_storage_setup, but we need the
value of ao_storage_config *before* calling ao_storage_read, so call
ao_storage_setup first.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ae3662c56effda9f0516c7d6ffd2d5f56b859593
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 17 19:06:08 2012 -0700
altos: hack STM serial number to 58
otherwise altosui won't record telemetry
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 976a8375932ddb46ca3100863b0a892732c0923e
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 17 19:04:53 2012 -0700
altos: make cc1120 ao_radio_send re-entrant
It gets called from multiple tasks, so put local data on the stack.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 629f43e7c7abbff33e14b168a08a4b6a9c88b937
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 17 19:04:22 2012 -0700
altos: Add telemetry to megametrum
Now that the radio works
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9b24f413da0b6d989b32e8654a91c8deee4c81dd
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 17 19:02:50 2012 -0700
ao-tools: add rudimentary support for MM telemetry to ao-telem
Just pretends they're TM packets for now
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4cb46b8a84a0dd5b8fcb479d7aa5157480e1bc67
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 17 19:01:24 2012 -0700
altosui: Add rudimentary MM support to altosui
Decoded the MM sensor packets as if they were TM packets.
Add the USB ids.
Add class of 'altimeter' devices and match those instead of just
telemetrum as appropriate.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 55747ce210d7d80d5b4fdaaf9dc7ee0f7bc8b0a3
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 17 18:58:56 2012 -0700
altosui: Move product definitions from AltosUI to AltosLib
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e6d236fdc615625fbbf28377453f920729e49b0f
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 17 16:17:00 2012 -0700
altos: Software implemenation of CC1111 radio encoding
Add CRC, whitening, FEC and interleaving routines for transmission
path to allow cc1120 to send telem packets to cc1111.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1a294852b3607947f0f86bf236785456d8719e5f
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 17 16:14:33 2012 -0700
altos: Be more careful about register save/restore in ao_yield
Make sure the general registers are all saved before messing with any
of them. Then, explicitly use r0 to save/restore apsr and primask.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9d3fe2a80d0925e3eded6d738d05c5b4ea61504c
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 17 16:12:18 2012 -0700
altos: Don't lose IRQ disabled state in ao_sleep
Using ao_arch_critical around the wchan setting will force interrupts
to be re-enabled before ao_yield records the state of that bit,
potentially causing problems with functions not atomically testing and
sleeping.
Tasks that need to set wchan with interrupts disabled should have
interrupts disabled when entering ao_sleep already.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4e6d96816e6604ee8d9bb49345a1c1211699a655
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 17 16:11:23 2012 -0700
altos: ao_storage_read already calls ao_storage_setup
No need to call twice.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ca310342d7b0bd1b78318cae38d920b8690dfd36
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 17 16:09:43 2012 -0700
altosui: Catch timeout errors when setting up TD telem monitoring
Close the port in this case so it can be used for other things.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 58e005375ca29dec6091d87159055004e7f19605
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 17 12:43:43 2012 -0700
altos: Use interrupts to wake up after RDF transmission.
Also clean up the debug output
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5df94f74522357e062f4ec2786ff825381b2fb10
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 17 12:42:32 2012 -0700
altos: Crank cc1120 power down to 0dBm to avoid crashing CPU
Looks like RFI from the transmitter is confusing the CPU; lower the
1120 power output from +14dBm to +0dBm to keep the CPU happy.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e856df474c386b8df3d2bd9e87b766ae0439efbf
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 15 22:41:17 2012 -0700
altos: Reduce STM SPI data rate to 4MHz
cc1120 doesn't want more than 6.1MHz, otherwise it gets very angry.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e09e35471e788b88909ff01037fb8e0e4eabcd7d
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 15 22:40:30 2012 -0700
altos: Start making cc1120 radio work
RDF tones and radio calibration work now.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c2949ea15c59215834fedac7646f50c8a09f716f
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 15 22:38:37 2012 -0700
altos: Fix cc1120 packet mode datarate and config
Was using the wrong function
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1b7e4c29bf9608bfc972ae28b53cc823f4c37f92
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 15 22:32:10 2012 -0700
altos: Make sure cc1120 is initialized correctly at startup time
Check to make sure it pulls down MISO when CS is enabled.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 27c95adf35e646840b9bd562497eea0dc96bb9bb
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 15 22:31:36 2012 -0700
altos: use 'b' command for radio beep
'B' is used by the baro data dumper.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 93e6d0a2c0b60e7bedd34f06ba63b468dcc8e013
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 15 22:30:03 2012 -0700
altos: Fix RDF mode data rate and PKT_CFG0 value
Changes tone to the desired 1kHz frequency and ensures the PKT_CFG0
has the right value.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c96e60bedeb00d28c36436c12b803fd8cbadce26
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 15 22:28:55 2012 -0700
altos: Actually write cc1120 register values
Helps to not use 'read' mode when writing.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 97d163c88ed8c8f64a9714018863d0b6eedab38f
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 15 22:27:48 2012 -0700
altos: Configure cc1120 frequency
Set default conversion value, and pull the selected frequency
calibration data out of the config block.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a5a7df405c242593cbc828d5b66bbfc141a35947
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 15 22:26:06 2012 -0700
Temporarily disable packet and telem on MM
While work on the radio code progresses
Signed-off-by: Keith Packard <keithp@keithp.com>
commit baf1be1def01266512e67068948bf19b04ead6aa
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 15 22:23:10 2012 -0700
Allow product to override maximum number of command lists (NUM_CMDS)
Just in case some product wants to save memory, or have more.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bfbd1d82f4c25120a97840a1bd4787680823afd8
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 5 15:15:25 2012 -0700
altosdroid: Add files necessary to build application
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b8c363d9411fd5e79e3f806894dbc12bcc106b88
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 4 20:56:25 2012 -0700
altosui: More changes to migrate code to altoslib
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5634192a6036c6c7b47d224e2988e81bb71a4557
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 4 20:55:33 2012 -0700
altosui: attempt to get ms5607 data into .mega files was misinformed
The ms5607 'p' command also means 'go into packet mode', which nicely
broke attempts to communicate with teledongle
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 705891be53e298ac6ced4ba02b87d2f6d1085b34
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 4 20:54:36 2012 -0700
altos: Make cc1111 products all depend on ao_arch.h and ao_arch_func.h
Ensures that files get recompiled as needed
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a9ad342ae4c34626df4f2891da4c7f6d2c14d73e
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 4 20:53:53 2012 -0700
altos: Other half of the ms5607 prom reporting patch
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dec5cbee22f13c47690b0c6bf7ca724ef132fe5e
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 4 20:53:06 2012 -0700
altos: typo in ao_monitor prevented ground station from including code
This created ground station software that couldn't actually receive
and report telemetry packets.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e687a9bafc696998b47fd0300fbc89dece09509c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 4 20:52:38 2012 -0700
altos: Make 'v' command dump pressure sensor ROM values
Avoids needing a new command
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1832e2f76c844e97a2bd11226b003fb2af8057db
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 4 20:51:35 2012 -0700
altos: fix test builds of non-accel flight code
Remove references to accel variables when building baro-only flight
test code.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 06afa2c3e78ea5bc9f1eb4913ee35c0eab0ac1bf
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 4 20:50:10 2012 -0700
altos: Legacy telemetry needs original ADC record
The legacy telemetry packets included the raw ADC structure directly,
so make sure that doesn't change further, allowing teledongle firmware
to remain compatible with old TM firmware.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f1b14932149153a096961fff94191778f88581d9
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 4 20:49:15 2012 -0700
altos: Remove unused AES code from teledongle and tidongle
Leave this out as neither of these products need it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 718a8affe1df98eacfd707b5c8c34f9456dcff14
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 4 20:47:14 2012 -0700
altos: Remove accel_ref from pre v1.1 TM firmware
V1.0 needs RAM space for flash buffer, leaving too little room for
this extra data.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7a19d6790a9800f925c8de24aac71796351e2c04
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 4 19:28:58 2012 -0700
altos: More cleanups for moving files to altoslib
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f86dac643081987c8994ab57a96640d5e91b342a
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 2 19:59:40 2012 -0700
altoslib: Clean up random rebase failures
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dd43a2ae7594f062a8980d1756a07488ee54b447
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 2 19:42:47 2012 -0700
altoslib: Move new sensor library code into altoslib
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0772020c969a69c3b0a705de7362340a9732daab
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 16 20:27:45 2012 -0700
Build altosdroid
commit e81163ed875dc93a618baf9278f43ed7dd0f730e
Author: Mike Beattie <mike@ethernal.org>
Date: Thu Feb 23 16:43:04 2012 +1300
Add local.properties to .gitignore
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 392c878000e9909d37dae6342df3d6cb8f217a1b
Author: Mike Beattie <mike@ethernal.org>
Date: Thu Feb 23 16:41:26 2012 +1300
Add TelemetryService.java and associated files
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 69e6df07976a56b49e07c242cd6e5b2cbd2a578d
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 23 17:00:48 2012 +1300
Move altoslib sources to top dir
No sense having them live deep in the file system.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9b659904109f992b8a3e61efb94e81cdb19af1c9
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 23 16:37:24 2012 +1300
Demonstrate using AltosLib from altosdroid
Get things hooked up so that we can use AltosLib functions from the
android application; it's a bit of a hack at present, but appears to
work. Some more 'official' technique would be nice...
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a018724e40f2a4c0bae8b3d5c77bb90328ad4314
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 23 11:15:23 2012 +1300
Ignore generated altoslib files
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 025eb09b5de9b50de143da9f36bc02818e018ba9
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 22 23:39:01 2012 +1300
Build Android local.properties from local.properties.in
Make sure the SDK path is set correctly
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3a80545d4ecedc4b98a9ee8296ab6abbbf64312d
Author: Mike Beattie <mike@ethernal.org>
Date: Wed Feb 22 23:40:25 2012 +1300
Add $HOME/android as an SDK location
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 091affece185dcd0832a55b0befeacaa182a57bb
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 13 10:40:30 2012 -0800
doc: Add companion SPI message protocol doc
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bb5b5312a0c6102b12f3d4710ef213f0f6c67412
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 7 20:56:49 2012 -0800
altosui: Clean up a few 'fat' build rules
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fc86ae58c3a296730fa99010cc27b8b3c2c3b780
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 5 16:30:41 2012 -0800
Add altosdroid/Makefile.am
commit dfa059b22bf15de3f25328aeef4fdb8e5ca664dc
Author: Mike Beattie <mike@ethernal.org>
Date: Wed Jan 4 21:01:44 2012 -0800
Add AltusMetrum Logo as app icon, and change app name
Signed-off-by: Mike Beattie <mike@ethernal.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 402f1e76909229fc0c3b54743ba577b657495faf
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 4 20:54:40 2012 -0800
altosdroid: build android bits when possible
Locate android sdk automatically
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a48e4d40729e736929632ec422fd189ecdfba33b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 4 20:33:06 2012 -0800
altosdroid: import code from mjb
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 81465a20049da40cd8d3cda920d6585ffe87bfe3
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 4 20:28:42 2012 -0800
altosui: Move java altoslib to top level
This will be shared with other (android) java code.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d6df16525927d8096d1c0cccf4c86bf4c6599d53
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 2 22:43:48 2012 -0800
Add altoslib/.gitignore
commit 02b53b7f592b78b2fec4f4a17b6b3e114d2bf3c5
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 2 22:42:18 2012 -0800
altosui: Fix AltosTelemetryReader move
Lost the provided link value causing a crash.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9fb15d397890c7e78bf3c1438f142f62bfc2bd35
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 2 22:41:48 2012 -0800
altosui: Remove unused files
Left around from development, these aren't useful.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5270a0f1416baef5fde08547c6c98d97f973ae95
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 2 22:35:41 2012 -0800
altosui: Move telemetry reader &c to altoslib
Move all of the device and file reading code into altoslib
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 93305717ac4c993c88d9144d797ca64d26db97c5
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 2 22:13:38 2012 -0800
altosui: Move AltosState.java to altoslib
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a5ac5c37ea385e3a2b2703c6f125b4e3b55e867a
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 2 22:05:47 2012 -0800
altosui: Pull most of AltosSerial into AltosLink
Share basic command processing across java users
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 18914b9a84bbd8c4364a1568bb07dcc2b04ad7ba
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 2 21:12:45 2012 -0800
altosui: Move AltosGreatCircle.java to altoslib
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 027863b737190bccc3b5cd032d77587396d0c5c4
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 2 21:08:34 2012 -0800
altosui: Move AltosEepromTeleScience.java to altoslib
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 346df410f570a67cda057550a067fa2b451b785d
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 2 21:05:02 2012 -0800
altosui: Move more eeprom stuff to altoslib
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a4ccdd253a9873c16f194a63a79f0c26feaafa29
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 2 20:57:57 2012 -0800
altosui: Move eeprom managment code to library
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 89aa06cfdcb02de1894ccb01aed97782f9eec9b2
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 2 20:47:16 2012 -0800
altosui: Move AltosEepromChunk.java to lib
Also fixes install issues with split lib
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b273b8b298540b1a6d0a87b1cf61df1fbf62e013
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 2 20:39:16 2012 -0800
altosui: Finish moving AltosConfigData to altoslib
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4c88b0ca96758b663c82395e63b338043d1c1a10
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 2 20:34:38 2012 -0800
altosui: Move AltosConfigData.java to library
Create a new 'AltosLink' which exposes how to talk to the remote
device abstractly via 'get_reply' and 'printf' methods.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ead8f1cfca2c454d18dce56479899f2b423d8bdd
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 2 20:32:35 2012 -0800
altosui: Add back in the split-out Altos constants as AltosLib
These were pulled out of Altos.java, but not added back to git
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3c2f601139d36761de6a8a2210545d082ef16133
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 2 17:26:59 2012 -0800
altosui: Complete split out of separate java library
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 40ee170753f4fd422c848e34a8da104683b7c8a2
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 2 16:16:51 2012 -0800
altosui: Clean swing/awt bits out of altoslib
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 71636c1ed7cbe075921391605d1ac4edaa6ee52b
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 2 16:13:46 2012 -0800
move a file back
commit 6510e8495fc5e8057b6092963def4d78978625a0
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 2 16:09:29 2012 -0800
altosui: Split out lots of the altosui code to a shared library
To be shared with the Android application eventually
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 97663f922e236f4ee7bd08277ca80d419b5cd10f
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 2 15:45:14 2012 -0800
altosui: Split out UI-specific preferences
Prepare to create library shared with android application.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c9e52287751867d9e451146ccde78109609d30d7
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 2 19:06:08 2012 -0700
altosui: Fixed width format for new IMU values.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9aa7993ee31bdfd6890ad7262a0375c07464ee76
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 2 17:09:00 2012 -0700
altos: Intgrate hmc5883 sensor into adc ring
Creates a task to poll the mag sensor and place the data into the
sensor data ring.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 69a8907ecbb7ca0e8526aeea0dc7490a191a0f8b
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 2 16:57:22 2012 -0700
altos: Get HMC5883 driver limping along
Not pushing data into the ring yet, but the chip appears to work now.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 97317d332f21c42860747c4ecde633bd0228ef52
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 2 16:56:41 2012 -0700
altos: Reset i2c controller at boot time
In case it's wedged.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 64e2e66a5239541b15f43172655cfb3560bec79b
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 2 16:54:42 2012 -0700
altos: Fix broken EXTI edge mode selections. Clear pending exti on enable
Make sure the edge mode registers are set according to the requested
mode.
Clear any pending interrupt when enabling to avoid spurious isr call
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8d425ffba84ec6f632e8c0d44105de73242a86a9
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 2 16:53:46 2012 -0700
altos: Route correct GPIO line to interrupt controller
Which GPIO a particular pin interrupt comes from is selected by the
SYSCFG EXTICR registers; set these when an exti interrupt is configured.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1353b277f8314fbddef81c743bd6ea229364fd18
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 2 14:58:00 2012 -0700
altos: Enable some debugging during flight mode on MM
Until we've got the radio working, there's no way to see inside the MM
state without using USB. Add a diagnostic command to dump out the
internal flight state variables.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c04af7533bd3fd3f3260338c0753fde966131720
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 1 23:07:38 2012 -0700
altos: Add support for MegaAccel daughter card.
Switches all acceleration computation to using the MegaAccel
accelerometer to ensure support for high-g flights.
MPU6000 values continue to be logged as normal
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1824761f5b98e92485e2dd347b1c4d043ec207e2
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 1 19:51:25 2012 -0700
altosui: Quick hacks to download megametrum data and convert to CSV
Very little useful data crunching is done, but at least we can save
and convert files
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ab85337aa942cb73a08bd3b783771179773b9a67
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 1 19:35:33 2012 -0700
altos: Timers clock base depends on perhipheral bus prescalers too
For some weird reason, a non-unity perhipheral bus clock scaler
affects the base of the various timers; this left the 100Hz tick
running at 200Hz.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ff4f3a56e09d595abbe32293cbdf1fe368633c49
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 1 19:35:01 2012 -0700
altos: megametrum has logging
This makes sure the various other subsystems know about it, like the
'v' command.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6806103bad98385c0ec122d400f981eb81c59dd3
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 1 19:34:17 2012 -0700
altos: add high-z accel and mag sensor to megametrum logging
These nicely fill the 32-byte sensor log record
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e5aebfe0203de9e69712fac291c8cd0d3a96a385
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 1 19:33:18 2012 -0700
altos: Mark full and mega logging correctly in 'v' command
Make sure megametrum reports 'log format 5'.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7fce3ddf5e7e92a14cefb7fcf35e4014df744987
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 28 11:48:04 2012 -0600
Bump to 1.0.9.5
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 47bc9b2a39b7a8d3ef3fe8acc7fbf0512695e548
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 28 11:47:28 2012 -0600
altos: Clear stm i2c transfer timeout alarm
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8164cd95db62e4564b3a9ba5c06a74c870c03841
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 28 11:46:51 2012 -0600
altos: Remove debug printf from accel auto-cal
Otherwise, this goes way too slow
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ee61fb8ccb47f94b7c39e803f5a0248840d1eea6
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 28 11:45:53 2012 -0600
altos: Clean up ADC selection for cc1111
Depend directly on product defines instead of trying to guess
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2df9113a22f4f67707d9ee777bd6b23ff671b105
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 28 11:45:30 2012 -0600
altos: All cc1111 products have a radio
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a53b8b84283eb62157b0f8ecd8061f61a4b6bd6f
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 28 11:44:45 2012 -0600
altos: Shrink telemetry generation code
otherwise TM doesn't build anymore
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 43e558738c76afd72fc01660884be3158f44470d
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 28 11:44:07 2012 -0600
altos: Try to get hmc5883 working
No joy yet
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9f5e4cf7d8204016e023cf439d93de1203dc406e
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 27 18:23:39 2012 -0600
altos: Make teleterra v0.2 compile with new ao_data struct
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5dd5e0284c8b26b0d4ce69c64bb7864e0ae83db7
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 27 17:45:09 2012 -0600
altos: Make telepyro-v0.1 build with new ao_data struct
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 29edf6d901432a1afc65900ff599c963edac5a2b
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 27 17:44:01 2012 -0600
altos: Make telescience-v0.1 build with new ao_data struct
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5fd869b244f8f2b76258dc31a5507a73fd47cf1d
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 27 17:31:12 2012 -0600
altos: Make telenano build with new ao_data structure
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 627b904b36e129ff2ead436a626699abfc3b3211
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 27 17:29:27 2012 -0600
altos: Make stm-demo compile with new ao_data structure
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 090dc9aecdf4cfd1ac727325ae141d441c5b28aa
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 27 17:26:43 2012 -0600
altos: Make telemini-v1.0 compile with new ao_data structure
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 98e992b65d366d9f79d7d2dd2dd4d1886dd1d9c4
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 27 17:25:17 2012 -0600
altos: Make telemetrum-v1.0 build with new ao_data structure
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ce8153472069ed56b24ac36f297ac569d1f767d4
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 27 17:24:09 2012 -0600
altos: Make telemetrum-v1.1 compile with new ao_data structure
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ed635545e0b965901032ed2c3474ffe997c73de3
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 27 16:52:45 2012 -0600
ignore pa to altitude conversion file
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dd73c9b441f7672fb9982c4caeb5178df30f5d2b
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 27 16:47:30 2012 -0600
altos: Split out mm-specific versions of sampling code
Avoid breaking telemetrum (too much) by splitting this stuff apart.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9eeba439ce8c9dc1def8528f96b6a67c6578d656
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 27 16:46:00 2012 -0600
altos: Don't start ADC ring until the other sensors have a valid value
Yes, this is still an ugly kludge, but it's easy.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d01c10eff4b70af13347969a7cece8730cf1a3f1
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 27 16:44:38 2012 -0600
altos: Data packet tick count does not live in adc structure
It was moved to the global structure. Having two is confusing.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 78423f3fc5164ea9fd428606419784c1700ad5c5
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 25 23:18:06 2012 -0600
Get megametrum ready to at least log flight data
Doesn't track flight state changes correctly.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0239e4dfe587528524b6380bbf6d9583047e52d6
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 18 21:23:47 2012 -0700
altos: Poll mpu6000 values every tick and stash them locally.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 34bb17bc1a3d8a1c95b5e57f059e7a1747e17a03
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 18 20:16:35 2012 -0700
altos: Finish ms5607 support
This has the MS5607 polling once each tick for pressure and
temperature and then saving that in a global variable. The command UI
provides for dumping the prom data so that an eeprom file can have
raw sensor data along with the conversion factors necessary to compute
useful values.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5d8b9d524d6424ff98dcc4155fe8b8bd892b6d8f
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 18 20:04:57 2012 -0700
altos: Add conversion between Pa and meters
To be used with the MS5607 which generates data in calibrated units.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1541fc0bde71f503b1ae5757497e9e1e6d023111
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 7 23:14:57 2012 -0700
altos: Check MS5607 CRC. Clean up MS5607 API
It's not ready for flight yet, but at least it's sensible now.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6a62edd4a1f01a6ee380c3aabaff3f437e8d6f1e
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 7 23:14:14 2012 -0700
altos: Conditional byte swapping in mpu6000 driver
Only needed on LSB machines.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6a973f788563ccc66b01cc7557a004dabef18d09
Merge: d387f24 da2c920
Author: Bdale Garbee <bdale@gag.com>
Date: Wed May 16 09:13:53 2012 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit d387f246b24502642b76aad04eb3e0f1a5b78a05
Author: Bdale Garbee <bdale@gag.com>
Date: Wed May 16 09:09:44 2012 -0600
build-dep on default-jdk instead of openjdk-6-jdk, closes: #655580
commit da2c920b9f3378d5a18551e008c1da5dace1e0ef
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 7 21:53:53 2012 -0700
altosui: Try to make telem tick counts match eeprom
telem files can have an extra wrap or two of tick count if they start
recording a long time before the flight. Account for this so that the
CSV file output from each have matching tick values.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b5b898264077fcada29e73efa28dcbe4729f2709
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 7 21:53:11 2012 -0700
altosui: Output recorded clock tick in CSV files
This allows eeprom and telem files to be correlated accurately
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 73c26f39b1a08fcc13e23a5b1a4293bc7df9f163
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 7 21:52:12 2012 -0700
altos: Hacking at cc1120 driver
Still doesn't work, but this adds a ton more register definitions
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 318b564486aa9965bbad54c71e51fcb32b414162
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 7 21:51:25 2012 -0700
altos: Get mpu6000 working
This initializes the device appropraitely, and provides a command to
dump the current values in converted form.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit af949c67eeb9dc310b1430d3435d241adccfc0a9
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 7 21:50:26 2012 -0700
altos: stm: pass DMA buffer index to DMA completion callback
This lets the user know which DMA has finished.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dd7699cf8daded17ac41abf5c5170cfb599b6ff5
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 7 21:49:24 2012 -0700
altos: stm: delay during USB config with pull-up off
This makes sure that a reboot will reliably cause the device to
disconnect from the USB bus.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 744d05e6037ffc11688a9faa9c7b5dcda4065ee3
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 7 21:47:17 2012 -0700
altos: stm: share i2c_stop code between send and recv
This waits for the stop signal to appear on the bus, necessary before
starting another transaction.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ddaf501ddcfc1a5f74a1ef1b6b76e1c82d89c77a
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 6 23:54:13 2012 -0700
altos: stm i2c DMA for large recv appears to work
Transaction appears to be clean on the i2c bus now; correct number of
bytes received, and the nack and stop at the right time. This tests >
2 length reads; should try that too.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fad6cda3d081d438b18305611f37fe05335aa372
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 6 22:53:25 2012 -0700
altos: megametrum needs ao_mpu6000.h
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f66f5de7a6cae71948da777ad0638bc6267a710f
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 6 22:52:56 2012 -0700
altos: Switch megametrum compile to -Os
Looks like gcc has compiler bugs with -O0
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0f0cc91ce8e9807dca48a5c0c53d821f5060e245
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 6 22:47:33 2012 -0700
altos: STM i2c work.
Start now driven by interrupts
Send now done with DMA and interrupts
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 69feb1e3d94a028d04529edb015654bafd06353b
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 1 18:12:41 2012 -0700
ao-tools: Add GPS and rssi printing to ao-telem
This prints all of the basic telemetrum messages now.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8b08095b3d41e21684a10bddfb54431019da5af6
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 1 11:08:49 2012 -0700
altos: Report latest telemetry data, rather than using the oldest
ao_sample_adc points to the *next* ADC entry, rather than the most
recent one. Step back one entry to get the latest valid data.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7b0b6bcc40891d8dd106d091d3af8107b2941c66
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 25 23:29:20 2012 -0700
altos: Add hmc5883 and mpu6000 drivers to megametrum build
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e0b8c614ec4d11f432963e48d94e4497d31a9ddc
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 25 23:27:58 2012 -0700
altos: Add mpu6000 and hmc5883 stubs
No real drivers here yet, just some testing stubs
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0266e08dbf19e2204fb5f758d5d0f944d2afff7d
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 25 23:26:57 2012 -0700
altos: Add STM I2C recv and stop funcs
Recv doesn't appear to work with more than one byte
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 962476911aaab17fd482593a0e8b95fe47de2f29
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 25 23:25:43 2012 -0700
altos: Oopsed the STM DMA channels for I2C1
TX is 6, RX is 7
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5f55d0490017faa19b8d70b1742e4a45266c7e79
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 20 22:26:16 2012 -0500
altosui: Mac OS Lion Java default heap space is too small (Trac #37)
Increase it to 512M in the Info.plist file.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1489263b895a2a825e29d0560c9b1dbba8a3f431
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 17 11:01:18 2012 -0700
altos: Starting to write cc1120 driver
This does "something" in radio test mode, appearing to generate a
730MHz signal.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cc305ea231ae22278abf91c0d9925f5992945369
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 14 13:53:36 2012 -0700
altosui: Add apogee lockout configuration
Provide suggested values of 5/10/15/20 seconds.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b4ab9f5dfa9f2a50e0528acf0a1fdeaa1f9bc523
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 14 13:52:37 2012 -0700
altosui: Read frequency from device while configuring ground station
Missed this when adding the TD config UI.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5c8af6d35ebfc8fd896dfbf9928ec8f9dbfa531f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 14 12:05:28 2012 -0700
altos: Remove debug printf from cc1111 check-stack script
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6cb744e305116a738b5d71686c6748f6f08c12ea
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 14 12:02:14 2012 -0700
altos: Respect apogee lockout time in flight algorithm
This prevents any apogee detection from occurring until the specified
number of seconds after boost. This also prevents the switch from
accel+baro to baro only mode in the Kalman filter.
The test frame work is also changed to look for Apogee lockout: in the
eeprom input file.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9a8fec1b6d8f3346f988882ffb03d7d0e45b3c81
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 14 12:00:32 2012 -0700
altos: Clean up test scripts
The flight test scripts were using invalid bash syntax. Clean that up
and also switch the default flight directory to my new
~/misc/rockets/flights directory.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e9f6fca7cfe796cbd86ae9d8f1ebe31bba7251db
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 13 18:38:29 2012 -0700
altos: Correct STM USB driver
Configure endpoint registers correctly now.
Restructure code to make sure we send the right IN packets.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1a84d34fa08f43a5f79b1a5f8d8de7674d04647d
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 13 18:35:46 2012 -0700
altos: Check all USE_SERIAL_*_STDIO when computing AO_NUM_STDIOS
AO_NUM_STDIOS is allocated based on the total number of possible stdio
values. Now that multiple serial stdio are possible, make sure to
check all of them.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3c67543f3e5fddc6a8850f33ac519ccd55b607f0
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 13 18:34:52 2012 -0700
altos: Set USB Interrupt endpoint interval to maximum allowed
We don't ever send anything over this channel, so there's no sense
asking the host to poll it very often.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0667261e03b3fd403e97d02ea6204b007bb13f58
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 13 09:39:20 2012 -0700
altos: Pull more interfaces out of ao.h and move to separate files
This moves the aes, btm, companion, lcd and packet interfaces out of ao.h
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2b4a53342980618b193cbee5b803e56f7c937893
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 13 09:36:00 2012 -0700
altos: ao_telelaunch.c got left in src directory
Should live in product/ao_telelaunch.c
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 040a6eb119451026e1ec7c3a6a8e76b439c632d5
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 12 14:51:07 2012 -0700
altos: Massive product config cleanup
Support multiple serial ports more cleanly
Split out parts of ao.h into separate feature header files
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f952f9c285e2718a433c8c720c9b5d9c369e7036
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 12 14:50:12 2012 -0700
altos: Start adding apogee lockout support
Remove radio channel support too.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6d1606895f70c6bca20c25084107f90bd0b613ec
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 11 23:31:28 2012 -0700
altos: Switch stm-demo to HSE clock, add USB
Requires that SB17 be soldered shut so that the MCO from the STlink
CPU is available the target for HSE input.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 49ac2828510e8b5fcba7e31631dac0580a455011
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 11 23:30:13 2012 -0700
altos: Rework how STM clocks are initialized.
Clean all of the RCC configuration up after turning on the clocks.
Use the MSI clock during initialization to avoid messing around with
the HSI clock temporarily.
Allow for an external clock on the HSE line.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 93ef7e4a23d13540615f1a9782e1d58ddb7f258e
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 11 23:29:38 2012 -0700
altos: Use new USB driver in megametrum-v0.1 product
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d432307a3c2709634350eaa1262b935028d073d3
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 11 23:28:45 2012 -0700
altos: Add STM USB driver
Emulates the usual CDC-ACM device
Signed-off-by: Keith Packard <keithp@keithp.com>
commit afd52a8b54fe31577d939a161ea9cf5ad48e3a43
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 11 23:26:30 2012 -0700
altos: Add STM ao_arch_reboot implementation
Uses the AIRCR register to force a reset
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 150881f86f8d90b5867507889441990d18223e62
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 11 23:25:36 2012 -0700
altos: Add register definitions for STM syscfg and usb
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0dd9e1dd62656a931f9559af6da9131f704f83f9
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 9 23:27:43 2012 -0700
altos: Add support for multiple SPI busses and sharing device drivers
The STM32L151 has several SPI busses, and we want to use more than
one, so add a 'bus' parameter to the SPI interfaces. To avoid wasting
time on AVR and CC1111 processors which only use one SPI bus, elide
those parameters from the actual functions by wrapping them with
macros.
Configuring chip select is now all macroized so that each chip can
have its own version, allowing the STM to share the various SPI device
drivers with the cc1111 and avr processors. Note that only the M25
driver has been ported; porting the others is 'trivial', but not
necessary at this point.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 35e3c47da895bdd868b9b66b98bca64bd82db862
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 9 22:25:59 2012 -0700
altos: make megametrum beeper test keep beeping
Used to measure the beep frequency.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9804528e249db256e020d4b5340ba6216d3474f0
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 9 22:25:13 2012 -0700
altos: Check for cc1111 flash overflow
The linker is supposed to do this, but it ignores the static
initializer data added after the code.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d15c4976ed9c23c861e620eb9c429d1cb7eedbee
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 9 22:24:36 2012 -0700
altos: Increase STM SPI speed to PCLK/4
The pressure sensor seems happy at this speed.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0cd682ef0c8cdcf364b7e173ff3a9f84e485c113
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 9 22:23:52 2012 -0700
altos: Move MS5607 configuration to ao_pins.h
Which SPI port and where chip select is to be found are product specific.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3909fca0a3f918121888a415f9bf9bca99505366
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 9 22:22:58 2012 -0700
altos: Add missing parens in ao_ms5607.h
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c5bbfc7244faaae41c7b581644c3c253e9b7f462
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 9 22:21:46 2012 -0700
altos: Reduce MS5607 reset delay, increase conversion delay
Reset doesn't take very long, while doing a conversion seems to take
more than 10ms.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 51aef5d4fc29986353ad887f4a67ed2fe35f8c8e
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 9 22:17:33 2012 -0700
altos: Make STM clock configuration per-product. Fix 32MHz CPU speed
This moves all of the STM clock configuration into ao_pins.h so that
each product can configure it separately. While doing this, I
discovered that the flash memory mode (64-bit, prefetch, latency 1)
wasn't actually getting set, which is why the CPU refused to work at
32MHz.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1dcfbb05531767e67df45c2799a2fe533834fb71
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 9 20:28:19 2012 -0700
altos: Add beeper driver to STM arch
Drives the MegaMetrum beeper
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 67044cca5b463772491d0712d0ce07a8f897a476
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 9 00:10:43 2012 -0700
altos: Test I2C code on discovery board.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0a198dfcd1b0defe194feaf301f4586e5573d6e9
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 9 00:10:01 2012 -0700
altos: ARM -O0 flag appears to generate buggy code
Use -Os always, which is annoying...
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 597c3df668ccf656d8c014f665c154a03166577c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 9 00:09:18 2012 -0700
altos: Make ms5607 driver do something
It's loading prom values and converting sensor data, but it's getting
the wrong answer at present.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e9362841b1075a2ae59eecc73137b20e700567a8
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 9 00:08:20 2012 -0700
altos: add STM I2C driver.
Not well tested yet...
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e027247a9ef82746c26bcb8d0a851a0fa06511de
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 9 00:06:35 2012 -0700
altos: Slow STM SPI down a bit so the MS5607 returns values
It's still not working right, but at least it returns something other
than all zeros...
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 059f09dbca4703c25b42389b54c6510331c39485
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 9 00:05:18 2012 -0700
altos: Allow STM DMA channels to be reserved for one use
This allows a single user of a DMA channel to reserve it for use
without needing to lock the mutex; this is required for DMA from the
ADC to work on megametrum as it wants to start DMA from an interrupt
handler, which cannot block on a mutex.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f7cfbbce2b94b5ac0094a0e34e1766fe1ceb12c8
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 7 20:35:17 2012 -0700
altos: Show temperature in stm-demo
Use the ADC to show current temperature
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 98aa481741b8fbc617545beda3d295b53de90716
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 7 20:33:27 2012 -0700
altos: Use 384 cycle ADC sample time
This is plenty fast, and provides nice stable readings.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0bce68e6a0abc19f49c573331164d13643c9bee5
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 7 20:31:58 2012 -0700
altos: Add STM temperature sensor calibration data
Each stm32l has two-point factory temperature calibration data.
Provide access to that for displaying temperature data.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a41628c97e90770890cce1d6f580e92c1cad1a7f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 7 18:55:53 2012 -0700
altos: Add ADC support to megametrum firmware
Measures all MM igniter and battery voltages.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9b9357f48597a034211affb3f18fc6089816456d
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 7 18:55:20 2012 -0700
altos: Add ADC tests to stm-demo
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b5e9d14b4e3e8f29ad8a7bb9b339890be4bcfa2f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 7 18:54:32 2012 -0700
altos: STM SPI is not using interrupts itself
All SPI transfers are done via DMA, so the DMA interrupts suffice.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5e41d1e03680af9806c599aad80b9b64dd719f9b
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 7 18:53:12 2012 -0700
altos: Add support for STM ADC
DMA-based driver for the STM analog to digital converter.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fa96ee3db9b57cc2a88e9edd74bb9efcc228ccf3
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 7 18:44:11 2012 -0700
altosui: remove debug printf from AltosFlightStats
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e56038b65ba1c6413ba9942be3c092644986f126
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 7 18:36:36 2012 -0700
altosui: When computing flight stats, auto-detect boost time
Detect when boost actually starts by looking for the last low
acceleration value before the recorded boost time. This improves the
computation of the boost state data.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 20066268d8d1853055d0afe108584db34b425fcb
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 7 18:35:26 2012 -0700
altosui: Integrate accel speed from very start of eeprom record
Don't wait for the flight computer to have detected boost--that's
often several samples after boost actually occurred, which can leave a
bunch of acceleration out of the speed computation.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d35c4df12a3d8e2dab5d41f8d918ff4237f91e46
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 7 01:01:33 2012 -0700
altos: Add ability to change radio frequency in TeleTerra
Provide a way to set the frequency locally.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4700f63937786e8f6e9b4882363234a33eb54c46
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 7 01:01:06 2012 -0700
altos: Make ao_config_set_radio public
Allows other bits of code to reset the radio parameters.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a0a650a2be007b0436bd527d6c18f36eef6fbe2b
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 7 00:25:50 2012 -0700
altos: Force radio channel to zero when setting frequency
Otherwise, the actual radio frequency will include the channel offset,
which is not useful.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c7119405a3dd7128120374a2a001bc98ef523619
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 7 00:25:26 2012 -0700
altos: Make ao_freq_to_set reentrant
Save a bunch of data space this way.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d0d0d20c20e5eeacbc9a1ec1c93141a2044830fb
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 7 00:24:59 2012 -0700
altos: Shorten help strings
Save a bit of code space
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8405efb6ca68c8216413b94e7acbdf51af00554a
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 7 00:23:55 2012 -0700
altos: Save memory in ao_config.c
Shorten help messages.
Stop setting aes_key on products not using aes key.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 41a8383ccd29351f3a88a374f9456d6efb71b9a0
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 7 00:22:41 2012 -0700
altos: Save memory in ao_cmd.c
Shrink a couple of help strings
move a variable in ao_cmd from data to pdata.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5f63065a16b65618b39314880c72074f0a8b5550
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 7 00:22:02 2012 -0700
altos: Add fake install/uninstall targets for stm-bringup
Keep global 'make install' from failing.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5569e4df50648a3ec131ba5e244da9b67d1a67db
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 7 00:21:03 2012 -0700
altosui: Radio channel gets set to zero by altos when frequency is set
Just remember what the channe is going to get set to.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2db6b0f58811ffc44a468c8fbcacc08d37edd26c
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 6 22:40:49 2012 -0700
altos: Shuffle stm-demo SPI test code around a bit
Move a debug printf beyond the chip select boundary to
allow for more accurate timing.
Send four bytes instead of just one.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 89201cdf2062b7319a0da4e266e4d6edba1493f8
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 6 22:40:17 2012 -0700
altos: Declare stm DMA address registers as volatile void *
Eliminates a cast when assigning to them.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0bcc23c3be1a20a362fea268901c600f9f0d287a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 6 22:39:45 2012 -0700
altos: Disable DMA unit when idle
Should save a bit of power
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 20926b62a87154a846cb950dc542c737cd54826d
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 6 22:39:12 2012 -0700
altos: Disable STM SPI transceiver when idle
Should save a bit of power.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9b12bc445fe482306e4587ad60c6d2daf65a60f3
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 6 18:07:07 2012 -0700
altos: Add DMA, SPI and MS5607 drivers
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2a04ac8dff1bfc3efba8c7e4dc9c1a827496dbdf
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 2 23:00:29 2012 -0700
altos: megametrum builds an ELF file, not an IHX file
Name it appropriately.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cf1e4d60e1fcd75fa734365a2666ea8930938128
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 2 22:58:54 2012 -0700
altos: Move SPI functions to architecture-specific location
Some architecture specific stuff needs to use core altos code, so
create new ao_arch_funcs.h files per architecture that get pulled in
at the end of ao.h
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c09d155328bd446bb84ac1068d380cceb884df22
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 2 19:27:53 2012 -0700
altos: Oops. Set per-USART STM baud rate register instead of usart1
Was accidentally always setting usart1 instead of the per-usart
register. Didn't work too well for other usarts...
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 440226df03a85cd0047d876b57b2a3410bfb2b02
Author: Bdale Garbee <bdale@gag.com>
Date: Sat Mar 31 17:53:25 2012 -0600
be explicit in a couple places about only using single-cell LiPo batteries
commit 4ca52908c8b3f98a79588981f6878025250f0924
Author: Bdale Garbee <bdale@gag.com>
Date: Sat Mar 31 16:43:39 2012 -0600
use explicit path not $(HOME) to find ARM toolchain for now
commit 246618baf9b8803e5ae4e650eb46740d1128a010
Author: Bdale Garbee <bdale@gag.com>
Date: Sat Mar 31 16:43:11 2012 -0600
add config file for gdb use with MegaMetrum via Olimex dongle
commit b89f11139fae7ae722ed78d342a169ed2bf5c948
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 31 12:44:14 2012 -0700
Build megametrum-v0.1 by default
commit bbf31b8591f89e2a1fcc7dac5f42d730a81473d2
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 31 12:43:58 2012 -0700
altos: Add stub cc1120 driver
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1f2b75518169c4f2da9762de46bf1d9a71a04d17
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 28 21:54:32 2012 -0700
altos: Move cc1111 DMA engine interface to cc1111/ao_arch.h from ao.h
It's hardware specific
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 47a9925f16f6a13b173c49d3873d91fc7cf6d46e
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 28 21:53:30 2012 -0700
altos: Move cc1111 AES driver to cc1111 directory
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 93ae5f6ce09fa71ebd34f77a884684b3670c8b44
Author: Bdale Garbee <bdale@gag.com>
Date: Sat Mar 31 13:29:15 2012 -0600
openocd config file for MegaMetrum
commit b711768da6310a1b06f3b995a280587fed5f26cd
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 28 21:45:44 2012 -0700
Bump version to 1.0.9.4
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0993595035a2813deba6991fa25bc0d475f2e6bb
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 28 21:45:02 2012 -0700
altos: Add ao_freq.c to megametrum build
I think this will be needed to compute radio settings on the cc1120
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a157edbe1bf7fffd5a6041f7b1760674addd2229
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 25 13:08:05 2012 -0700
stm-demo does not use altitude.h
commit c1531fb26461b9f4ec39672bbfaeb70e6f4d1056
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 23 01:42:32 2012 -0700
Use -Os for STM apps. Fix altos.ld to matchall .rodata* sections
Without .rodata*, it would stick the flash copy of the data on top of
any further .rodata* sections. Fortunately, the linker catches that
and complains...
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f2c110fb4531144f18f62200e4127738c84e87f1
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 23 00:55:53 2012 -0700
Get config stuff hooked up for MegaMetrum
This stubs out enough stuff to let ao_config link and work
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0bda768c2be5b81bec13f21d4d3bb6a11a8e88fa
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 23 00:43:47 2012 -0700
Add preliminary MegaMetrum v0.1 support
This turns on an LED, enables the internal R/C clock, hooks USART3 to
the GPS chip and USART1 to the console.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c27e211796a64b6bbacfe6a1516e9872fdb0853e
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 23 00:43:17 2012 -0700
Use new Makefile.defs in stm-demo
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d7ddfd4e6d75e50ca64a342181f5c52e9f4919af
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 23 00:42:13 2012 -0700
Use 16-bits for STM32 LED mask. Export serial I/O functions
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 606d866153cb639a2400cbedbc45046372ad1b30
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 23 00:40:48 2012 -0700
Allow skytraq to be on non-default serial port
Provide ao_gps_getchar, ao_gps_putchar and ao_gps_set_speed hooks to
let product specify functions for serial access.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 25184baa36c20e3d661f94e642a33e8aae179d60
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 23 00:40:09 2012 -0700
Allow for more than 8 LEDs
Provide hook for architecture-specific LED mask (AO_LED_TYPE)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 87ca5c9c5f9cea1b9e14468e4694ce6acc21955a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 23 00:19:06 2012 -0700
Clean up STM build by moving common defs to Makefile.defs
Shortens default Makefile a bit
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 41a3fded116a3101789df44647d0eb06be07a25b
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 23 00:04:47 2012 -0700
Make stm-demo display a scrolling message
Instead of trying to frob the LEDs, which are now owned by the serial
port.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9b5e98a3407b369803109bfc1409e4f8b6e848ba
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 23 00:04:21 2012 -0700
Flush LCD changes each time the text is updated
Rather than requiring the caller to do it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6337b5f522be11926a6490d7bb27a4f7795da569
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 23 00:03:29 2012 -0700
Automatically set ALTERNATE pin mode when setting alternate function
When selecting an alternate function, set the pin to alternate mode as
well; there's no sense requiring two separate calls everywhere.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c9e61a4f1f0ce5e5177a2252e8b7a02a578e77f1
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 23 00:02:38 2012 -0700
Allow any STM usart to be used for stdio
This also adds the alternate pin configurations for the other two
usarts
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bf060b3e3ed655bbb8464f342d0a0b1745a06173
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 23 00:01:50 2012 -0700
Allow for more than one serial port in core AltOS
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d236a5c7cd6e9b1d7192e801d63b4bd348cc2f12
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 22 20:02:30 2012 -0700
Move LCD string output code to ao_lcd_font.c
It's all very specific to the 14-segment display, so
stick it there.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6da2f5846f2d28ea1f09f60ef2cc3f68113ac62a
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 22 19:43:29 2012 -0700
Add LCD device driver to STM32L port
This enables the 6-digit 14-character display on the STM32L discovery
board and provides an ascii output to it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a953ac32033ded18adf0cb3ca20134385fcd0a6d
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 22 19:42:18 2012 -0700
Add defines for LCD controller and RTC clocking
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f6e557bc2f0bd6d4272ed00dd09554d27a83be89
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 22 19:41:23 2012 -0700
Actually enable usarts with the new usart code
And move USART1 to PB6/PB7 to avoid conflicting with
the LCD pins.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 03fbc18ea17a9e77a1d4d8e0ddb97abbe5da3658
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 21 16:24:06 2012 -0700
Clean up multiple serial port support for STM32L
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f560c961ae4fedec0c9f11d5b3635fcb0d67ed8e
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 21 16:18:26 2012 -0700
Add support for multiple serial ports on STM32L
Signed-off-by: Keith Packard <keithp@keithp.com>
commit faf2bea4fdb3dca7fbed35423a4fe4459ee92ceb
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 19 11:25:40 2012 -0700
Save/restore PRIMASK register on Cortex-M3
This preserves the interrupt-enabled bit across context switches
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6a14bee42a8431c909bcd74b0acec57329bc0284
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 19 11:24:43 2012 -0700
Don't disable interrupts before saving interrupt flag on AVR
This ignores the interrupt disabled state, so we'd always leave
ao_yield with interrupts disabled.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7662a0096a860cddac413a310305fe842830c3b5
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 18 22:29:51 2012 -0700
Add .gitignore file to stm-bringup
Ignore generated binaries
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4be74ef0d13114707fd8217907a5ec457f886160
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 18 22:26:43 2012 -0700
Fix STM LED driver and blink LEDs on discovery board
This adds a task to blink the LEDs, after first fixing up the LED
output code to enable the GPIO and talk to the right pins for the
discovery board.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ab6ea9043b592c25948a70b6204d613756a9a250
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 18 22:10:02 2012 -0700
Basic OS running on STM32L
This gets stm-demo working
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0cc01d378ae96325e429ad608b953661582939b0
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 18 22:09:20 2012 -0700
Add AO_PANIC_STACK
Provide a panic code for stack overflow.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1ca46760cf903860dccb4864578558a1abb6e0fa
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 18 22:08:48 2012 -0700
When debugging, send ao_panic message to ao_debug_out
Use the low-level debug hooks to get the panic state sent to the
serial port.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4bfce11873f34af9621c60f83a8355f85769f6d3
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 18 22:07:07 2012 -0700
When debugging, send pre-init output to ao_debug_out
Before tasking is running, send output to ao_debug_out to help debug
system initialization.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 93481fd3d9305a107b88c8a64de4194a6d94dc0e
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 18 22:05:46 2012 -0700
Incorrect type in ao_task_info for wchan
Would truncate 32-bit pointers on arm.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8ba5344514f8ed51f6fd69ca09f6c7035c4fd0da
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 17 00:06:59 2012 -0700
Add stm-demo program
This runs AltOS and talks over the serial port.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1d1b24bb20dec09145fbaa6fe6897898d47dd16e
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 16 20:24:29 2012 -0700
These were moved to the src/stm directory
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b8100ea5042013bb4eed67907b4e9d4e5c196df2
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 16 20:23:31 2012 -0700
Add stm bringup timers and move most of the setup code to the stm dir
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9279fd42793123784ce83ca151df6f4630487722
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 16 20:21:09 2012 -0700
Add STM platform and stm-bringup demo program
The stm-bringup doesn't run altos, it just initializes the device and
writes stuff over a serial port. Works on the STM32L Discovery board
at least, should do stuff on other boards too.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e2f13aa43ba79becbff6c9bfc18c665a58d96185
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 16 14:25:37 2012 -0700
Add example STM32L programs
This loads to flash and sends data over the serial link.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3c7d1f6cfffb43299041f2850a48177f4e9b83a5
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 22 23:26:03 2012 +1300
'stdin' is a special name in some compiler environments, don't use it.
Switch to 'in' in the prototype for altos_serial_set_stdin.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bdfcc9112c41c494de23594963980a730b625cc4
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 28 00:49:29 2012 -0700
altosui: Disable launch controller button
The launch controller should just be a separate program.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cf1e95810559584705d0b8a787375938c68e07c6
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 28 00:37:52 2012 -0700
altosui: Add Configure Ground Station dialog (trac #29)
Allows the user to configure the teledongle frequency without opening
up the flight monitor window, and also shows the teledongle fixed
values like radio calibration, serial number and software version.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d60862fce6ac27a97ad6337eea32a4b48645d158
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 28 00:38:37 2012 -0700
altos: Make sure config values are loaded in 'c s' command
ao_config_get may not have been called when ao_config_show is invoked
by the user, so make sure the config values are loaded before showing
uninitialized data.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b98f75dbcccd40c8cbf32c3bfd21bd6f5648b861
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 27 22:54:17 2012 -0700
altosui: Sanity check values from device configuration
If someone has down-graded and re up-graded the firmware, the config
entries may be garbage. Sanity check them to avoid crashing the UI.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b6c7ae2c1f8cba7351cd139c49322280d9d3af47
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 27 22:53:08 2012 -0700
altos: Reset config version if it's too large as well
Any future config values will get trashed if we down grade the
firmware, so we must reset the firmware version whenever it gets
written.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3f0379db7067eaf104892a82b9c49142087adece
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 27 22:02:13 2012 -0700
altosui: Make 'monitor idle' work with older TeleMetrum firmware (trac #28)
Older TM firmware did not have the 'done' line at the end of the GPS
report, rather it would just stop after showing the Flags value. Check
the TM version and stop looking for GPS data when the Flags line appears.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7a9baabaf33db5e30eb4ef8f923a4fd96fd28fb4
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 27 21:49:58 2012 -0700
altosui: Mark data 'Age' in monitor idle UI too
Just like with the flight monitor UI, it's nice to know how old the
data in the monitor idle UI is, in case the data link to the TM isn't reliable.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2f19f9a0eaba22789fdc07a52849e8aaf6fe4695
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 27 21:48:43 2012 -0700
altosui: Catch attempt to set radio frequency to 0.0 -- use default
Monitor idle was setting the frequency to 0, which takes a while with
the new native radio frequency setting code. Don't do that, instead
pull out the preferred frequency for that, as is done in other places
where a frequency of 0.0 is used.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 170510bb183715e9ba580b180f20657d6602644e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 27 21:13:31 2012 -0700
altosui: Find actual landing time when computing stats (trac #23)
Look for the last time the height went from >10m to <2m from the
nominal landing altitude and use that as the landing time when
computing things like main descent speed, time under main etc.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0952224c36eba25db34bd147d2d579c66b15bbf8
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 27 18:24:51 2012 -0700
altosui: Change flight data saving UI to separate download/delete selections
First pop up a dialog to select flights for download. Download
them. Then, after that, pop up a *new* dialog to select flights for
delete. Offer to delete all of the downloaded flights by default. Then
delete the flights.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7dd1d62676c1e605fe69a4c0acfe7638c6b79aa5
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 27 18:19:05 2012 -0700
altos: Optimize ao_freq_to_set a bit
Reduces size from 327 bytes to 287 bytes
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d77a4ea206d627635159f35c76c744687d4e633b
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 27 11:58:39 2012 -0700
altosui: Show only supported telemetry version
Make it clear in the UI which telemetry versions are supported,
providing the combobox only for new firmware which supports all versions.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d8ebb83e64d66fa159e75aa560d39d80bb6d9d04
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 27 10:38:32 2012 -0700
altosui: Configure radio with new direct frequency setting
Instead of computing the radio setting in altosui, let the radio do it directly.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c1d12a117b36de7fe8dd992959b890bfd1163e81
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 26 23:35:35 2012 -0700
Do radio settings solely by frequency
Compute the radio setting needed based on the calibration value
provided and the requested frequency.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c2550d72aee371676d2f09316051567681e53a7c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 26 22:05:04 2012 -0700
altosui: Use ConcurrentHashMap for maps
This data structure is accessed by multiple threads, so it needs to be
re-entrant.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8610fdae8f47e1e8b6e8525227cc912664ecfafd
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 26 22:04:13 2012 -0700
altosui: Show time since last packet in flight status window
Makes it easy to see when the UI is wedged, and when telemetry data
are being successfully received.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 392a3107b9e9cc8c1ea51df6ff5ec54817adbc65
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 26 20:11:34 2012 -0700
altosui: Restructure telemetry classes to be more sane
* Make AltosTelemetryRecord be a class, rather than an interface.
* Inherit from this for AltosTelemetryRecordLegacy and
AltosTelemetryRecordRaw.
* Remove bogus AltosTelemetryRecordGeneral class.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 77639dae0fb9975219c2e211ea6dd6c7965eeea2
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 27 23:50:43 2011 -0700
altos: Require callsign match in packet code
Ignore packets with mismatching callsigns to avoid accidental
connections between devices controlled by different stations.
As a special case, if the device is configured with the default
callsign (N0CALL), then let anyone connect. This allows configuration
of new devices without needing to change the ground station callsign.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1b4a4c7b6a0c3f93267f33482f490e7aa25c2158
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 13 10:40:30 2012 -0800
doc: Add companion SPI message protocol doc
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5d42ded7ebdb0c134c8dac61f41525c37d81ae61
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Jan 13 10:44:23 2012 -0700
update turnon_telemetrum to v1.2, add more turnon scripts
commit f450f8bc70f857053b26c4379f54a318062e89a1
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 3 22:27:59 2012 -0800
altos: Set correct registers for serial0 baud
oops. not going to work very well setting serial 1.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c6821ae734a7efaf2e069f6c5edf9605a9dbe125
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 3 20:46:25 2012 -0800
altos: flush stdout when fifo from arduino serial port is empty
This avoids leaving bytes pending inside altos
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 65b9b5d0d91fef2c7452dc77017f31f176672304
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 3 20:42:41 2012 -0800
Build teleshield by default
commit 7a42f2e0f145d2d520aed8e241fa39f7cb62b19f
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 3 20:41:15 2012 -0800
altos: Add support for UART0 in async mode
And copy bytes from it to stdout.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 085625ff3992454b59583d95a3c415597c51f754
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 30 15:42:28 2011 -0800
altos: More _asm -> __asm changes
Missed a few last time
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 614ab6a991258a5caad0ca12ae35d0288a5b7503
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 30 15:38:32 2011 -0800
altos: Clean up for SDCC 3.1 - more keywords
_asm -> __asm
sbit -> __sbit
remove variables named 'data'
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bbb94a6a25a106316414a9a281e924f6c56e9f38
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 30 12:27:35 2011 -0800
altos: SDCC 3.1 wants __at instead of at
Older SDCC would accept __at, so just replace all occurances unconditionally.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4783ac9653fd4f816f839452795e0d2e52129d5b
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 27 15:47:54 2011 -0800
altos: Switch teleshield to use radio slave mode
And bring it up at startup time by default
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 791c137728dd3398bd7275be13cc9e6be96d7af4
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 27 15:37:28 2011 -0800
altos: Add teleshield directory and bring-up code
This is cobbled together from various existing bits, but should at
least provide some ability to test a teleshield board.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit eff8611e3eb19853b06acfcd7e978c9046cd5f78
Author: Keith Packard <keithp@keithp.com>
Date: Sat Dec 17 17:05:06 2011 -0800
altos: Create TeleMetrum v1.2 directory
The hardware is software-compatible with v1.1, but it's nice to have
the right version number in all of the files.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6baf6f41040f7b074d8cc84ef75e254c5d2b466b
Author: Keith Packard <keithp@keithp.com>
Date: Sat Dec 17 16:58:04 2011 -0800
altosui: googleearth doesn't accept spaces between coordinates anymore
it got pickier for some reason; let's not put spaces in now.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dbf7c0c59854e040b65f068069d80716f02fc1bc
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 13 23:03:22 2011 -0800
altos: Fix pad orientation for pre-1.1 boards
They use a different code path for accel as they don't have the
VCC compensation code in place.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c1e293ff4953b51c19af8b52f2999419ea84e7e5
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 12 19:19:40 2011 -0800
altos: Add startup and config (view only) pages to TT
The config page needs a pile of work before it's useful.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 02b4e52a5349217df43105eaa1fff6bfc7dac4cc
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 12 19:18:53 2011 -0800
altos: Enable packet master and debug in TT
The code was already getting linked in, so we might as well use it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e7044fd95472449e2fb860cef902fa458b91ccac
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 12 19:18:23 2011 -0800
altos: Fix sdcdb settings for telemetrum v1.0
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7f9e76e0d3492dcc8bf4b5b1f07c3c727cfdc0ef
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 12 18:54:14 2011 -0800
altos: Trim skytraq NMEA messages. Shrink NMEA header matching code
Tell the skytraq to not bother sending a bunch of the NMEA messages
that we don't parse.
Explicitly look for 'G' follows by 'P' instead of having some general
header matching code.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d3dcb9451f40506abced72783966104645a73bc7
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 12 18:52:02 2011 -0800
altos: Allow TT/TBT reports to escape landed state
The TM altitude reporting code kept beeping out state and altitude
forever, which isn't very useful on TBT or TT.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0f7d7a4fbede63b51208bf051e08aa73dfbf35a0
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 12 18:51:31 2011 -0800
altos: Remove LCD debugging code
This isn't needed anymore.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 430b439b9a5cc98b32273a233505de2c2f975c59
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 12 18:51:03 2011 -0800
altosui: Add ao_lcd_cursor_on/off
This shows or hides a blinking cursor on the LCD.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 75a8490a7bee2a2c7afd559b13f1d9c40c2aa08f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 12 18:49:17 2011 -0800
altos: Add configurable set of channels for TT
This adds the channel list for TT, which will be configured by
AltosUI.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2ba946fea29ff134ffaeaea9d7932f4bd4e953aa
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 12 18:48:07 2011 -0800
altos: Export 'ao_cmd_is_white' for use by other code
This function tests the current input character.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 20282ef00afe70e3f3193f6f0200254cb2c33e93
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 12 18:47:08 2011 -0800
altos: Set default flight log max to 127k on TM v0.1
The flash part on v0.1 boards is only 128kB.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5972c642f0de0789e90268bfa19ef8b51c06eebc
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 12 18:44:36 2011 -0800
altos: Handle internal and external telem monitoring requests
Record separate internal vs external monitoring state, allowing
both to happen at the same time, and when either is turned off, the
other keeps working.
This also adds disable/enable so that other radio users can
temporarily take over the radio; monitoring will resume when the other
radio user is finished.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ef7f86453d686a49882e8c1b88a59228c4c631a9
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 12 18:37:53 2011 -0800
altos: Check pdata+xdata memory usage during build
The sdcc linker doesn't check the sum of pdata+xdata memory usage, it
only ensures that xdata itself is small enough. This doesn't keep
xdata below the end of usable ram on the cc1111 though (0xfe000).
Fix up the check-stack program to also make sure all of xdata fits in
available memory.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2bce71eba9f44b6fcf64e307c8174824c3a0fb57
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 12 18:32:49 2011 -0800
altos: Set SPI fill value each time it is used.
This ensures that the final MOSI pin value will be high after a
receive is finished.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0a705b62829d492e3a48c81077907cee61afb860
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 12 18:31:46 2011 -0800
altos: Initialize DMA config address at boot time
Instead of resetting these each time a transfer is started, just set
them once at boot time.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4de8bf6da4d725bb0514d032b0708c5cf420e8fa
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 12 18:30:56 2011 -0800
altos: debounce buttons
Provide API to clear out any button events that happen during startup,
and then discard button events 'too close' together.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ad41b5820c2e252627959e4627473f07784be23e
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 12 18:29:38 2011 -0800
altos: Build TeleTerra v0.2 by default
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f6db11c3c87725c809c518f5f19b07325faf9c84
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 12 18:10:18 2011 -0800
altosui: Deal with serial port exceptions a bit better
This catches a few exceptions and tries to make sure the serial port
is closed afterwards.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b132eefc5f63412bb4a98a4bb72b9055e40d5d42
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 11 22:30:17 2011 -0800
altos: Make ao_xmem funcs require __xdata void * instead of casting
Having an explicit cast in the ao_xmem wrapper macros caused the
compiler to generate garbage values for pdata addresses, making the
upper byte 0x00 instead of the required 0xf0. Removing the
casts from the ao_xmem macros exposed this problem, so a new
PDATA_TO_XDATA macros was added, along with a CODE_TO_XDATA macro
which serve to cast pointers, with suitable address modifications, so
that things work again.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7ecde50fbebe68a2e2200a2f8d081fd37074f840
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 11 22:24:22 2011 -0800
altosui: Make UI Look&Feel configurable
Saves the preferred style and uses that for all current and new windows.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 713bd503902526c17a7657c18be947ef8fa6a47a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 11 17:18:08 2011 -0800
altos: Shrink Skytraq NMEA parsing - common nmea_finish code
This shares the checksum testing across all three lines, saving
another 103 bytes.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d3e8275572550b700563b3bde73cd7a43b608f17
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 11 17:11:39 2011 -0800
altos: shrink Skytraq NMEA parsing more
This cuts another 78 bytes
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8266d8d39c0103e68ef3e476b9639574d9a48771
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 11 16:54:18 2011 -0800
altos: Shrink code size of Skytraq NMEA parser
Just mess around with the code to make it smaller. These patches save
173 bytes.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit df08b2f6de464f4546c1809b931eb4910d88b558
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 27 01:01:11 2011 -0700
altos: A bunch of missing .gitignore files (mostly)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a7b285ec0945830b8b31877115157ddd12d6a9fb
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 27 00:57:45 2011 -0700
altos: Add i2c driver for avr chip
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0669f0d74fc24c4f1925a45a9975b7a49a65b692
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 27 00:49:23 2011 -0700
altosui: Only update GPS data when new GPS information arrives
Track which telemetry packets are actually producing new GPS
information and only update the GPS average position and count of
stable GPS reports with new GPS info, instead of on every telemetry packet.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c7e14a2750d437e8b77d68a944a0711e7a0c882b
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 27 00:35:35 2011 -0700
altos: Fix distance/bearing computations. Deal with large values
Lots of little math errors dealing with large distances; easily tested
as the GPS currently reports lat 24 lon 121, which is a long ways from
Portland.
Now reports distances in km when large, otherwise in m.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit da330c5975b9f565d059ef8084dfdacc20f34246
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 26 22:49:11 2011 -0700
altos: Bring up basic TeleTerra v0.2 UI
Lots of fun stuff here -- multiple panes of information.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8e4cceedb5b758faae684978299e667c4bb06f4d
Author: Keith Packard <keithp@keithp.com>
Date: Sun Oct 23 15:24:02 2011 -0700
altos: Flip button IRQ initialization around
This matches what the docs suggest
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 90e738a3379d258a48a7c92f6708040fc39c373a
Author: Keith Packard <keithp@keithp.com>
Date: Sun Oct 23 15:20:50 2011 -0700
altos: Fix battery voltage computation.
Full scale is 4.95V, not 3.333V.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f70553106707e3496d07eecb83f0c0a1acad7f77
Author: Keith Packard <keithp@keithp.com>
Date: Sun Oct 23 14:51:32 2011 -0700
altos: Add battery voltage sampling driver
For devices without a full ADC compliment, this just samples the
battery pin and converts to mV.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7e7a10c06a0486e9f869e361e46f2c98db9897b0
Author: Keith Packard <keithp@keithp.com>
Date: Sun Oct 23 14:08:59 2011 -0700
altos: Add button driver and sample user
Hook up the teleterra buttons and have them beep
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8e2736226fcd7c1ab1ba93a5ebac9b285ebf4733
Author: Keith Packard <keithp@keithp.com>
Date: Sun Oct 23 12:55:35 2011 -0700
src/teleterra-v0.2: Initialize more hardware
Initialize the flash storage and flight state reporting beeper.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 07d4477b2e8477e96a2f155a25f95e14a9a47efa
Author: Keith Packard <keithp@keithp.com>
Date: Sun Oct 23 12:51:05 2011 -0700
altos/teleterra_0_2: Initialize LCD driver
Initialize the LCD for testing.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 85b259c5bba7edbd2a79471bb1104bcf3904d536
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 21 14:58:26 2011 -0700
src/teleballoon-v1.1: Use Tm style initial state stuff
Come up in pad mode unless someone talks to us while in idle mode.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit eb61f7aa2c8b692bd892b85e782f249187c80e5c
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 21 11:30:43 2011 -0700
altos: Add teleballoon-v1.1 directory
This is an alternate firmware load for telemetrum v1.1.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a10aa835a06b71e2cefeb6b10daaf8cc394603b6
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 15 22:54:40 2011 -0700
altos: Add LEGACY_MONITOR defines to more programs
Make all monitoring programs define whether they want all of the old
telemetry formats too.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit aef732fc9cdf527a18f2959d6fb7903e832209da
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 15 22:54:02 2011 -0700
ao-bringup: Make it build with source restructuring
Source code all moved around, need to find the header files in new directories.x
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0debe7ffc2aab2b4d08f42e488cb783ae91c36ab
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 11 23:30:53 2011 -0600
altos: Add TeleTerra v0.2 product
This includes most of the necessary drivers.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 65873a3ad1d8e8b5ec002be2576c6f496543306a
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 11 23:29:24 2011 -0600
altos: oops -- forgot to add the cc1111 string code
This is required for all cc1111 builds now; it provides xdata string
functions.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit badda0d910c56135401dce9adc9e6abebdba2ad7
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 11 23:28:02 2011 -0600
altos: Split out arch-specific bits of LCD driver
The arch-specific section just puts a single nibble to the device.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 47c2c0b79dc516d2566ae149605b7d70ef2dca98
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 11 20:58:04 2011 -0600
Bump to 1.0.9.3
TeleScience and TelePyro now work.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 652c024ed37bfed5de17f45c772796d5cbe4599f
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 11 18:48:55 2011 -0600
altos/telescience: Add more header dependencies
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 75960500d1f290fa9f82183431443ac122f12c19
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 11 18:48:11 2011 -0600
altos/avr: telescience doesn't have room for the flash write code
This is useful for debugging the SPI and flash drivers, but not
necessary in production code.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b80f8ffb61566cbd134c399ea6ccf9290075490b
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 11 18:45:51 2011 -0600
altos/avr: Must leave space for init stack in ram
The stack used during system initialization lives at the top of RAM,
so leave some space for that.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f1573a752425121d4c6a14285f1eb0fef3a8bea5
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 11 18:44:48 2011 -0600
altos/avr: Shrink default stack size to use less ram
Not that we have any way of knowing how much stack we're using, but at
least this seems to work.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cb837d9bb9e6736fcdfca7692b1f9490ea090838
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 11 18:13:00 2011 -0600
altos: Allow ao_science_slave to not log data
This is mostly for debugging with flash writes disabled.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ac0bebc44bc657b303db4c41fa0c9624f3df9f4f
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 11 18:11:56 2011 -0600
altos: Make HAS_STORAGE_DEBUG define consistent
This allows products to include the 'w' command for testing flash
writing as needed.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3a28846d3ff8f82b0e97c211b9debf6d67ee5af5
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 11 18:10:45 2011 -0600
altos/avr: Clear SPI receive buffer before clocking new data in
I don't know why this is necessary, but the receive buffer gets
'extra' data added somehow.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e60c470b426b7be08a33133e7d8c94201d7e96d4
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 11 17:44:40 2011 -0600
altos/avr: Pull-up on the SPI slave select pin
This makes the board work even when disconnected from TeleMetrum.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit af4470f8025116179ef83726a8287e47c465907b
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 11 17:44:02 2011 -0600
altos/avr: Register stdio handler when using serial for stdin
This code was left in a bit of a mess; just clean it up.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3bda859caf1501f8408703dca81412d70ba00e04
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 11 17:42:24 2011 -0600
altos/avr: telescience does not have a serial port
The USART is used for SPI to talk to the flash part.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0a186e92c5773c5d908e9cee889d645a8172dcdc
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 11 17:39:35 2011 -0600
altos/avr: Make ao_arch_critical argument be a statement
Wrap the argument to ao_arch_critical in do { } while (0); to make
sure it gets correctly checked as a statement.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f3453068b0feb640b9d11dbeb021c535ce8b4a31
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 11 17:39:06 2011 -0600
altos/avr: Print newline after dumping ADC values
Cleans up the formating a bit.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 06b044629951b06c7ec9b0105b89f51b2880ebd0
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 11 16:03:04 2011 -0600
altos/avr: SPI mutex is now held by the caller, not the SPI driver
SPI transactions generally require a read followed by a write, with
the chip select held the whole time. As a result, the SPI bus must be
held across multiple transactions. To make this reliable, the caller
must hold the SPI mutex, instead of the underlying SPI driver.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5d1361c95f94125cda244b4cc5e55c2fb77b680b
Author: Keith Packard <keithp@keithp.com>
Date: Sun Oct 9 11:09:25 2011 -0600
altosui: Deal with missing state transitions in FlightStats window
Any missing start/end times are pinned to the end of the flight.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5c82b07471f017171c58a6968adf79901f46a987
Author: Keith Packard <keithp@keithp.com>
Date: Sun Oct 9 10:55:04 2011 -0600
altosui: Deal with telem data that goes backwards in time
The new telemetry stuff can send packets with older timestamps, so
sort telem packets read from disk to create an in-order record of the flight.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 636b7b368e67346b0796cd84fbfd71e10966d61f
Author: Keith Packard <keithp@keithp.com>
Date: Sun Oct 9 10:21:56 2011 -0600
altos: Respond to telemetry rate changes immediately
Instead of waiting for the previous telemetry interval to expire,
immediately switch to the new telemetry rate. This will provide
more telemetry data early in the boost.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ca036c5616c3e745c0b878ed90618d4ff710c0e5
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 8 22:19:52 2011 -0600
altos: Improve TM v1.0 apogee estimate
v1.0 boards have noisy accelerometer data caused by interactions
between RF transmission and the accelerometer measurements; this noise
generates a negative bias in the accelerometer readings. The net
effect is that the estimated speed is lower than the actual speed,
causing early an apogee estimate.
By increasing the sigma value for accelerometer data, the kalman
filter 'trusts' the acceleration data less, putting more weight on the
barometer data. This causes the estimated time of apogee to be closer
to the correct value.
This reduces the response to changes in acceleration.
This new value is applied solely to TeleMetrum v1.0 boards. v1.1
boards correct for this error, and hence can use the correct sigma
value for the accelerometer.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 26d7eb7149da8c797d7e704d75f73af2d2aa52c2
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 8 21:31:34 2011 -0600
Bump to 1.0.9.2
(1.1 RC 2). Flown at Oktoberfest 2011 on 10/09/2011 (we hope)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit aad03e3cab4c328e53d3df47b6dac1d3f7a49229
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 8 16:07:57 2011 -0600
altosui: Remove igniter voltages from chart.
These are just annoying; when we add the ability to turn stuff on/off
on the fly, we can add them to the list of available items.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6a7363b3ba99310bd44c9b66f6f5159e46762be4
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 8 11:51:05 2011 -0600
altos: Ignore ejection bumps when doing boost re-detect
An ejection charge looks an awful lot like an extra (really small)
motor burn. Ignore them by averaging the acceleration during
fast/coast using a /64 exponential decay filter.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 82604193ed0c522c1fba0072b504fe88b027f1ee
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 8 11:50:24 2011 -0600
ao-telem: Add new program to convert telem data to ascii
This reads telem files and displays them in ascii form. It's not done,
and it's not documented, but it's a start.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cbf5a649c8b7101bef9d57e48e42ac775e758c79
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 8 11:46:38 2011 -0600
altosui: Allow for multiple instances of each state in the graph
With the new boost re-detect code, we can get multiple instances of
boost/fast/coast, so make sure each are displayed in the graph.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f9b0b7423c0640f729d61a91de6ff96ffe4b486e
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 8 11:43:37 2011 -0600
altosui: Max acceleration across boost instead of all ascent
This ignores ejection bumps, making the max acceleration far more useful.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 258b75498916183ed250d3abb3282fe3d843e7a1
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 7 09:53:09 2011 -0600
altos: Write xdata versions of memory functions
These are significantly smaller than the general pointer versions from
libc on the cc1111.
Signed-off-by: Keith Packard <keithp@keithp.com>
Conflicts:
src/Makefile.proto
src/cc1111/ao_adc.c
src/cc1111/ao_packet_master.c
src/core/ao.h
Fix up the new makefiles
commit 128bbfa150f88c09f7adde2434b7bf0b5a9ed556
Merge: f6f54d7 246864b
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 7 08:41:56 2011 -0600
Merge remote-tracking branch 'origin/simple-quiet' into multiarch
Conflicts:
configure.ac
fix version number
commit f6f54d70b768dca1715ddddea64a4df00d82b09e
Merge: 1c344b7 0d10e25
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 7 08:40:14 2011 -0600
Merge remote-tracking branch 'uniarch/master' into multiarch
Conflicts:
src/core/ao_cmd.c
Use ao_arch_reboot after waiting for a second
commit 0d10e25766b96f5660e213115cf27b71ff164405
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 27 21:06:54 2011 -0700
altos: TM: Don't turn on packet slave mode until idle/invalid state
Leave the packet link disabled until we've checked the
accelerometer. That way, we cannot accidentally get to idle mode when
the rocket is on the rail.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fba1d605a627d03f9587ec060c45fb5d3e96aaeb
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 26 11:50:28 2011 -0700
altos: Delay reboot by a second to avoid re-entering idle mode
TM and Tm go into idle mode if they receive a packet after boot
time. When tebooting the device over the packet link, the packet
master would be (rapidly) polling the device for additional data and
so the device would invariably receive a packet during bootup and go
into idle mode again.
Delay the reboot by a second to give the controller time to disable
the master end of the packet link.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1c344b760776cd5d8c0297d8db9bf02687381b4e
Merge: 4ed53ef fc4173f
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 7 08:34:59 2011 -0600
Merge remote-tracking branch 'origin/master' into multiarch
Conflicts:
configure.ac
Fix version number and location of ao.h header
commit fc4173ff882dd9718f34ed043276ef612783dfe0
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Sep 27 00:59:08 2011 -0600
add run-time dependency on libjfreechart-java
commit 989aae5b18856e3420ea5b7a26ddd8dccae9d6d3
Merge: 0552fbe e44f1ff
Author: Bdale Garbee <bdale@gag.com>
Date: Sat Sep 24 15:34:59 2011 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 0552fbed34c9698dac30c239df2a823a8502b3f3
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Aug 30 16:59:53 2011 -0600
include 1.0.1 release notes in docs, closes: #642705
commit 4ed53ef838afd4e922deb1c721a311974527525a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 23 10:24:33 2011 -0700
altos: Debug code for telepyro doesn't fit in telescience
Just too many strings.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f1328d22aab4378c4fb6f0c24dbee95948ca836c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 21 23:21:04 2011 -0700
Dump test conversion of ADC0
commit 9b498a6b1327f543c73145e02ff16e76d09f2fe4
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 21 22:54:56 2011 -0700
Dump ADC registers
commit 7bc007ed45af8fe9ef5daeb7844f183cd9a49035
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 21 18:13:55 2011 -0700
altos: Fix make-kalman to run under dash
Dash can't deal with >&, so use the old-school > file 2>&1
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 74d5dea5d5ef91db823018b631613d15c6da085d
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Sep 21 16:42:52 2011 -0600
fix bashism that prevents building with /bin/sh->/bin/dash
commit f68f22f527104cdffa1f5e398a51a466a13ff1fb
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Sep 21 16:42:22 2011 -0600
add missing sense_h entry in TelePyro table
commit 16aa67fc77b82a9d051f205037b27a5384e3e3b7
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 21 14:24:30 2011 -0700
altos: missing ao_log_single.c
Neglected to add this file.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7a02d4bace05cc829522933b9df6b82a9e17336f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 21 11:30:43 2011 -0700
altos: Add TelePyro v0.1 support
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0820f5c6dfe067590f36e8201a4049719dcf3d7c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 21 11:40:56 2011 -0700
altos: Support staging by going back to boost as needed
Detect additional motor burns by looking for high positive
acceleration in coast or fast modes.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c8a00bb9ccdf0d4257f037c2bf996ce5e6b0b0c0
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 21 11:39:24 2011 -0700
altos: Pre-compute RDF packet len at compile time
Instead of computing the RDF packet len at run time, which takes a
pile of code space.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit abf17522c206b465375b73a004a6d67bfa714ba3
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 21 11:36:11 2011 -0700
altos: SPI slave code is now per-product
We can't write general purpose SPI slave code as we must eliminate
any latency because the SPI ports have no buffering.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 246864b0597ddd397aba39be1fe39df0df189433
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 16 18:27:56 2011 -0700
Update to version 1.0.2
Bdale is planning to fly this version on 9/17.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit eaa7d7c7dd445ade7d8e3228306785f9a545b89a
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 4 08:49:16 2011 -0700
altos: Silence radio while firing igniters
Hold the radio mutex while firing igniters to reduce potential
interactions between the two.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d1e81db87ce0f89fd0b7651ca00979498cd00b78
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 4 08:48:05 2011 -0700
altos: Delay restart of RDF at apogee
Instead of immediately trying to send RDF at apogee, start it after
the usual RDF interval to avoid doing RDF while firing the apogee igniter.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e44f1ffb7104d70f5c9b9a90529ddbe1b75da074
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Aug 30 16:59:53 2011 -0600
include 1.0.1 release notes in docs
commit b2d4e49bfe88aa61ca36fb1af8f3088c5754304c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 29 14:22:19 2011 -0700
altos: Split avr clock initialization to ao_clock.c
This will be shared with the attiny code for TeleTerra v0.1
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e66fd72664aae7c000dce9c528803e28e7918fdf
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 28 17:03:26 2011 -0700
altos: don't beep igniter continuity for telenano
Without any igniters, it's not nice to annoy people.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 122c4101164d598e655fa9ad8473053d30ff4212
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 28 16:55:55 2011 -0700
altos: Report continuity in telebt
Report continuity values from remote altimeter
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9b9568a637ffdbc67225271005f2b996ee08a0df
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 28 16:39:41 2011 -0700
altos: add 'report' to telebt
This beeps out flight state changes and max altitude at landing, just
like the altimeter.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 31e3255b6cbfaf95c0e97e2d1ec8de72f845994c
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 28 15:50:30 2011 -0700
altosui: Report error message back from libaltos
This includes changing all of the error dialogs to show the error
message rather than just the file name.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cf72c2f5a69a736c28a9b63e124d510ef41a9f5d
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 28 15:50:01 2011 -0700
altosui: Add bluetooth bits back in
Stub out functions on mac/windows for now.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3d478a39f2ede7b805bbe568cc1c8ecc176d7a04
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 28 15:45:05 2011 -0700
altos: Add the BT serial debug code back in, disabled
This code is useful whenever the BT stuff is acting up, so just leave
the source in place, turned off by default.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8eaa1c4697a3cfc2406e1adadc3094f7f712341a
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 28 15:43:32 2011 -0700
altos: Add pragma to eliminate unreachable code warning on SDCC
This pragma was removed as GCC doesn't support it; make it conditional
on SDCC so that we eliminate a warning message.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7c6a3195dec6ac68f5d7b3f883ccc2c316384e76
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 28 15:42:25 2011 -0700
altos: Blink on telem packet receive instead of toggle
Toggling the LED was too confusing; just blink for 100ms each time a
packet comes in.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cff737c290347b61ba16584880c2f4c436b95042
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 28 15:40:40 2011 -0700
altos: Remove RSSI reporting from telebt
Telebt uses one LED for bluetooth connection and the other for telem
packet reception leaving none for RSSI.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 27835686648e14b030f6f7ec1fc0c0fd1c387ea4
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 28 15:38:12 2011 -0700
altos: Add RSSI blinking to new-style telemetry code
Pull the RSSI data out locally and set the RSSI led blinking when
using the variable-length TELEM output mechanism.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6f231a3e512ff7fdd87a399a72c7c36f283394f3
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 28 15:20:41 2011 -0700
Bump version to 1.0.9.0
Make it distinct from any production version
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e53557373e539d591a03d02db146b27d08c7eba3
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 28 15:18:29 2011 -0700
altos: Start logging telemetry data right at boot time
Anything logging telemetry data should just start logging packets as
soon as they boot.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5c3a0263d292cb0675f608d0ef085d13e51ce6ba
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Aug 28 13:39:37 2011 -0600
update changelogs for Debian build
commit b33a92e372327158ab21c1bb2d091c58761efe10
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 27 15:19:43 2011 -0700
altos: Share log code between telescience and telebt. Add telebt log
Telescience and telebt both log data in 32-byte chunks, so share some
code which manages that between the two products. Add simple telemetry
logging to telebt.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7e2b5e2957ddcb808723081ca7e046a28b7e70e5
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 27 13:30:34 2011 -0700
altosui: launch controller button needs to move over
monitor idle was inserted into position 2,2
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bc827699be4ed9ac60a7e862e6532791968bf685
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 27 13:28:01 2011 -0700
altos: Fix up telelaunch Makefile
Adding all of the mising sources
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8a1cbef0e316e38c80b71d3bac15641fe56e0a99
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 27 13:27:28 2011 -0700
altos: Add HAS_LOG for products that log to eeprom
Some products have eeprom for config, but none for logging (like telelaunch)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6afbc1876cd63f64e8975e300692f95a43866f5f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 27 13:27:00 2011 -0700
altos: ao_launch belongs in cc1111
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9adf2c9c40ea1da2637ed809dc0d004e47844440
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 27 13:25:23 2011 -0700
altos: add ao_aes/radio_cmac to tidongle, teledongle and telebt
All of these can do the telelco stuff at this point.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b3c95582774355c991d0a9f27d0a86881e643e62
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 27 13:24:41 2011 -0700
altos: move igniter defines back to ao_pins.h
so that ao_launch gets them too
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6b2db651a1dbc7ea97fce802b5f10b88be1ab42b
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 27 12:42:10 2011 -0700
altos: Add makefile for telelaunch
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 02df2141e5a67afc16acd01a6c60f3cc61052b93
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 1 22:45:43 2011 -0700
altosui: Hook up the launch controller UI from the main button box
Provide a button to start the launch controller UI.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4568bc796a6c362ebf7f72ee9a5fa4a9a3c4ba6a
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 1 17:08:24 2011 -0700
altosui: Add primitive UI for TeleLaunch
Display status along with arm and fire buttons.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit be117376179126824439d98379079025ca0b245a
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 1 17:06:49 2011 -0700
altos: Keep relay closed while firing launcher
Instead of opening the relay while checking the desired state, keep it
closed until the state goes off.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bc1b94df4d6b92e794ec93d9c1682ae5f61efa61
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 21 22:25:45 2011 -0700
altos: Finish up primitive telelaunch protocol
This adds two commands to teledongle, one to query and one to actually
fire the igniter. These will (eventually) want to be replaced with
something nicer.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4299b5a36a2f6f9f7bbbc3a1b935dd2357c1fb0f
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 21 20:04:05 2011 -0700
altos: Implement remote launch protocol
Uses the radio_cmac module to provide secure communication.
Keeps igniter closed for 500ms.
Provides remote status for arming and ignition.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 776df9ce2e7b4fa5cedda326988e66c614299af4
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 20 23:46:04 2011 -0700
altos: Get AES CBC-MAC packet transfers running
This just has simple command-line based packet transfers for testing.
This also adds special ao_telelaunch bits where the launch control
code will live.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bd0bf00081bb24af5cd67a9351b0b0c1a041d0d3
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 16 14:25:01 2011 -0700
altos: More work on AES bits
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a731d240f802d37524ce84c3c6acf22bcda4d522
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 15 18:51:33 2011 -0700
altos: Start work on AES and raw radio interfaces.
We probably don't want this raw radio interface, but it's a start.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f145be3fc4ee94fdb5c1e2406b6c11d38bdbbd9b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 13 20:01:47 2011 -0700
altos: Start telelaunch product
Looks a lot like TM, but without the flight code.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 859ee0268b9f2e1f5933019f1231d857a1cac4da
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 13 19:59:58 2011 -0700
altosui: Add USB IDs for telelaunch and telelco to java bits
telelaunch is 0x000f
telelco is 0x0010
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b10fbbf0830053a39e4640a53598b1c027615c63
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 1 22:44:13 2011 -0700
altos: Add 'send all baro' compile-time option
This option creates a new packet type that delivers full sensor-rate
barometer telemetry data to allow for off-line analysis of flight
algorithms using all of the data, rather than the slower rate provided
either over telemetry or stored in the eeprom file.
Define AO_SEND_ALL_BARO and this will get built in. Perhaps this could
be a run-time option...
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1c46c419704f661064d200432eb7efeeb11b3859
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 26 20:46:47 2011 -0700
altos: re-order ao_task to match single-arch code
This is just for testing to make the new build match the old build
exactly.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c32893ce79835a8f861d6ef414644c2ff9769ff6
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 26 15:02:43 2011 -0700
altos: Integrate telescience support
Adds a few drivers including an LCD driver
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 93b8f40bb451c9ec152490d1f431ab18f8ecb7d1
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 26 10:52:55 2011 -0600
more release process doc updates
commit 9451ae5e4ea6ecfa512ba93197351682d4d043dc
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 26 10:51:18 2011 -0600
update release process docs
commit 01aee9ebe517ed657692e0a39a31ae0ddfb5b8b0
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 26 10:39:45 2011 -0600
update changelogs for Debian build
commit bc399d97a8424a5262f66a03e3bc403f793bb337
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 26 10:38:44 2011 -0600
roll back packaging changelog for rebuild
commit 13e6e799070a1469cbc2ff990379ee520b8f0e6a
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 26 10:29:58 2011 -0600
roll release notes version from 1.0 to 1.0.1
commit 1d15c841ad276127edae0345bd316c30731fffbf
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 26 10:24:35 2011 -0600
ignore generated log file
commit 58a74c3c3dcd01509224326cffeb67a3e809e4e6
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 26 10:07:15 2011 -0600
fix telemini firmware path name
commit 0a92eb2fa6b213533691288d8f99d72b80312983
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 26 09:43:06 2011 -0600
update changelogs for Debian build
commit 3cea033ec928c21b9f7b810898ed3c3cc536d2ce
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 26 09:41:46 2011 -0600
get ready for a 1.0.1 release
commit 674231773256bacd7acb4b5718c47412e47b813f
Merge: 08e3d54 3bfe8df
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 26 09:37:01 2011 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 08e3d54bacf8b38a7c33e420a0bc19bcc7acedd4
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 26 09:35:54 2011 -0600
moving git-buildpackage config into .git/ since it is fairly specific to
Bdale's build environment, and doesn't need to be in the source package
commit 8125acc030574afed6f23aa8aa302d9c768bb04e
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 25 22:55:33 2011 -0700
altos: get avr-demo to build. Pull in AVR drivers and LCD driver
This completes the basic task of making an AVR version of altos by
getting the Teensy 'avr-demo' program to build.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e9fab7dc99a0e7c22b511c5919adf7df85213252
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 25 22:04:36 2011 -0700
altos: add GCC/SDCC compat macros, init_stack, save_context and GCC stdio hooks
More arch-indepdency bits.
GCC stdio is different from SDCC, so create suitable code in
avr/ao_avr_stdio.c
Create macros to initialize the task stack frame and save the task
context.
Add GCC/SDCC type definition compatibility macros
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a588092a7d76dab92e4ab11e0fdb457d2ddc9025
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 25 21:10:56 2011 -0700
altos: AVR changes - create ao_arch.h files, define ao_arch_reboot
Start pulling changes needed for avr port; architecture-specific code
will live in <architcture>/ao_arch.h. This first change defines
the ao_arch_reboot macro to reboot the microcontroller.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9513be7f9d3d0b0ec29f6487fa9dc8f1ac24d0de
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 25 20:43:44 2011 -0700
altos: Restructure altos build to prepare for multi-arch support
Split out sources into separate directories:
core: architecture and product independent bits
cc1111: cc1111-specific code
drivers: architecture independent drivers
product: product-specific sources and Makefile fragments
util: scripts for building stuff
This should have no effect on the built products, but testing is encouraged
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3bfe8df44b575ca430ffaa051e20faa955a06c03
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 25 18:02:45 2011 -0700
altos: Clear callsign on initial config load
Before being written the first time, ao_config will get set to 0xff
when the config storage is read. This leaves the tail of the callsign
filled with invalid bytes. Zero the whole thing before loading the
default callsign to make sure any extra bytes are set correctly.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 93ecaf7f18f8f4c15953c2e80dc9e1b20d04fdfa
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Aug 25 15:46:30 2011 -0600
update TeleMini turnon script now that we've made a stable firmware release
commit c3314dae2d3df82e188daf6ba8520cce833592c6
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Aug 25 03:36:25 2011 -0600
use multimaint-merge to make Debian changelogs less ugly
commit f9d87de0e2681c2ec5753f4fffef0e61a3a9e144
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Aug 25 02:22:53 2011 -0600
update changelogs for Debian build
commit 41998645c04a2ee856dec272b40c2dc5913291d3
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Aug 25 02:16:17 2011 -0600
add a postinst to remove sources.list.d fragment delivered by old private
versions of this package, no longer needed once we have official packages
commit d65e4f6b0a8ba8f67c8a916f2e8be0ec5c75f47d
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Aug 25 02:05:49 2011 -0600
really, I mean it, no longer deliver the sources.list fragment
commit 0579bd5de9e7686d227a16951dd520439ca5472b
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Aug 25 01:55:32 2011 -0600
we need a main category in the desktop file
commit 3ec03792adebbeadc9c0d4985c6f51877e8ab969
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Aug 25 01:48:11 2011 -0600
update desktop file for consistency with package section
commit 0b1d5b678f0e36fbe09d4d3babffb77f857f098d
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Aug 25 01:37:31 2011 -0600
rewind packaging changelog to last tagged version
commit f0891fc2e4fa4fd6dd5c2bfc74e4514de986a295
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Aug 25 01:35:18 2011 -0600
ao-view is no longer included in the altos package, so have the old-style
Debian menu entry point to altosui instead
commit a7ee1049519bf46b3864666999249876009fc3bf
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Aug 25 01:35:06 2011 -0600
changes in preparation for upload to Debian
commit 2992184f7a032c95e22023080fbc26443ed786f5
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Aug 25 01:30:36 2011 -0600
don't deliver sources.list fragment in official Debian packages
commit 3fc92a529dae410a41038cce38c6a44f5e58bd1f
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Aug 25 01:11:47 2011 -0600
prepare to release
commit 73abe19acf709c00f5352ec12e8cd6edae1d1963
Merge: 1bd781d 5158493
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Aug 25 00:34:49 2011 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Conflicts:
doc/altusmetrum.xsl
commit 1bd781da934c738e0c9294197c7eb622b0710a9a
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Aug 25 00:32:47 2011 -0600
more tweaks
commit 5158493c8df527e7527057c719c75248609eb3dc
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 24 23:21:02 2011 -0700
doc: Remove duplicate documentation about max flight log
This was described in detail in both the System Operation and AltosUI
chapters. Remove the duplicate from the AltosUI chapter.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e268798dc260311f5f0167909481b41c9d27fc1c
Merge: 458f816 242344d
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 24 23:06:44 2011 -0700
Merge remote-tracking branch 'origin/master'
commit 458f816ad23fd6784757b13b244057d4be64260e
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 24 23:06:01 2011 -0700
doc: Describe max flight log, ignite mode and pad orientation
These describe what these configuration parmaeters do, not how to set them.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 242344d3e32e7c7cd9270d708555923fa888e4d8
Merge: 5c1cf74 94a1b22
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 24 23:51:38 2011 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Conflicts:
doc/altusmetrum.xsl
commit 5c1cf7492b82e63a9db9d0238ecbcd2b59486893
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 24 23:50:31 2011 -0600
tweak tweak tweak
commit 94a1b220bbfbb64b9772f3ee64a8e9d353d65e94
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 24 22:29:56 2011 -0700
doc: Move the remaining command-mode descriptions to the appendix
Signed-off-by: Keith Packard <keithp@keithp.com>
commit edfb553bb4fa5b0c7c6c658505b2a99d05fb13bf
Merge: c74ab82 ec96f11
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 24 23:23:56 2011 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit c74ab82a7b7a6ad6f79129a9ef5954270e7e8f11
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 24 23:23:45 2011 -0600
more changes
commit ec96f11666f9cbd98e16caeccd5d399978bde81b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 24 22:20:29 2011 -0700
doc: Updating Firmware is now a separate chapter
The Flash Image paragraph references it, change the reference wording.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 11099fab63d32f53d0f2e04a7ab04392e39b5963
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 24 22:18:29 2011 -0700
doc: Move updating device firmware section to separate chapter
This isn't central to operation of the devices, so move it out to a
separate chapter
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 50769fbbeaaf61111d363411e0ef0b2868681cf4
Merge: 425fa99 d92c173
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 24 23:15:20 2011 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 425fa995aeaccc1ec9ecf011f185b4406df61541
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 24 23:15:15 2011 -0600
more tweaking
commit d92c173615a5fb0278ff6878595bed3f8d813e03
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 24 22:12:39 2011 -0700
doc: use 'radio link' to refer to packet command mode
Make sure 'radio link' doesn't refer to telemetry and eliminate use of
'RF link' and other similar but not identical phrases.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 65ca6f0d7c96432413868274b2cfdea4b76683e4
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 24 23:03:23 2011 -0600
more tweaks
commit 09981cd024297fd4ef093c7468de2b9d5f3c2691
Merge: a476e76 03c8b27
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 24 22:42:39 2011 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit a476e76622b6fa70bf7c8883d2a2a64a382fbd78
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 24 22:42:33 2011 -0600
more doc tweaks
commit 03c8b2702a45a12c4748cd1ec801d720c816d9e9
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 24 21:39:48 2011 -0700
doc: Move Packet Command Mode section to System Operations chapter
It makes far more sense here.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 221157af586c6fd7368ee858a390f38bc5ed50f5
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 24 21:31:05 2011 -0700
doc: Describe packet command mode a bit better.
Include comments about TeleMini in the introduction, and then explain
a bit better what the best method of reliably initiating packet
command mode are (start operation, then boot telemini).
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d4e1aa92b6ce2f3e4c51029595d1d44a7f2f14a0
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 24 22:27:35 2011 -0600
more doc tweaking
commit 6eff8d5831dde8e690586cd2a97ddf1595cd2674
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 24 20:59:28 2011 -0700
doc: Document pad-mode 'on-board data logging' indicator
There wasn't any documentation for this field in the 'Launch Pad' tab.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ca0879ba6e5295b4fa790705f742eb647a462ea0
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 24 20:42:09 2011 -0700
doc: Spelling corrections in altusmetrum.xsl
Lots of minor spelling errors.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 963649aa064acfe75d2ff4babd9a0d35dc254e86
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 24 21:39:21 2011 -0600
doc tweaks through chap 3
commit 3d88e0493ab446d7c7011786390d30618a72d045
Merge: 02d6545 5a9972d
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 24 21:26:26 2011 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 5a9972d41a87d4204c6c93cacf14e2962cc1c59c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 24 20:22:29 2011 -0700
altos/windows: Get latest JRE 1.6 version (Version 6 update 27)
No reason to download stale java bits.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cbfbaabb39f9f7709d00cf3dc63cc1bc7563062e
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 24 19:13:03 2011 -0700
altosui: Make flight monitor font size configurable
Tiny netbooks aren't tall enough for the 'usual' font size, so provide
a smaller option. Then provide a bigger option, just because.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9849883a754a73b861dd7be530753ff5c2abb499
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 24 01:48:28 2011 -0700
altosui: Don't trust companion telemetry record 'channels' count
It can be bogus, allowing the code to walk off the end of the
allocated data array.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 02d65453225a3807e61b2ac6e2a26da31a05bd45
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 24 01:53:02 2011 -0600
update changelogs for Debian build
commit 1d286dab223e6c44a25180f944ccb5ba8ed9d5f5
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 24 01:51:54 2011 -0600
prepare for another rebuild
commit 82634eae16f9691a6c70a48d0858a399814631f2
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 24 01:50:56 2011 -0600
add pkg-config to the build deps
commit cf2823cab40aa450375c108bae8ed6b051fbefe5
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 24 01:45:28 2011 -0600
update changelogs for Debian build
commit bf6f00693c394f885d3378415dc7c8a1815a31ed
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 24 01:43:59 2011 -0600
roll changelog back in prep for another test build
commit 06aee245eb74e839e50226fa2ddb967c3977fe7c
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 24 01:41:53 2011 -0600
another test round
commit 4d94e8f9f807a0bbeab0cdead011e74eeca1d1b6
Merge: 4b5369d 3b0a9a1
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 24 01:38:58 2011 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 3b0a9a1c87390747492bfef435ac8e0829ec748f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 24 00:29:36 2011 -0700
altosui: Try to get dialogs to look a little better
grid bag constraints are not my friend.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2165e82327faaada23f0503b8e49b80f938b746c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 24 00:09:51 2011 -0700
altosui: Add tool-tips to config dialogs
Provides more information about the various settings, and, when
they're disabled, tells the user why.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 63808e0392f43633f92fee137d968e969dd364c9
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 23 23:20:00 2011 -0700
Remove stale tools (ao-dumplog, ao-postflight, ao-view)
These tools have all been supplanted by altosui at this point, and
keeping them around increases the build dependencies by quite a lot.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 186dfc7c72aa7eba281f29f917088e49e44c2ddc
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 23 22:51:57 2011 -0700
altosui: Use system look&feel
Turn on the 'be less ugly bit'
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4b5369dc3da2fc8441eeacbf094537b0cf52240d
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Aug 23 21:37:17 2011 -0600
update changelogs for Debian build
commit 99316a17a9642a207c45610e7cc1c33c2600ece0
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Aug 23 21:33:53 2011 -0600
rewind changelog to 0.9.6.0 for rebuild
commit 192881b7cae49af375cc2b8b7305c937079ee724
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Aug 23 20:11:01 2011 -0600
update changelogs for Debian build
commit fc7e46b1215ea2b4cc138ed77d8eaa122369b15f
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Aug 23 20:10:14 2011 -0600
turn off auto-tagging during Debian build
commit 998adccc1c4f8f6c44833bbf4a52d9441748b996
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 23 18:56:07 2011 -0700
altosui: add tool-tips to the button box.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 754b9591574c12ddd6e4ab590c6a5f3806b80213
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 23 13:29:23 2011 -0700
libaltos: fix Mac OS X function signatures
altos_list_start was declared to take a (int time) parameter for some reason.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fa6df3fa21e8f09e70371e6c6cc7827a533b4fe6
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 22 23:35:28 2011 -0700
altosui: Update mac os X library
This has been tested on 32-bit OS X and it works; dunno about
64-bit.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 955989147f90a4fd22c1375d1b41425dae4e7dd1
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 22 23:34:55 2011 -0700
altosui: Reset all config data on 'reset' command
This lets you switch altimeters without getting any stale data.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d249da3fb064754753bd20cd2ca1e5ffcce294ca
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 22 23:33:52 2011 -0700
altosui: Only 'show' config dialog once
Otherwise, the dialog jumps back to the initial position each time the
data is updated.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e9254c3472e42d93181674b2c3cd80fe6eea696e
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 22 23:32:36 2011 -0700
altosui: fix 'magic' string to signal end of config data
Was using "done", which happens to be displayed by the 'l'
command. Switch to 'all finished' which doesn't appear in the config
data output. Yes, this method is a kludge.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4aebe65b089e4b825a5ae238b81e2181bd88175a
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 22 23:31:54 2011 -0700
altosui: Can't configure flight log max on TeleMini
It's only got space for one flight.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3a84e8e0cc86481c301f4335843a0e1a94bad5c0
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 22 23:12:30 2011 -0700
altosui: Make monitor-idle display correct 'On-board data logging' status
Count number of stored flights and see if there's space for another
one.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit afe6aba9cb91e93234ffee2a22eee40f848ddedd
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 22 18:25:34 2011 -0700
altosui: Add --summary option to dump flight stats to stdout
useful for quickly capturing sense of a flight.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4e2fd7ae76c23aa8da1390ebcbd8f45276cd7a32
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 22 18:24:54 2011 -0700
altosui: Show filename in AltosGraph window
Makes it easier to tell multiple windows apart
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f4ea46dc205454411c224ada7805f813989efd4a
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 22 18:23:41 2011 -0700
altosui: Add date/time/serial/flight to flight stats tab
And switch to using the AltosConvert units conversions functions.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b4c71ba56c471720c72853057d0a527825a78fa0
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 22 18:22:21 2011 -0700
altosui: Capture date/time/serial/flight in AltosFlightStats
Time is the time when boost was detected.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5ef731bd87c6d2a71a4edcc69a218eaf1aa7c465
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 22 18:21:35 2011 -0700
altosui: Add a few simple unit conversions
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b83d8eca433ed5796835f6a09271f50c7f27cc81
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 22 17:18:02 2011 -0700
doc: Add Installation Recommendations chapter
Document installation suggestions, including mounting, RFI, antenna
issues and ground testing.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a0f62b8569c5535a2598cfb6ab52db79f0a52f92
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 22 17:17:43 2011 -0700
doc: Add note about telemetry disable mode to 1.0 release notes
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 393d231b9689cd1c358600ee76e0e808f89670c8
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 21 22:52:45 2011 -0700
altosui: Attempt to make both 32- and 64-bit windows DLLs
We'll see if they work...
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d5bd40847b17c32405dfba864a2a5a3b19aa7e85
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 21 22:12:53 2011 -0700
altosui/windows: Fix a bunch of windows compiler warnings.
Some of these may have actually been serious -- a write length was
getting stored in a signed char...
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2353d83be15b398754c2564f95374c6ea0f8de92
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 21 22:12:04 2011 -0700
altos-fat/windows: Check and install Java 1.6 as needed
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a08826292ebd802a1ff2effccac3b96fd061c47d
Merge: 3366cfe 55be3db
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 22 16:08:55 2011 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 55be3db2e31fe97e7f351e3c490b8bc4cf7192b2
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 21 19:18:54 2011 -0700
altosui: Clean up command line processing. Add --graph
Make the command line processing a bit less ad-hoc, track 'mode' of
processing and deal with all files on the command line.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6823ad5e48fc0a19791d96f886b5689f88c4311b
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 18 18:02:02 2011 -0700
altos/altosui: Add ability to disable telemetry/rdf completely
This turns off the telemetry system so that it never transmits telemetry
or RDF tones. In idle mode, it will still accept packet mode connections.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a08e7ac8bd3840b699c9a1ffc6b1e115b2b84bad
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 20 11:35:55 2011 -0700
Bump version to 0.9.7
Bdale is flying 0.9.6 at chili blaster, make sure later firmware gets
a later version number.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f2b0900f8b83fcb3085f3d042ffd961ffd758d5d
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 20 11:28:53 2011 -0700
altos: Merge common config code in ao_config.c
This shuffles code around in ao_config.c to share some common code
segments for starting and committing config changes.
This also stops printing out changes as they are made which aren't
needed by the UI code.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 67f28c58db0deca8f8050d33e97ad96017f4baaa
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 20 11:19:57 2011 -0700
altosui: Disable 'max flight log' config when there are stored flights
When flights are stored in flash, the maximum flight log value cannot
be changed as the flight data might need to be moved around in
memory. Check for this case by looking for stored flights and
disabling the combo box when storage is not empty.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fcff63baf8fde1174571a2c7c860099e19dbf629
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 20 10:43:28 2011 -0700
altosui: remove debug printf in pad pane
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3366cfe6145f64cdb04654854d5390c671a288e3
Author: Bdale Garbee <bdale@gag.com>
Date: Sat Aug 20 09:28:04 2011 -0600
update changelogs for Debian build
commit 787e4305a05e344c018abb872f788749203690d7
Author: Bdale Garbee <bdale@gag.com>
Date: Sat Aug 20 09:24:29 2011 -0600
update changelogs for Debian build
commit 605627d03eeb9f34026a84134992ad061b5b3946
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 19 22:47:50 2011 -0600
update changelogs for Debian build
commit 048b3eb45169e572f33c68ff152b89db9ef97d31
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 14 21:11:41 2011 -0700
altosui: Add 'On-board Data Logging' indicator to pad tab
This shows whether the on-board data memory is full, or is ready to
record the flight. This is indicated in the telemetry stream by a
flight number of '0'.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit adb7d345963ab9981c49c7cc68c6b4d7156dce46
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 14 21:09:42 2011 -0700
altosui: Ancient log files used 'apogee' for 'coast' state
2009-07-18-serial-004-flight-000 says 'apogee' for the apogee-detect
phase of the flight; map this to coast so that this flight replays
correctly (although the log terminates at apogee...)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4f64d66295a8f76680af8cfda4650aa4c4f8576d
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 14 19:19:50 2011 -0700
altos: Lost change that reported flight 0 when log memory was full
commit 52ac83fedbfd380d14d4df2e79992bbdfba3552a added coded to check
for a full flight log and complain with a special tone.
It also reported flight 0 over telemetry, and that part of the patch
got lost when moving to the new telemetry format. This patch
resurrects that piece.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ef7f60df841f1eb22b9cec0d7f68cf2c003d6b30
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 14 00:00:54 2011 -0700
altosui: Respect storage limits in flight log max config
Compute the maximum flight log using the data returned from the 'f'
command (total storage and erase block size). Limit menu to choices
which fall within this limit, complain if the user asks for too big a value.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 746d6a472a20243a8c0eacc8edf8e81e0641bc17
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 14 00:00:07 2011 -0700
altosui: don't set channel when using radio setting
altos now sets the radio back to channel 0 when the radio setting is
changed.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 709485f20fb039f8dd087c8491c5f5a76718ae53
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 13 23:58:03 2011 -0700
altos: use raw height while waiting for landing
This avoids any noise introduced by the kalman filter, making landing
detection much more reliable. This patch also changes the interval to
10s so that the height bounds can be increased to 4m.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit aa71c2cdcb417eba2a2d30792ece9a47b8b3fc82
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 13 23:56:55 2011 -0700
altos: Reset radio channel to zero when using radio setting
Otherwise, it's hard to set the frequency over the radio link.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7f74761051f2a5ab45b82c4dd79a8569376bbe2e
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 13 23:56:06 2011 -0700
altos: Correct AO_CONFIG_MINOR from 6 to 7
Forgot to bump this when adding radio setting.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 924d56a4d2d8b16530cd378b18cfc5d6e08420ed
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 13 21:10:15 2011 -0700
altos: AltosSerial.flush_input shouldn't discard Interrupted exceptions
The eeprom download code wants to interrupt serial communication so
that it can stop downloading stuff in the middle of a run. Make
flush_input pass the exception along instead of discarding it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dcd15032eec45f3fdd003050710ebd5b85052662
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 13 21:09:19 2011 -0700
altosui: Eliminate inter-chunk flush_input calls
Once the serial line is nicely synchronized, we don't need to flush
input between chunks. This speeds up eeprom downloading quite a bit.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3ba7b6196f68078f4ed4538c4e7fe30699dfe908
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 13 21:05:46 2011 -0700
altosui: Devices with log-format can also delete flights
Any device with either flight-log-max or log-format can delete flights.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 03e201e1acc8742399054e4ad36b533120ea1612
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 13 18:39:35 2011 -0700
altosui: Add support for TeleScience eeprom download
Using the existing eeprom methods, fetch and save TeleScience eeprom
data, storing to a filename generated from the serial/flight from the
TM connected to the TS board.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5a3e96bef31959a287b8696778d7d8cf911a7dc4
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 13 18:36:18 2011 -0700
altosui: Clean up eeprom parsing a bit
Export basic parsing and checksum functions for shared use.
Create 'erased' function to check a chunk of eeprom data for data.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b0ec30de37aa822ba66d25ceaa8cf8dc967b4371
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 13 18:31:08 2011 -0700
altos: wait 10s for companion to boot
In case the companion is delayed while booting, retry the setup 10
times with a 1s delay between tries.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 41e5be32819d305c8268e6f992be91411ea13435
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 13 18:30:00 2011 -0700
altos: Send serial/flight to companion board
Lets the companion log them for later matching with TeleMetrum log
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fa7dd04741bf3fd9cedc59ed3b45b69ef9312609
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 12 21:41:25 2011 -0700
altos: Send SPI message at flight state changes
Get the companion board starting its data logging as soon as possible
after boost starts.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c7f540330c040c521f9d7626009a406e704a5e41
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 12 14:58:34 2011 -0700
altosui: Add companion support to the flight UI and CSV conversion
Shows the companion data in a new tab. Also put companion data into
CSV file.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 18369c58e62bc64b969a7cf8be3103aa33c6d4aa
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 12 06:29:13 2011 -0700
altos: Check for companion init packet validity was busted
Was using board_id == ~board_id instead of board_id ==
~board_id_inverse.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit aa642cf55c43188e9a21198d828d7ea90ff54280
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 12 05:42:05 2011 -0700
altos: add the 'L' command to show the status of a linked companion board
This prints out whether there is a board connected, along with the
various values fetched from it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f87f0787fa5aa528674f3f4919eb22646c87c25a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 12 05:41:15 2011 -0700
altos: Make sure companion task exits cleanly when done
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ebe2ffb29944abc4d6a35889c7b5f3d9f2871077
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 12 05:38:16 2011 -0700
altos: Put SPI in slower mode when talking to companion board
The AVR CPU on the other side just can't go very fast. This reduces
the SPI clock by a factor of 16, just under 200kHz. As the companion
commands are reasonably short, this shouldn't have a huge effect on
overall SPI utilization.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 30abbdc7ffcfc809b4a3fc31486fe968161ea225
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 9 16:59:16 2011 -0700
altos: Add SPI-based companion board support
This sends current flight state information and retrieves companion
data to include in telemetry.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 578c4b17b8f62f2727654ebda78ee139f9fe13fa
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 13 18:38:38 2011 -0700
altos: Don't try to use non-basestations for remote eeprom download
Companion boards may also have eeprom data to fetch; don't try to use
them as a radio.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bf06af154e232d4caa1585a1d6d5279a075292e4
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 12 21:43:56 2011 -0700
altos/altosui: Report log format in the version command
This will make it easier to figure out what the contents of the flash
should look like from altosui; the current 'guessing' mechanism will
not scale to many more formats.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c2f2f519dbc8ce233ab36222088c1be6b1362f01
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 13 18:28:38 2011 -0700
altos: re-write a bit of GPS parsing code to reduce size
Use a local variable while computing hdop.
Place the next incoming character in data instead of pdata.
Saved a surprising amount of memory.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7bcf25606cd5892d58295649f3d475d284494ee8
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 12 05:26:09 2011 -0700
altos: shrink text space from ao_config.c
Eliminate redundant config initializers by setting minor to zero and
letting upgrade code handle all of the new values.
Stop computing (fake) frequency when showing radio channel
Stop computing feet when showing main deploy height
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 313d740b5284b24f1cc7a1ba5779136b55d49ebe
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 13 18:33:07 2011 -0700
libaltos: Mis-allocated device list in libaltos
Would overrun mis-allocated array, causing chaos.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3b87dd6f46922cf5f98deb2dffa2148c4244e48e
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 13 15:00:14 2011 -0700
ao-tools: ao-list was crashing with more than 3 devices connected
the list of devices was getting realloced for each new device, but
that realloc was too small.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 640422c028a2be898aa3a9048a0f6fad2e43dd8d
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 11 16:11:34 2011 -0700
altos: remove monitor disable stubs from altimeter code
Monitor mode in the ground-station boards must be disabled when the
radio is going to be used for another purpose, or the radio parameters
changed. That places monitor-mode disable calls in other parts of the
system which are shared with the altimeter code.
Elide the ao_set_monitor calls for builds which do not include any
monitoring code.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1d13460412046c53f36466193329caaa657bb278
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 11 15:59:47 2011 -0700
altos: Apply igniter boot pulse-width reduction to telemini
TeleMini needs the same fix as TeleMetrum to reduce startup igniter
pulses.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b520c32bcddabd42c07ceafa827694a3ae23a76f
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 11 15:57:58 2011 -0700
altos: Pull igniter pins low as soon as possible at boot time
This reduces the pulse width on the igniter circuit caused by the
default cc1111 pin configuration at powerup time.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 566b16e67be38c6425e616a5c38d641c4e1a9b12
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 10 22:43:26 2011 -0700
doc: Add 1.0 release notes.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a07b07d48f71b9a11e73a82db075cc57bad0c09f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 10 22:14:32 2011 -0700
doc: Add release notes, include them in altusmetrum doc. Shuffle altusmetrum
This adds release notes and includes them in the main altusmetrum doc
as well as making stand-alone html available for inclusion in the website.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5aa3e49f794ba5ed2680016f3dca47d67ae99836
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 10 18:32:05 2011 -0700
doc: Add telemetry docs to debian/linux/mac/windows packages
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7283deaa91e752acc45018ef2ea2f560b09af354
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 10 18:22:16 2011 -0700
doc: Describe 'stats' tab in Graph UI, 'Graph Flight' button.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 21837e0026c87635abf4baf2c6c574a7b274f449
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 10 18:14:10 2011 -0700
doc: Document Ignite Mode and Pad Orientation configuration options
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 967c9d5ee691f87bf0d1e49ba055eb366e513e6a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 10 17:43:58 2011 -0700
doc: Update altusmetrum.xsl for v1.0 software and TeleMini
Add TeleMini references and sections as appropriate, update AltosUI
docs to describe new bits.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit be65308182363ca87db69db530297933324f3806
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 10 16:01:25 2011 -0700
Bump version to 0.9.6.0
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9f5623c8c32a38eaeb63fa74ab370025ac015d52
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 10 15:00:44 2011 -0700
altosui: Move launch-sites.txt file to altusmetrum.org
The official URL is now:
http://www.altusmetrum.org/AltOS/launch-sites.txt
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4962bcf1ce15c21a946ea718bd676b901f0f2bd0
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 10 14:35:21 2011 -0700
altosui: Plot reasonable data from Tm files
Don't plot acceleration based on baro data.
Display baro speed if accel speed isn't available.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 01b9352eb8ca0e4e2d023ce973c4e863cdcc0c51
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 10 14:34:39 2011 -0700
altosui: Prune telemetry file graphs to just the flight
Remove data earlier than 1 second before boost and data after landing.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9e1487b1a5db0afd1d23c86d82c60b1c1a62aab0
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 10 14:08:21 2011 -0700
altosui: Add a 'Graph Flight' button to the 'landed' tab
This lets you see the results of a flight as soon as the rocket lands
using the telemetry data.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6ac604d11de44cd824f09e4b467264a2b74be7bd
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 10 13:35:26 2011 -0700
Altosui: Add flight statistics tab to graph window
Provide basic flight stats alongside the flight graph.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 94d9a2c36fabdf24d6a0b985851e95e4eb181fd9
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 9 18:28:19 2011 -0700
altosui: Ship TeleMini v1.0 firmware with fat blobs
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a680ce61bdcffeacb7f0e4dcef71a03cb7cfe07d
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 9 18:27:19 2011 -0700
altosui: Ensure serial code tracks reply nesting correctly
Trap any exceptional return conditions from 'get_reply' to make sure
in_reply gets decremented.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 12bfa6cc42e3689f09abae2bd2584cbacf2aa2e0
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 9 18:26:07 2011 -0700
altosui: Don't export product defs from libaltos
As we add new products, that would change the ABI generated for java,
invaliding old library versions sitting around for windows and mac.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 81ad44d4b6d9ad2f6b91d0906e8543da82da424f
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 9 14:26:43 2011 -0700
altos: Switch telemini from v0.1 to v1.0
TeleMini production boards are firmware compatible with the v0.1
design, so instead of creating another product, just rename the
existing one.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f3985ef8bc69bcec13ce155567a8ed7c5c6051cb
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 20:41:34 2011 -0700
altosui: Add close button to 'fire' dialog
Easier to hit than the tiny close box in the frame.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cbf54a826d12c49b1b1996be247869d5ff4e2236
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 20:38:44 2011 -0700
altosui: Make set of telemetries to use while scanning configurable
with a preference to remember across application runs.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7146311d9df541e075b4450cf9656a9aa7ffdd93
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 20:38:14 2011 -0700
altosui: Reading serial from swing thread only bad if remote
Make the warning on this condition based on whether the link is remote.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2662c577a895c96fce7b2bf815b9e752d2dfbde6
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 18:53:59 2011 -0700
altosui: Remove unused AltosConfigData from AltosTelemetryReader
Now that AltosSerial manages this data, it's not needed here.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 13eacb49de4312509c3a729a31dcda4d601f8a8b
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 18:53:27 2011 -0700
altosui: Flush radio setting to serial device
When changing frequencies, make sure the device hears about it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 97cf285d041062ae473c2823438b81c8fffe7f67
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 18:53:03 2011 -0700
altosui: Remove debugging printfs from AltosSerial
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 364102d29ff4de0c252774f26417587fa88b7467
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 18:52:11 2011 -0700
altosui: Show AltosFrequency in scan results
Include frequency and description instead of just frequency.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d4cc16e111229b02d1081e2693ace0b33f662498
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 18:51:16 2011 -0700
altosui: Save frequency after setting it in AltosFlightUI
Otherwise we'll just save the old frequency.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 81bb6f42d8b859195ea5a35806c42d98ba82e8e1
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 18:49:45 2011 -0700
altosui: Have single radio_to_frequency function
This takes all three radio params (setting, cal, channel) and computes
the current frequency.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c8c01684fa011acf3bbe5c3ebbc84aa8e8457a5e
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 18:47:36 2011 -0700
altosui: A few misc cleanups.
Initialize radio_setting as it won't be set for older devices ever.
Remove unused set_radio_frequency function from AltosConfigUI.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dd383b86b9a13d7af2d6b07f4fb85ccc666ed898
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 18:45:36 2011 -0700
altosui: Must set radio calibration before radio setting
Setting the radio calibration erases any previous radio setting as
the radio calibration change invalidates any previously computed radio
setting for a specific frequency.
Hence, the radio setting must be configured *after* the radio
calibration value lest it be ignored.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 40544dbfe09c64f7764a5f0686415805611fab25
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 17:46:04 2011 -0700
altos: minor type in comment about accel correction
Kurt Roeckx found a typo in the equations describing how the
accelerometer is corrected by the 5V reference measurement.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a315b200cd0da1a964f5395cd59660be1b49672b
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 12:31:48 2011 -0700
altosui: Pull out BlueTooth support
This leaves the code in place, but commented out so that it isn't used
until we've got a bluetooth device ready for use.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a65daf94e8fe3e22f770ef76d9104c3dd11d0330
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 12:25:30 2011 -0700
altosui: altimeter is not spelled altimter
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 84ba927f503f81543dec286c4881be30bb5e60c5
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 02:05:28 2011 -0700
Set version to 0.9.5.0
Make the frequency-based systems distinct
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0e3e4f9c1e6a6bf972514f12c9d622258aa2aec2
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 01:47:29 2011 -0700
altosui: Convert from channels to frequencies
Major areas:
* Preferences are stored as frequencies instead
of channels
* Serial configuration is done using frequencies
* UI is presented with frequency lists
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f03ca0ab8799bfa5100eaa2577cfd7b9c37d05bf
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 7 14:52:29 2011 -0700
altosui: Add dialogs to configure 'common' frequencies
These are stored in preferences, but not yet hooked up to the TM/TD
configure dialogs
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ba5dc35388d28c5769eaabc970c4d4b8c2c2ff9c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 3 23:07:53 2011 -0700
altos: Add ability to set arbitrary radio frequency
This adds a separate config parameter to control the raw radio
frequency setting, allowing the user to select an arbitrary frequency
instead of being forced to choose one of the 10 pre-defined 'channels'.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e1e5c9b3e24670e9f58c6f7389eafb3338efdb40
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 12:08:45 2011 -0700
altos: Remove pad_orientation functions from non-accel devices
Anything without an accelerometer can't detect pad orientation.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7207a95823dc2a27906759528dd88256cb20679f
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 12:04:00 2011 -0700
altosui: Change button to 'Configure Altimeter'
Now that we've got more than one model.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 30670732ca3f5a34025ab4bc4c69afa45637b4d6
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 11:58:23 2011 -0700
altos: Correct flight log max on Tm to 5k
Was using the wrong #define name to check for Tm/Tn devices that use
internal flash for data storage.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a67c16958df8e60b131b01e00fd5bca590af0e7d
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 8 09:38:53 2011 -0600
update changelogs for Debian build
commit 4a507898d6de631bb2e8ed4aa3e0933d97222323
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 8 09:34:59 2011 -0600
rewind changelog for re-build of 0.9.4.5
commit 5082b4998b8a9787e0e2f4d96d912e434aa9b81a
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 8 09:31:18 2011 -0600
clean up all existing lintian warnings
commit f26c7172a1b2b5344fae6ede562f2da7a56b80e3
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 8 07:54:14 2011 -0600
build depend on bluetooth dev package
commit 3cad81b0ebb52352c66643a2587e94a2b693a2d2
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 8 07:38:48 2011 -0600
stop doing automatic tag push during builds
commit ebaad64525119c0fdacf382adc2c99e5df5be23f
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 8 07:37:23 2011 -0600
update changelogs for Debian build
commit 6f9f75cbfccf975204ab847ca0e9cf86188716c6
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 8 07:35:47 2011 -0600
update changelogs for Debian build
commit 7c94945690a6ff5cbf872026fd6411a30089c7b1
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 8 07:33:09 2011 -0600
simplify version in last changelog entry so git-dch is less confused
commit 6d5e5b0be237d5448aa9d15decd6127cf41ca7b2
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 8 07:30:42 2011 -0600
update version for a Bdale build for use turning on TeleMini v1.0
commit 6492218fc316f8cf6214a577807a8dd0a80a9b6a
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 2 19:07:56 2011 -0700
altos/altosui: Add pad orientation configure option
Allow TeleMetrum to be operated with the antenna pointing downwards on
the pad. This provides some additional flexibility when designing an
ebay.
The accelerometer calibration levels are flipped around to match, so
no re-calibration should be required.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 11a2bb8e28df7ed87542f2ee726f877971f5d52a
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 2 17:41:53 2011 -0700
altosui: Add idle monitor dialog
This monitors a telemetrum device in idle mode, either directly or through a
teledongle, allowing the GPS status and batteries to be monitored
without resorting to placing the device in pad mode.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3cc2eed6cdafe788a8617ab45c6664077e76411e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 2 18:01:52 2011 -0700
altosui: Simple timeouts don't work with query data
To get the query to come back, it's best to abort and retry the
command, other wise the command may have been lost to the previous
connection.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 37c41c962ea4631e62307a57d2ce6572b87fd743
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 2 17:41:02 2011 -0700
altosui: Parse accel cal from 'c s' command
These fields weren't used before, so the code to parse them hadn't
been written.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 95201e7fe4a6a7ec42321e8dbad3aea3bbf4c840
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 2 17:40:02 2011 -0700
altosui: Standard text field in flight UI needs more width (now 20)
Latitude and longitude take more than 16 characters.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 82e04a0e3a3296288a524ec582785a36fd644331
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 2 02:09:23 2011 -0700
altos: Require sequencing through 'main' state before landing
The old version of the code would permit the flight to go straight
from 'drogue' to 'landed' without passing through 'main' at all. This
meant that a false landing detection would leave the main charge
unfired, potentially causing the airframe to land on drogue alone.
Requiring that the flight sequence pass through main ensures that the
main charge will get fired at the right time, although if the airframe
lands higher than that altitude, it will not go to 'landed' mode ever.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6c55bf35b11ae3ddae152795072d69e98184bac1
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 2 01:49:35 2011 -0700
altos: Reduce height averaging filter time constant
Using the longer time constant could lead to false landing detection
just after apogee, which is definitely not a good idea.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e19a117b99e8374ca0e8e35948e23bc672ad1a32
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 1 22:33:38 2011 -0700
altos: Average height values for landing detection
Instead of using the direct output of the kalman filter and hoping
that is quiet enough to detect landing, filter that with a long
exponential decay filter and then check to make sure that doesn't
change more than 2m in 5 seconds as a trigger for landing detection.
Tested with existing telemetrum flight logs and it correctly detects
landing in all cases.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 146a0ab223e8d9b376125d1e59f597f6d7851a9b
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jul 17 18:49:55 2011 -0700
altos: Add ability to read new TELEM files to ao_flight_test
Not that telem files are currently very useful as the kalman filter
gets completly confused by the variable steps caused by missing data, but...
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6795d353be91df96a571cebc237e6a54a065a380
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jul 17 16:44:10 2011 -0700
altosui: Change continutity colors to yellow/magenta
Makes them stand apart from the accel/speed lines
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7f6cce5749724dbb836aaa27bbeedf977106f6f3
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jul 17 16:43:41 2011 -0700
Add HARA Bragg Farms site
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6796d9e253a808824ba32cdb008da8bf302780fc
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jul 17 15:53:13 2011 -0700
Fix NCR Pawnee location
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ddef3e4ec1b3ff86b164f83807c34c2a78f73eb8
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jul 17 15:45:07 2011 -0700
altosui: Mark preload site location with red circles (like launch)
Just to show where on the map the official launch location is.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1f3f3d575572eff33a2bc7a53d4691e59a428450
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jul 17 15:09:55 2011 -0700
altosui: Add a bunch more site locations
BALLS, Rio Rancho, METRA, QRS Cedar Grove and Hudson Ranch
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fef42e0d9e0a20bdbd32e052749fc63575515e1c
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jul 17 11:29:13 2011 -0700
altosui: Add launch-sites.txt
Contains a few of our favorites.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 81cac174c80ee42d9e94c6500da7c4c760c3ce67
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jul 17 11:25:47 2011 -0700
altosui: Download list of site locations for map preloading
The current URL for this is:
http://gag.com/~keithp/launch-sites.txt
The format is:
<site-name>:<lat>:<lon>
lat and lon are both in signed decimal degrees.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f7cd8317bf78ece334e1ceb0263b875ca43bbbd2
Merge: 51796e2 a482d90
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jul 17 08:17:44 2011 -0700
Merge branch 'preload-maps'
commit 51796e2f1ebce3ee8dc1ac90648381410c1379ee
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 23 11:32:29 2011 -0700
altos, altosui: Add igniter mode (dual, apogee, main)
This provides for redundant charges for either apogee or main.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1332ed55192f22525f31574f60fae4c6579e6f7f
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jul 17 08:13:15 2011 -0700
Set version to 0.9.4.4
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a482d904a3f391c3a24df3660acb3f3696aa6766
Author: Anthony Towns <aj@erisian.com.au>
Date: Sat Jul 16 23:08:49 2011 -0700
altosui: Make sure degree and minute values are visible (map preload)
Set min size to preferred size so that the value remains visible
instead of snapping to 0 pixels wide.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1681c57cbbfc5214dbc2a519e54ce9f29ffe3921
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 16 22:43:34 2011 -0700
altosui: Remove a bunch of sitemap debugging printfs
Seems to work, let's get less chatty
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0a4d934f6e2914bfe2d965630543f029a1576c11
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 16 22:34:44 2011 -0700
altosui: Display full map preload area in view.
This involved fixing the map view to support arbitrary sizes, and then
exposing a synchronous tile loading API so that the progress bar could
be used to show tile loading progress.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit abb8510b97ce9cbbff0275cc31f74780fe1ce138
Merge: 0929ee3 00e6981
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 16 21:06:37 2011 -0700
Merge branch 'scan-telemetry' into preload-maps
commit 00e6981c2e0a668864fcf391932855cd8942140c
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 16 21:05:06 2011 -0700
altosui: Flush telemetry lines before starting to watch for scan results
This prevents pending telemetry lines from being incorrectly
attributed to the wrong channel/telemetry.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0929ee32f753255cbe1474988cb41a5a86d29a0e
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 16 17:37:20 2011 -0700
altosui: Try to avoid resize weirdness with map preloading
grid bag + box does some strange stuff, this appears to avoid the
worst of the interactions.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 225073fd822f9861a83d65386c29fda9b37bf273
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 16 16:37:40 2011 -0700
altosui: Add map preloading GUI
Provide a way to manually enter latitude and longitude, preview the
map area while downloading a 9x9 grid of map tiles to be used when
monitoring flights without network access.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cbd14ba103ee5e3c5eec18e3a4ff13c320b98634
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 16 20:44:51 2011 -0700
altosui: Set 'seen' bits in legacy telemetry packet reader
Otherwise, the 'scan' code won't show detected flight computers.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e905042879147dd86241bf2dcc7437e5a6eb7578
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 16 20:43:57 2011 -0700
altosui: Initialize channel and telemetry before use in ScanUI
Otherwise we try to use telemetry format 0, which means 'no telemetry'.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 941b90a4905e34936d24a25ca90ac04eb6f5a792
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 16 17:38:00 2011 -0700
altosui: Generalize and centralize telemetry constants, parse v0.8 telemetry
Move telemetry constants to Altos class, adding functions to compute
names and lengths. Generalize users of these values to use all of the
known values.
Add support for v0.8 TeleMetrum telemetry
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7ef786276b5d5c7d17c3fe4f36aa41db61a9742f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 16 14:23:08 2011 -0700
altosui: Finish radio scanning UI
Scans all channels and telemetry formats, presenting visible devices
in a list. Entries from the list may be selected, in which case a
monitor window pops up with the appropriate configuration.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ebcba28b3c09925869b617880d2919e5d0e059f0
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 16 14:19:41 2011 -0700
altosui: Configuration telemetry record includes flight number
Mark the reported altos record as including flight information.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d4375bc737655546c2d40f49acdfc2e60ebfea5a
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 16 14:19:14 2011 -0700
altosui: Remove debugging printf from AltosLog
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f32a55ac9a3ebbde2b41782f22491e72258fe05a
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 9 19:00:12 2011 -0700
altosui: Pop up monitor window from scan dialog
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8c20030ea4eb8e068e1ba88e01d07dfbc27bd7db
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 9 18:41:15 2011 -0700
altosui: Start adding support for scanning radio for available devices
This is untested.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7bb11b716ccb6c80701bc3f34ecf9bef97cbbfc9
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 15 18:53:41 2011 -0700
Set version to 0.9.4.3 for Bdale 2011-7-16 flights
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0d0cf6f9a1b14a1b66aee3845964cd33d1f035c2
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 9 13:09:57 2011 -0700
altos: new versions of sdcc require __ prefixes for custom keywords
Fortunately, 2.9.1 appears to accept either, so we can switch now and
prepare for sdcc 3.0.0.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8f80f5705d64469bcfb00ff11aee68364edb271b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 21:38:57 2011 -0700
altosui: Don't show missing igniter and gps values
The new telemetry stuff leaves state.gps always set (but empty), which
seems fine, we just need to look at state.gps.connected to see if
there's a GPS receiver on board.
For TeleNano, we also want to hide the igniter status fields as they
won't have any data present.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 80ca066a825646f833ca609190c76c5252118d9a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 21:36:38 2011 -0700
altosui: Build device constants into .java code
This eliminates a depedency on updates to the system helper library,
which means we don't have to provide a new library on all platforms
just to support a new USB id.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 504ab7ab355652d5d01094c927089029596a0753
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 17:49:01 2011 -0700
altos: product defines are always in ao_product.h
When all products were built in a single directory, each one had a
separate version of ao_product.h. Now that they all reside in
sub-directories, each directory has its own ao_product.h
This change is needed so that other modules in the system can use the
product defines; otherwise, ao_product.h was not built at the right time.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 81cf2e833bedbc1ace8fd310e9e94bfb7673d428
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 16:43:17 2011 -0700
altos: Ensure low-rate telem packets interleave with sensor telem packets
To avoid over-committing the radio link, we want to send only
one low rate packet after each sensor packet. However, the
initializations for this were incorrect, causing the configuration and
location packets to be sent at the same time.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5ca6400fd8a360b64d8f96f50d5595a7fd17762d
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 16:18:54 2011 -0700
altos: Remove ao_telemetry_orig.c and ao_telemetry_tiny.c
All products use the common ao_telemetry.c code now
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0154d13756bcb09f009981ee5e4bd27fd04b8788
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 16:19:22 2011 -0700
altos: Switch Tm and Tn to common telemetry code
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b65140a0139075adeddaccf0f4d5c7a75fac4757
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 15:52:25 2011 -0700
altos: Switch flash drivers __xdata to __pdata
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 038d7b25ba833da4be458409670d3f95e8aaf17b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 15:51:52 2011 -0700
altos: Switch ao_flight and ao_flight_nano __xdata to __pdata
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3742b36a528f114c3b1873caa4f39581145b76da
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 15:28:01 2011 -0700
altos: Switch ao_dbg.c __xdata to __pdata
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6903b6464db7eb803de8bf9b897c45431f7a1d63
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 15:27:32 2011 -0700
altos: Switch ao_config.c __xdata to __pdata
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6893752900385ee51cc4cf75e1b672202de7578a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 15:26:09 2011 -0700
altos: switch ao_cmd __xdata to __pdata
Saves code space
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2ec986f08ce8d4635f4435bb0042b405d93edc40
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 15:45:04 2011 -0700
altos: Switch const for __code in struct ao_cmds
This saves quite a bit of code space when accessing these values.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 355db71f4511adff8abcb2caded61c12fe8b7ee9
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 15:41:32 2011 -0700
altos: Switch ao_usb.c __xdata to __pdata
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 359baab005c274a0841268c615c23b3ffef813cf
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 15:41:06 2011 -0700
altos: Switch ao_telemetry.c __xdata to __pdata
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f2f8ade6994aa3a69fd08f19c4403ceb8cea295d
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 15:39:44 2011 -0700
altos: Switch ao_stdio.c __data to __pdata
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9ba0da9247ea424a7a147aa85daae0d5e6316b81
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 15:38:46 2011 -0700
altos: Switch ao_serial.c __xdata to __pdata
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 86b41d4c2b8a9fa4507cdb75302e0cedebb103cb
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 15:38:29 2011 -0700
altos: Switch ao_sample.c __xdata to __pdata
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 803bf106caf5d6b5ac12eb00a941647c7325edd1
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 15:37:34 2011 -0700
altos: Switch ao_rssi.c __xdata to __pdata
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 002f167fc2709aaf1a4984aaa0a3519a97749d5f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 15:37:15 2011 -0700
altos: Switch ao_report.c __xdata to __pdata
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5203ddaac692bfd82a01368da9fb66c25e9e14c1
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 15:36:45 2011 -0700
altos: Switch ao_log.c and ao_log_big.c __xdata to __pdata
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 62267144d189967fcd0724b6dfbdbab3cb6fb414
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 15:33:52 2011 -0700
altos: Switch ao_ignite and ao_gps_sirf __xdata to __pdata
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 92047ff86c79c2b18ef565a4560b06fe00d6f159
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 15:31:53 2011 -0700
altos: Switch ao_gps_skytraq and ao_gps_sirf __xdata to __pdata
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 64860be02b3efa6f784a259249cfa6d14545fbd3
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 13:49:05 2011 -0700
altos: Shrink ao_add_task by rolling up a memset loop
This has a dramatic effect. By pulling the 'stack' variable into
registers it reduces the size of this function from 550 to 231 bytes.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 480b48837db31987b947e4d32248965d4a16be03
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 13:21:25 2011 -0700
altos: Shrink ao_config_callsign_set
Replacing a hand-coded memset with a function call, using static space
instead of stack space for an array.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 41c230cac359b4459ca93196d08704b7d35447c7
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 6 12:38:11 2011 -0700
altos: Shrink ao_cmd_put16, ao_cmd_hex and ao_cmd
No functional changes, just reduces code size.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 481577a29380afe6750ef7c4e928daff837cbc49
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 5 23:38:42 2011 -0700
altosui: Compress telemetry records marked with the same time
Split telemetry transmits multiple packets with the same
timestamp. Merge those into a single record when read from a file.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7cfd43663cde5ebdf04e4face076d79ff6329ac3
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 5 23:38:28 2011 -0700
altosui: Remove debug printf.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d0335f83c54df0b23c28d04d34c212a1bdffadd0
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 5 23:37:51 2011 -0700
altosui: Add main/drogue voltages to default graph
Until we get a UI for changing the graph elements, lets add a few more
potentially useful values.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c1f859170b37864b816eb561318dbfb1cafaeed6
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 5 23:37:00 2011 -0700
altosui: Elide missing values from graphs
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 72575dcb9cfbb5c1ccdb3510b9962a6f60ca3fa3
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 5 23:35:50 2011 -0700
altosui: Elide nul bytes at end of telemetry string values
All telemetry fields are fixed length, so any embedded strings are
padded with nul bytes.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6ac34f9c8efd464194137ac4ce8228bf9d7d83be
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 5 23:35:02 2011 -0700
doc: Add section about TeleDongle USB line format
Describe the format of the TELEM lines sent over USB from TeleDongle
to the host.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit edf6252450e06fd42fa6dde3acd127baa8fa6d36
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 5 21:44:53 2011 -0700
altos: Adapt to changes in telemetry Configuration packet
Apogee delay added. flight_log_max changed to two bytes (in kB now).
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 938949e39aac834a1c0912f8f307f74fe41418cc
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 5 21:42:22 2011 -0700
doc: Chang Config and Location packets
Config packets get apogee delay, and have flight_log_max shrunk to two
bytes.
Location packets get climb_rate added.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4132ac5896114e5f3d8fb3f219422e8933078cf4
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 5 21:41:44 2011 -0700
altosui: Parse remaining standard telemetry packets
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ef3ce687d73c1274ce5368432f4d449b063ce5c0
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 4 23:39:21 2011 -0700
altos: Complete new telemetry switchover
This involved rewriting the GPS code to use the telemetry structures
directly so that a memcpy could be used to transfer the data to the
telemetry packets, saving a bunch of code space, along with fixing up
the gps testing programs to deal with the structure changes.
In addition, the teledongle code needed to have the monitoring code
split into separate radio receiver and USB writer threads as the
packets are now back-to-back, and hence come too fast to wait for the
USB data to be sent to the host after each one.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 359681f23e2f71bc8f4975a4a76ae28c08ecab2e
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 4 18:09:03 2011 -0700
altos: Add split telemetry code
This sends every packet every time, which isn't correct, but should be
useful for testing.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b51e5466f7a125db873edd1fa9bd3881d7e98aad
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 4 18:08:19 2011 -0700
altos: Shrink help text
Reduce const space taken by command help text.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9e5e4c1ad82d621ceb7286f72c87eeaf5976f9bf
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 4 18:06:48 2011 -0700
altos: Add sat info to GPS report command
Plan to use this to report current flight computer state in idle mode.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 06b6f78e22be38a26bfe11ed4d4b659d5b13f00c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 4 18:04:49 2011 -0700
altos: Shrink const space in ao_config
Eliminate separate 'cmd' and 'help' struct entries.
Use \0 trick in cmd strings to eliminate whitespace.
Edit help text.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d3c26e534d8df34cfbf29b70cd1b2692493ce150
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 4 18:03:51 2011 -0700
altos: teledongle does not need ao_packet_slave.c
TeleDongle doesn't provide slave interfaces, so remove ao_packet_slave
from the TD build
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c763a3f9cf2bf055e9705ce5ff4bc172f445037d
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 4 18:02:52 2011 -0700
Version strings must be < 8 bytes long
The new telemetry packets include the version string, so make sure its
less than 8 characters long
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a08173197d5533ecb395102ed34e751135660d06
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 4 18:01:59 2011 -0700
doc: Fix a few minor telemetry doc mistakes
Multiple 'accel' entries in the Sensor packet.
Swap ground_accel and ground_pres to group accel cal data
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 98df3ba984acf3b47a09949bbea0f3264f711f5b
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 4 14:17:55 2011 -0700
doc: Complete initial telemetry description
Finish describing the contents and modulation scheme for telemetry
data.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 06e82bd2c2a5eea153a053e542df9bc3537e9a01
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 2 01:50:33 2011 -0700
doc: Add telemetry format description
Document the telemetry packet contents.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7fd9b8f720add559b262e81d61ededc9df16ca94
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 28 01:03:00 2011 -0700
altosui: Support raw telemetry from TeleDongle
Use raw telemetry frames when TeleDongle supports them, this involves
parsing the hex dump of the packet instead of having teledongle take
the packet apart. Only the legacy format is working at this point; the
altos bits for the new split telemetry frames is not written yet.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cb239b7161feea8646425b1f5788c3c82ae24321
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 28 01:01:08 2011 -0700
altos: ao_radio_recv needs byte count *including* rssi and status
That's two more than the actual packet length.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 336224a08327cadc95f6e5b564a4ddc64aaad8f8
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 24 08:31:51 2011 -0700
altos: Start adding new telemetry frame definitions
These use the initial 24 bytes per frame plan, which will probably get
changed to 32 bytes per frame.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5e111fdf1f23203baeeb490ae1b69402ebd513b8
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 24 08:31:12 2011 -0700
altos: Add checksum to TELEM output lines
Verify the received telemetry lines to protect against OS data loss
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 489a68ba8e3bc360e2e8fc887e4c4b840b5a0dd3
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 22 12:27:34 2011 -0700
altos: Add arbitrary telemetry packet monitoring
This adds the ability to monitor arbitrary telemetry packets (up to
128 bytes), moving the telemetry data parsing up to the host.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0e67b6890dd3a06665239f8dfd2e69266d055e46
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 22 12:26:45 2011 -0700
altos: Rename telemetry to telemetry_orig
This makes room to create a new multi-packet telemetry format without
changing anything yet.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dc0b49dcbaa2d0a69e002c151337b6e9fd3060d9
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 2 23:16:30 2011 -0700
altosui: Handle old TeleDongle receiving kalman telemetry packets
The telemetry packets now send the kalman height/speed/accel values
instead of the ad-hoc values. If received by an old TeleDongle box,
the speed value will be of the form 0x8000abcd, which will be printed
as a 32-bit value by TeleDongle. We only want the abcd part, which is
the speed * 16. Detect this automatically and compute the correct
values for all three.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4d27e281f81aee88adff3d84085356ec310e4b92
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 25 21:38:02 2011 -0600
Switch version to 0.9.4
For Mayhem, so we can tell what version each board is running
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 479bdffa35d0b8d4e48868c8d20f3cb1549521ab
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 6 23:55:23 2011 -0700
Revert "altos: Debugging TBT issues -- check pin configuration after boot"
This reverts commit 514348055630edec12224c4b0964240b929759a3.
Looks like this was never a problem.
commit 66bdf0e066bc0bb7a326a6c2a9c88b69e5c1be66
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 6 23:12:47 2011 -0700
altos: clear CPU port 1 interrupt flag when handled
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8be559baa979c15e78f8dba7879b383dbe3936d3
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 6 22:59:15 2011 -0700
altos: Hook up the P1 ISR for TeleBT v0.1 bt_link line
Otherwise, we're heading off into the weeds...
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 23f441b95e55fbee709382b05d325bc021285766
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 6 22:49:54 2011 -0700
altos: Initialize beeper for telebt
Needed to get sounds to come out
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 514348055630edec12224c4b0964240b929759a3
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 6 22:42:58 2011 -0700
altos: Debugging TBT issues -- check pin configuration after boot
Make sure the serial pins are configured as peripherals
Make sure the ser_reset and bt_link pins are going the right direction.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 22e3ac0eb014b8255029763ae8180ad3527ba306
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 6 22:42:32 2011 -0700
altos: Add beeper to TBT v0.1
It's available, let's use it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6d858b64ee0e8c227c149d2af6d2d634536964f4
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 6 22:12:31 2011 -0700
altos: pull TBT v0.1 ser_reset line low
This line resets the BT module if held low for three seconds.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3336d0f726afd1d43cf62280940e5fb91dab2e91
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 6 21:13:19 2011 -0700
altos: Fix BT link status pin for real TBT hardware
The prototype used P2_1, while the real hardware uses P1_7. Lots of
defines to make this work...
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 19bfa3882a2d95fcade256c2d63ad24f794281e5
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 6 20:33:58 2011 -0700
altos: Use USART configuration 1 with flow control for TBT
It's just wired that way.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d9cc27641fe1778c098b065bf110be7823e6c9f4
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 6 16:57:38 2011 -0700
altos: Add telebt-v0.1 to Makefile
Doesn't get built without it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c360e5c04e30421e9ea2f7006b7d35aef35f1edd
Author: Bdale Garbee <bdale@gag.com>
Date: Fri May 6 17:57:17 2011 -0600
first cut at a telebt turn on script
commit c1760cebd47d0f03808f3204c0fcb1183f754e50
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 6 15:44:56 2011 -0700
altos: Add preliminary telebt v0.1 defines
This should make the telebt v0.1 binary that works on the real hardware.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 72a03baa73698fc1213a74320e6253c2380dd8fa
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 25 23:00:42 2011 -0700
altosui: Fix BT manage dialog so that the device lists resize
This makes the device scrolling lists fill any extra space when the
window is resized.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e3bf13a38d24e95b16df1e2f01952d10f24cda10
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 25 22:55:08 2011 -0700
altosui: Move AltosIgniteUI device open out of Swing thread
Eliminate more blocking code from the Swing thread.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 109344d54d3fa4f79342fd1ea2a3f4085475e30c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 25 22:28:40 2011 -0700
altosui: Display reader name (usually the device) when an I/O error occurs
Access the reader name directly from the reader object instead of a
local variable (which wasn't getting set anyways).
Signed-off-by: Keith Packard <keithp@keithp.com>
commit aa5caf6310f074109472e6f55d8bd9751fb75c4c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 25 21:26:21 2011 -0700
altosui: Fix TeleBT name in flight monitor title
Was getting the product number, not the product name.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2e7b7b80432bb251ac39efa1fa05d32b5f250e14
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 25 21:17:07 2011 -0700
altosui: Separate out flash debug code to separate thread
This avoids blocking the Swing thread while waiting for the serial
device.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 214cd69c0e4a1617ed5cde8fc2f46a4cee6ecced
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 23 22:50:58 2011 -0700
altos: add telebt-v0.0 Makefile
Git doesn't like to add these.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d41edb3384b6336f3482e61b0c9f9400a8b4f519
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 19 15:29:39 2011 -0700
altosui: Make flight data download work through TeleBT
This required flushing input before reading data blocks and adjusting
some delays.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 44fb71ca3e5bccd5f601fc5a2d5da7292050b1d6
Merge: 2ebdb88 c269e26
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 19 14:06:39 2011 -0700
Merge branch 'telemini' into telebt
commit 2ebdb888f6792de70b3132950a988d49752d264e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 19 14:01:19 2011 -0700
altosui: Eliminate ao_cmd_filter hook
Disabling status messages means we don't need to filter them out of
the input stream.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7f5c9986dfa2d130b6c8c14308638cce49391a6e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 19 13:42:30 2011 -0700
altos: remove BT logging code
This was used to debug the serial line startup.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0195ff442c1da5d363dfda3f88f41865d0c6b469
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 19 13:31:10 2011 -0700
altos: Remove bt debug command
This will permit some additional cleanups.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ce7cf0c5ddc5405f6f474f4e20752fc0b02f3ecb
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 19 13:27:40 2011 -0700
altos: Simplify BT communications
Eliminate stdio I/O wrappers
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e3d501940718428135e04995dff7fef691c08a20
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 19 13:20:19 2011 -0700
altos: Solidify BT connections
Use delays while sending commands to BT module.
Don't use BT for stdio until the module is initialized.
Add \r to name setting command
Don't require 'connected' signal for command input.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6b5957d5f6f8181da7be98c9bce49a0ec0b4a713
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 19 10:41:28 2011 -0700
altosui: Wait two seconds after bluetooth connect XXX
"something" isn't quite ready to communicate right after the device is
connected, so we stick a delay in. There should be a better fix.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8de9d3cbfcd1db7b554fb761296a8de09aafc8c3
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 19 10:25:47 2011 -0700
altos: Add delays to bt startup sequence
The BT device takes a few seconds after power-up before it is ready to
receive commands.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 17f38e045fcd8ca0224095c0b2b7b098df77a8d8
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 19 08:43:40 2011 -0700
altosui: Use persistent list of bluetooth devices for device dialogs
Store a list of known bluetooth devices as preferences. Always include
those in device dialogs with an option to go browse for more devices
in both the device dialog and the Configure AltosUI dialog.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f249e5926f5fd9f86c41e7f0a414193533d4d8b0
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 18 18:16:38 2011 -0500
altosui: Make bluetooth dialog modal
This allows it to be displayed correctly while the device dialog box
(also modal) is up.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 84163eee7847a09fe78f8762b28f857d76bf5755
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 14 10:22:30 2011 -0700
altosui: Make AltosBTDevice implement AltosDevice interface
This will allow the use of either USB or BT devices through the
AltosDevice interface.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9cdef76c1275b343099d0d01af82d7eadd36a410
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 14 10:12:29 2011 -0700
altosui: Create abstract AltosDevice class
This will wrap either USB or BT devices. The USB device constants have
been moved to Altos.java
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5b3f18b38d80aa041b971204bf7a94278bd9584a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 8 19:46:15 2011 -0700
altosui: Add primitive bluetooth device manager UI.
This isn't useful, but does inquire for available bluetooth devices
and show them in a list.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c269e263a6accd815ed5d08c0f5a6c3d5b9d3853
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 14 09:38:48 2011 -0700
altos: Write a few pre-launch samples for Tm/Tn devices
Record pre-launch samples in a small ring and flush that to flash when
launch is detected. This provides a complete record of the flight,
rather than simply starting after launch detect.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a0fb471ce10642fc4a4bd40e4a81f8d6fe7a7c21
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 13 20:27:38 2011 -0700
altosui: oops - lost state changes when downloading eeprom data.
This would cause the reader to just keep reading past the end of the
flight.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7f49d694e776819e03b2c708e1c4ee23ba311430
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 9 22:53:12 2011 -0700
altos/altosui: Log averaged baro sensor data in Tm/Tn
Instead of logging the best height guess from the kalman filter, log
barometer data. The logged data consists of the average value betwen
log points to reduce noise.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8dd455204cf8712fa8c142b0c0517cec1bf5fd0f
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 8 10:13:55 2011 -0700
altosui: Add low-level Bluetooth APIs
Adds the JNI functions to query and connect to arbitrary
bluetooth devices.
Adds Java wrappers to construct a list of proximate bluetooth devices.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bf1c7df5301a1727e871a8447f835fe75bdce3fc
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 8 10:12:50 2011 -0700
altosui: Add TeleBT USB device support
TeleBT can work just like a TeleDongle over USB.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1a54a58d72147888f783a3caf364479efff4ed9b
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 7 22:00:38 2011 -0700
altos: Use PIO(6) on BTM to monitor BT connection. Fix BTM init.
PIo(6) appears to be an active-low indication of the Bluetooth
connection status. Hook this up using an interrupt to track the
link state instead of using in-band status messages.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f28efe271f9670473249574f6bcf6e160fe58c7b
Merge: 8db5c52 835ab3a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 1 19:35:22 2011 -0700
Merge branch 'telemini' into telebt
commit 835ab3a8c2741a09b27de58c37439a193c9919ce
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 1 19:35:00 2011 -0700
altosui: Add missing AltosTelemetryMap.java file
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8db5c52f1c76a05020e4e0afbe4ea27485ad9f82
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 1 17:26:08 2011 -0700
altos: Clean up BT serial communcations
Disable echo on both ends in command mode to eliminate looping error
values.
Switch to 57600 baud to improve performance.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a5d60fdb9c969c1516feb76a16001c9688112c4c
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 1 17:25:07 2011 -0700
altos: Make cmd echo per-connection instead of global
Allow different connections to use different echo values, permitting
the packet link to turn off echo while the USB link still has it on.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4e2c18249e16c98cf5f7dccdf8d3b84bc473863a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 1 16:48:12 2011 -0700
altos: Clean up serial initialization
Flush serial input buffers when switching speeds.
Ensure pin configuration is correct.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 92386f2e8419c4df125692cc998eb72ec49bf991
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 1 14:12:56 2011 -0700
altos: Clean up usage of serial port for stdio
Code wanting to use this must invoke ao_add_stdio; that way
the link can be configured before command processing starts.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9f8a96a8516e13878b329dbf1da855ed9a3219c4
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 1 14:11:44 2011 -0700
altos: Make ao_serial_drain public
Allow external code to discard serial input
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4f243a282f9aeb7433ccb2942850d380a091e603
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 1 14:10:37 2011 -0700
altos: Remove serial monitor command
This takes up space and isn't that useful these days
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 39bde78edc863d9d2ef50a59b8f28ab6274892b4
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 1 14:08:37 2011 -0700
altos: Allow any stdio to be used with packet forwarding
There's no reason to restrict packet forwarding to work only from
USB.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 01952da35a57ae4da062facb26b3c6d7de29190f
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 1 14:07:23 2011 -0700
altos: Provide for a pre-filter on commands
This allows for external code to see each command line before it is
processed and potentially skip it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 359ba0d9fc2c5947e6adc98bebcd061069c61e79
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 1 14:04:58 2011 -0700
altos: expose set of available stdio values
This lets external code manipulate which connection to communicate
over.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ce18eaa28b1385c962c09459cbc5f20e234d9ad5
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 1 14:03:25 2011 -0700
altos: Add P2SEL_*_MASK defines to cc1111.h
These are used to avoid having the code "know" which selections are 1
and which are 0 bits.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8e74cf6d1c70a7a17d01c20f6831571245392498
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 31 20:58:14 2011 -0700
altos: Add initial TeleBT code
Prototyping with a TeleMetrum v0.1 board and a serial link to a
bluetooth module.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c0971abc02b05d136aea257f3f40ba3b22b1d441
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 31 20:55:18 2011 -0700
altos: Make ao_flight_test show true height but report saturated height
To simulate a saturated baro sensor, clip baro data at a specified
altitude. Continue to report the 'true' altitude in the output so that
the resulting graphs are useful.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8a14142e7b37031a51409f121b913fe793bf3603
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 31 20:53:12 2011 -0700
altos: Baro useful ceiling is MSL, not AGL
Use MSL instead of AGL for detecting over-range baro sensor values.
Always trust baro sensor during descent; it'll get there eventually.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a9dae18a664f70b668159487015e61be7f776926
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 31 20:51:15 2011 -0700
altos: Reflect ao_flight split in ao_flight_test dependencies
Need to rebuild ao_flight_test when any of the flight sources change
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f558cfa1df77c36a459168c1953d0945ee5a7f9f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 30 11:48:03 2011 -0700
altosui: Only plot acceleration when present in data file
Eliminates a bogus axis and data line for devices which do not have an
accelerometer.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a9df9fc257eb2d7038d66ac7c2539aae4474bf12
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 30 11:47:07 2011 -0700
altosui: Parse and export Max flight log value
New configuration field might as well get dumped to the .csv files.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 87bff181a95f6bf92c2cec350d331ba6af779e80
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 29 18:11:47 2011 -0700
altos: Enable logging during nano flights
Not having logging wasn't very useful.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 011e37f27b3926a42c8c1a74e0f179bb48829ec7
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 29 18:10:46 2011 -0700
altos: Run RDF beacon after apogee instead of waiting for landing
This provides tracking when GPS fails, or on TeleMini.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 08e6bbef2c3529dfd468ef221c526fc9f3ed5b81
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 29 10:08:46 2011 -0700
altos: ao_sample_preflight was exiting preflight mode immediately
Need to stay in pre-flight mode until we've gotten enough sensor data
to calibrate things appropriately. The conversion from a unified
ao_flight.c file was just broken here.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 56d045040c49728a854741e99545766f3723da5e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 29 09:39:27 2011 -0700
altosui: Don't display 0000-00-00 for missing flight log dates
With Tm/Tn not having GPS to get the current date, it's no longer
unusual to have no date for a flight log, so don't show the 0000-00-00
piece in that case.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8ade7d99f02df825e70d0a964b4648156101ef78
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 29 09:38:23 2011 -0700
altosui: Display exception messages from swing thread
Flight log management exceptions were getting displayed from the log
serial I/O thread instead of the swing thread. That's a bad plan.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2f9be009ef26e3d7539f5932d267d7a8a7bcb7eb
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 29 09:37:11 2011 -0700
altosui: Make deployment testing handle Connecting... dialog
Supporting the Connecting... dialog requires moving all serial
communication to a separate thread. This was done by creating a worker
thread and command queue to communicate between the UI and the serial line.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 573edcd7dfe10ac3251396eae88eece55d82bcb6
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 28 23:38:02 2011 -0700
altosui: Make flight log downloading handle 'Connecting...' dialog
This required moving all of the serial communication to a separate
thread and making the bulk of the download operation run after that
has finished.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c71a145daefb86d2c1297abec68e54bd951e3adf
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 28 23:35:05 2011 -0700
altosui: Clean up packet link connecting dialog
Make sure the dialog is destroyed after use (otherwise, it hangs
around on the screen sometimes).
Switch timeout before showing dialog to 500ms -- that brings the
dialog up less often when unnecessary.
Use 'timeout_started' boolean to indicate whether the I/O thread has
queued the dialog for display and whether it needs to queue a call to
close it down.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c6e7e812d67f91c63ba4982f7a899a72584027de
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 28 18:18:50 2011 -0700
altos: Create custom nano flight code
No igniters, just 'pad/drogue/landed' modes (where 'drogue' ==
'flying'). A constant 1Hz telemetry and RDF rate.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c754759a2d503633d527da4ebb20eb859cd506fd
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 28 17:54:44 2011 -0700
altos: Split up flight code into separate flight/sample/kalman bits
The flight code mashed together data processing, filtering and actual
flight managament into one giant pile. Split things up so that we
have:
ao_sample.c: Sensor data processing. Reads the ring, handles calibration
ao_kalman.c: Filter the data to track the accel/speed/height values
ao_flight.c: Flight state management, specific to rocketry.
The plan is to re-use ao_sample.c and ao_kalman.c for hardware not
specifically designed for rocketry, like TeleNano.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 006de838bbb096b9443863a46b8a125b1e6b5600
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 27 00:48:07 2011 -0700
altosui: Handle serial calls from swing thread
Calls from the swing thread cannot be canceled as there's no way to
put up the cancel dialog. In this case, simply use the 5 second
timeout and fail if no communication occurs within that amount of time.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f23d0f3cbf1fb0c8eab497e266625f6410b69ba3
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 27 00:46:19 2011 -0700
altosui: Tell serial device which frame to use for timeout dialogs
For the timeout dialog to appear, a frame must be configured for it to
appear near. This patch sends the frame from the eeprom download
functions to the serial code. That path doesn't yet work as the eeprom
download is still trying to talk to the serial device from the swing
event thread, which prevents the cancel dialog from working.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 067b21993e9a97fceadb355e571e5610535336a8
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 27 00:13:38 2011 -0700
altosui: Allow radio channel to be configured over the radio link
TeleMini/TeleNano can't be configured via USB, so we need to allow
the radio channel to be set over the radio link.
This change carefully sets the new radio channel, disables the remote
link and then sets the teledongle channel to the new value and brings
the link back up.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 91a75279b6d306ba9d068a28c64917d5312122e8
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 27 00:12:01 2011 -0700
altosui: Off-by-one error in telemetry format configuration UI
The telemetry format menu uses 0 for full and 1 for tiny, but the
telemetry configuration uses 1 for full and 2 for tiny. One direction
(config to UI) was right, the other (UI to config) was wrong.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7ce8c9081e703d1405c2595ab9bda0cfa218c6c4
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 26 23:38:54 2011 -0700
altos: full logging must flush pending data before checking state
Flight state must be checked only after any pending data have been
written to the log as the 'current' flight state is only valid when
the pending data values have been processed. This ensures that the
'boost' state is not marked until the full ring of data is
written. This ensures that the data processing code can find the
barometer values from before boost to get an idea of the ground
pressure value.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3945d8f986d8f4bd3186a2cbaed5186e49d59839
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 26 23:15:36 2011 -0700
altos: Variable log rate in full logging code too
With the fixed ADC rate used to get better data during flight, the
logging code now needs to vary the data storage rate so that descent
data is recorded at 10 samples/second while ascent data is recorded at
1 sample per second. Having the logging code do this itself eliminates
any interaction with the flight code.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 97517ee585462c2d355f23f999fb8d9ebd908ec1
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 26 00:01:22 2011 -0700
altosui: Allow TM config connection to be canceled.
This leaves the config UI connection attempt running and pops up a
dialog box when it takes 'too long' in the remote case so that users
with Tm or Tn devices can bring up the UI, and then boot the Tm/Tn
without needing to time things carefully.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2c121f1ef495e8af3eb39210baa40e212b691894
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 25 22:04:09 2011 -0700
altosui: swing hide/show methods are deprecated
I don't know why, but they are, so just replace them with
setVisible calls.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b155647472ddfacb07c5ffa832e4d1f4a13ad342
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 25 22:01:18 2011 -0700
altosui: Remove extra AltosEepromBlock layer
This was interposed between the download layer and the eeprom layer to
hold a eeprom block full of flight log records. The addition of the tiny
log format required reworking the code to hold chunks full of eeprom
data without regard to their content, so this content-specific layer
didn't seem useful anymore.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 011615d40b3cb1d1c0ab9fa41e139e263a6a51e7
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 25 21:34:31 2011 -0700
altosui: Add support for downloading TeleMini/TeleNano flight logs
Splits the eeprom downloading code into eeprom block downloading and
separate eeprom data parsing so that the new data logging format can
share the data downloading code.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dea80af81b388cc3d7073444919f4e98b12fa730
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 25 21:29:50 2011 -0700
altosui: Remove a bunch of debug printfs from the eeprom manager code
Just noise on stdout.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7f5b5848ad6ef5c808638a29c3dc0101b56ed11e
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 24 08:08:43 2011 +0900
altosui: Add telemetry format menu and preferences
Switches the TeleDongle between full and tiny telemetry packet
formats, saving the last used format for each teledongle in the
application preferences.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f3e68341f6f5daaf26dd162e4f9a06c29988986a
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 24 05:27:57 2011 +0900
altosui: Add support for telemetry version 4
New telemetry format needed to support TeleNano and TeleMini
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1e976a105423f2da1842f70da531c9051ba88a7f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 23 10:42:31 2011 +0900
Add description to test flights
commit 93040ef4d0bd90ec5ae052f22243cd56adfb300a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 23 10:40:05 2011 +0900
Add ao_kalman.h to .gitignore
commit 43a94380032300a2e33e1faa1efe93e858e0a2cf
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 23 10:37:39 2011 +0900
altos: Exit flight test at landing. Allow description in test flight list
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 32364c9e0d346e0e5d517e18d4e90b8ff2fa944f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 23 10:33:38 2011 +0900
altos: Ignore alt error for fast->coast. Allow larger error for baro apogee.
With the fixed kalman filter, transitions across mach don't cause
bumps in the merged filter.
And, with working kalman bits, the signal for broken baro detection is
stronger and so we can allow for baro apogee detection in cases where
noise occurs close to apogee.
Bump the kalman filter to trust the baro less so that the model tracks
across mach.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3d2042ccc2d29e4cb8ea39c5c69d07cb7e3daeea
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 22 16:55:08 2011 +0900
altos: Restore sensible kalman values
Now that the kalman code seems to work correctly, restore the sensor
errors and model errors to match reality
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7d7b476564a16eda81ab3406f70a21995e1b464e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 22 21:51:52 2011 +0900
altos: Fix up flight code testing
This automates flight code testing by reporting mis-detected apogee or
main events.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a80d3836cfce3d4cfa7a71068539415c2dc421cd
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 22 21:50:29 2011 +0900
altos: Missing parens and some bad arithmetic in the kalman code
Fixed point computations are a pain.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f30de5766c1eefb18c7d024a2cf10ce02de41071
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 22 21:29:05 2011 +0900
altos: Add ao_flight_debug code
Trace the kalman filter to make sure it's working.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f3053b1f3c85d4fd84b3c6cc87858f433166df34
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 22 17:04:07 2011 +0900
altos: Clean up some debug stuff in ao_flight.c
Remove some spurious printf debugging.
Remove an attempt at discovering broken accelerometer code.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6864e06d88a5b908cffa7c4cd2be8969ff46ce4d
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 22 16:51:04 2011 +0900
altos/kalman: Kalman terms can be > 1, use 32-bit fixed point
Because speed and acceleration are scaled by 16, it's fairly common
for the kalman terms to end up larger than 1. Instead of trying to
fuss with 16-bit values and shifts, just use 32-bit values.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c14d6c5ace1d67bd948273ceb7eb6807b29c3806
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 22 08:51:23 2011 +0900
altos: Compute a 'trust' value for the barometer
Instead of making the baro use/don't-use decision binary, use a 'trust
value' which slowly migrates from baro+accel to accel-only mode. This
eliminates bumps in the data from a rapid shift.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7b009b2efe3af8722c358c304c2243652594e0d5
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 22 05:42:51 2011 +0900
altos: Switch telemetrum over to kalman filter
This changes the full telemetry stream to include kalman data instead
of the old ad-hoc flight data. It's compatible in that the packet
sizes are the same so teledongle can receive either and figure out
which it has received.
A few plotting and testing tools are added to make validating the new
code easier.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 20427ae4965f756aac0cedc5179a1c45b9a781f2
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 21 19:59:27 2011 +0900
altos: Add nickle kalman implementation.
This generates the constants needed to implement Kalman filtering in
the flight firmware.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ca3f03ef5c09446bebf0f5734f36a0248c457b1d
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 19 23:55:39 2011 -0700
altos: Add .sdcdbrc file for teledongle
My sdcdb script uses this to set command line options automatically
Signed-off-by: Keith Packard <keithp@keithp.com>
commit be838db49d999426a9dd02c0166fe161722f1e61
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 19 23:53:08 2011 -0700
altos: New telemetry report format (version 4). Supports tiny telemetry.
This completely replaces the version 3 format with a much simpler and
easier to parse scheme. It's described in detail in ao_telem.h, but
the basic idea is that the whole line is split into name/value pairs,
separated by whitespace. Every name is unique, and the values are
either strings or integers. No extraneous formatting or units are
provided.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ad6bb342d237988404fa32540b38c61d6ddc1f0d
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 19 23:51:02 2011 -0700
altos: The kalman code requires a constant sample rate
The kalman function can't handle a variable sample rate, so keep the
ADC running at full speed for the whole flight instead of slowing it
down after apogee.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 31feb7777f73fed61193d3404f457ea1a081fe9c
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 19 23:49:41 2011 -0700
altos: Split telenano main from telemini
Eventually, telenano will run different code; prepare for this by
creating a telenano-specific main routine.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8950df02382f5f0aea5bac078fdf7134b98c43ed
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 19 23:46:18 2011 -0700
altos: Split out tiny telemetry from full telemetry
The TeleMini and TeleNano boards do not have either GPS or
accelermeters, and they also run the kalman filter which produces
standard unit measurements for the flight height/speed/accel
values. This makes the telemetry significantly
different. ao_telemetry_tiny.c sends the required data.
Note that TeleNano sends the same telemetry as telemini at this point;
there are a couple of values which are not useful, but the overhead of
sending them is small enough that the hassle of having three telemetry
formats seemed excessive.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5ba75e95c98d3e441a58d6f75d328d579e1997fe
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 19 23:41:44 2011 -0700
altos: Make telemetry interval more consistent
Instead of using a delay between telemetry packets, use a telemetry
period and compute an appropriate delay each time. This requires
changing the ascent telemetry from a 50ms delay to a 100ms interval,
to provide a regular 10 packets-per-second rate. Before, we counted on
the telemetry packet taking about 50ms to send so that we would
receive about 10 per second.
This also eliminates delays during descent for RDF tones -- those will
get transmitted in the interval between telemetry packets without
interrupting the spacing of those packets.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3f0bc801fd08a613c681504f0d1f9374486a2487
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 19 23:31:20 2011 -0700
altos: Configure packet size from send/recv parameters.
Instead of setting the packet size at configuration time, use the
provided packet size to the send/recv functions to configure the
radio. This eliminates many configuration calls, leaving us with 'RDF'
mode and 'packet' mode, the latter working for telemetry and the
bi-directional link.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5c28b9312d90a3a66016abc641c20bcd852d69f8
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 19 23:27:15 2011 -0700
altos: Don't init packet slave on TD. Make slave start optional
Oops. TeleDongle was starting the packet slave code, which kinda
wrecked its ability to receive telemetry packets. This patch simply
removes the packet slave code from teledongle as it cannot be used
(yet), it also makes the packet slave code initialization take a
parameter which controls whether to start that by default; in the
future, perhaps TeleDongle will gain a command to start packet slave mode.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e980b251e5a4d25410710a9aa89ef940e06b0d93
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 19 18:43:52 2011 -0700
altosui: Add software version to Configure AltosUI dialog
Show this somewhere so we can figure out what is installed.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1aeb759c48f475ffaaae787515e080440c8386c3
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 19 12:28:08 2011 -0700
altos: Baro-only boards must not detect launch on accel or speed data
The baro sensor generates too much noise to use small changes in
computed speed or acceleration to cause a false launch detect.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7a4f6d5ad55637cde97a1e2f247f92df59bc2e14
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 18 21:01:15 2011 -0700
altos: Write height values to log for nano/mini
This is a lot more useful than the old filtered pressure data.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c985bb6a19c710409629f3c095332ba7afcf5248
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 18 20:36:59 2011 -0700
altos/test: Add scripts to run lots of flights through the code
This runs a long list of flights (there's a user-specific path
pointing at the flights) and squawks if the baro and dual flight
computers don't match.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dbe915795c66995805b5f37e6eb698cf2c143e61
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 18 20:26:12 2011 -0700
altos: Fix mini/nano default log size to available flash space
Also, remove accel cal code from boards without accel
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5db94e1e230bade966a997aa83165405a9ec9d83
Merge: 1a8f45e cbb968f
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Mar 18 21:12:39 2011 -0600
Merge branch 'telemini' of ssh://git.gag.com/scm/git/fw/altos into telemini
commit 1a8f45e7b720d01d3ff0c35ed1caaf8cbe0c3119
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Mar 18 21:12:12 2011 -0600
fix up script to work and have reasonable texts
commit cbb968f5cf03625d453d84dc535758072a2c04c7
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 18 20:07:25 2011 -0700
altos: Add TeleNano support
This just uses the TeleMini bits, which should work fine for now.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 32c51840c792a737019fbc9fe42f2ca073b71827
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 18 19:49:46 2011 -0700
altos: Tiny logging fixes. Scan at start, stop when land or full.
Initialize the flight log for tiny systems by scanning the log area to
find the current flight number and log area bounds.
Stop logging data when the flight is over, or when the log area is
full.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 62eae8a17d870e8ac6937ba23da01a5fbc652c6c
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 18 16:53:11 2011 -0700
altos: Add kalman filters for baro-only boards
This adds a baro-only kalman filter to track the state of the rocket,
and then uses it to control flight events instead of the existing
ad-hoc mechanisms.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c826fab31f8aea25a942b6bb8435d4b04c1bef10
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 17 16:00:10 2011 -0700
altos: Add tiny logging for TeleMini/TeleNano
This splits the logging code into management of the log space within
storage and separate code to actually write suitable log entries. A
new log writing module, ao_log_tiny, is added which writes only
altimeter data at a fairly low data rate for devices using on-chip
storage.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8b546b474b7b6c5b4169b4c1ca09c6f17ebb3ae5
Author: Anthony Towns <aj@erisian.com.au>
Date: Fri Mar 11 21:41:01 2011 +1000
ignore new flight test file
commit 82707a05af0eb2d54f46b58805c95cdf4e5a3703
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 16 20:36:50 2011 -0700
altos: Internal flash ops block when running from flash
The docs say that if you are executing from flash, then the CPU will
stall after a flash write or erase command is started until the
operation is complete. Take advantage of that to simplify the flash
code.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1d8579f973bfe1047ee91f03555e74abdc483e69
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 7 16:31:43 2011 -0800
altos: oops -- altitude reporting wasn't pausing between signals
need to actually alternate the LED/tone with some space so you can
count.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d007bccf6cb36d24a9c7c48de7d80759ac6f2e37
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 7 15:57:58 2011 -0800
ao-load: Make usb descriptor rewriting optional
TeleMini and TeleNano don't have USB descriptors to rewrite when
loading firmware, so allow them to be missing.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 57d83f51377fb58018f422e42d74f29b86a821d2
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 7 15:26:41 2011 -0800
bringup: Add script for telemini
Copied from teledongle with a few obvious changes.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ddd7485f05d0cad8f5b3e1ee9b9a4d2812ea1837
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 7 08:03:11 2011 -0800
altos: Switch pins around for TeleMini
TeleMini has fewer sensors and uses P0 for igniters instead of P2.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f8afc2641c779fc312a42a6358187d8716ebe61a
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 6 23:52:11 2011 -0800
altos: Switch LED usage for TeleMini around
We're using the LEDs instead of tones, so make red mean 'low tone',
green mean 'middle tone' and both mean 'high tone'.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fc5d014721a7e5a7b22f07eb4ab0bb3c764473fe
Author: Anthony Towns <aj@erisian.com.au>
Date: Sat Feb 26 16:06:48 2011 +1000
ao_intflash: Avoid overwriting code
Require firmware to specify the end of its codespace in its Makefile,
and use this to determine where the start of available flash is. Should
give compile time errors if either there's no room left for storage, or
if there's not enough room for code.
commit 0e4c55d78852415e79f7318471f4d00c89703b78
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 6 21:03:57 2011 -0800
altos: Add TeleMini v1.0
This adds initial code for the telemini board, a two channel
flight computer with digital telemetry and a barometric sensor.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2d41358c80f2eb8b6e98d699149bb941a6671475
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 6 21:00:52 2011 -0800
altos: Start with packet slave running. Turn off in pad mode.
Instead of turning slave mode on in idle mode, start with it running
and disable it in pad mode instead. This means packet mode is
available in startup mode too.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1e56ed44e562f808addfd76bfb352f981db94094
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 6 21:59:08 2011 -0800
altos/test: Add baro-only flight test program
This builds the flight code in baro-only mode for testing.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e339ffd8bd8b9e3f4758017ba355028000cb612e
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 6 21:57:52 2011 -0800
altos/test: Use ao_convert.c instead of hand-coded pres → alt func
Fix up ao_convert.c so that it can be used within the flight test code
instead of having a (broken) copy of the code there.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 02611efea0c485d78fad08c696c1f56e868d36b8
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 6 20:56:25 2011 -0800
altos: Make serial, usb, beeper and accelerometer optional components
Not all boards will have these, so fix places that use them to deal
with that.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fdd15a254c6fab5ba2d02320ba0ceb3e6a56354c
Author: Anthony Towns <aj@erisian.com.au>
Date: Sat Feb 26 11:48:30 2011 +1000
ao_intflash: Use internal flash for storage
Makes any free pages at end of CC1111's internal flash available via
the ao_storage API.
commit 8f1bd11b61d9423c62162f7bbe573fc69fd75269
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 16 14:10:06 2011 -0700
aoview: remove -s option.
commit 45395c7825184efb835d5b165fa132be20c7f6fe
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 16 14:08:42 2011 -0700
Bump published version number to 0.9.1
commit 9f3d26cadf37880d2c9223f59271d295b11c4c2a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 16 14:05:13 2011 -0700
altosui: Missed jcommon.jar in the Mac OS install image
This caused graphing to fail on Mac OS X
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6e340c87d3198647cf075ed520a82703b0d59beb
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 7 00:26:17 2011 -0800
altos: Oops. Lost a couple of commands when merging the doc patch
I didn't merge this carefully enough and managed to lose the 'f'
and 'e' commands, which are kinda useful.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8cdf4fb051c22b35c251d90bc288551f7c2898bf
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Feb 27 11:11:12 2011 +1000
src/ao_cmd: Shave off bytes from doc strings
Switch to using { func, "X args\0Desc" } to specify command, saving
a char field by looking at help[0] instead, and reduce help length by
doing alignment with printf instead of hardcoded spaces.
commit 2cfe205de4242398e69c9e7c613af0d2a7094686
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 7 00:01:01 2011 -0800
Revert "src/ao_gps_skytraq.c: Update logging rate to 10Hz"
This reverts commit b080e933a65d268aaaec8cfd5f617a13d5babc43.
10Hz data isn't any better than 1Hz data; it still doesn't like going
upwards rapidly.
commit 249cd3b63d97581b068fff988e0cd7fcd5bf493e
Author: Keith Packard <keithp@keithp.com>
Date: Sat Feb 19 01:06:01 2011 -0800
altosui: Display eeprom parsing errors to user
When reading the eeprom, any parsing errors (most likely bad
checksums) indicate some kind of problem with either the hardware or
the flight software. Display these to the user and do not erase the
flight.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 629a7637871b24fe6d1204aaa7185d84933d4639
Author: Keith Packard <keithp@keithp.com>
Date: Sat Feb 19 01:04:19 2011 -0800
altosui: Always read whole eeprom block, even at end of flight
Instead of stopping early, continue reading the whole eeprom block so
that the extra serial data doesn't end up confusing the next user of
the serial line, which may well be reading the next flight.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7ca2cf1b7e03b8453b45b45e313a33ad65da9ad5
Author: Keith Packard <keithp@keithp.com>
Date: Sat Feb 19 01:02:00 2011 -0800
altosui: Mark empty eeprom records 'invalid', don't generate exception
When reading empty eeprom records, mark them as 'invalid', but don't
generate an exception as it's normal to read these at the end of the
flight log.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 690feb166fd2bc6b6dfc26828f1efe9f5f1c6c0d
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Feb 18 23:56:01 2011 -0700
update changelogs for Debian build
commit 0630e7d6d8cf6abf0fe07f9a6df40ee472cce1ef
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Feb 18 19:54:18 2011 -0700
tie bringup scripts to Bdale's bench TeleDongle
commit b080e933a65d268aaaec8cfd5f617a13d5babc43
Author: Anthony Towns <aj@erisian.com.au>
Date: Sat Feb 19 05:49:15 2011 +1000
src/ao_gps_skytraq.c: Update logging rate to 10Hz
Send commands to skytraq to update baud rate to 57,600 bps, and
set NMEA output rate to 10Hz.
commit aad7103dcf44e69a5a30e008836cce5542ea33e2
Author: Anthony Towns <aj@erisian.com.au>
Date: Sat Feb 19 04:17:17 2011 +1000
src/ao_gps_skytraq: simplify parsing code
Added macros to make correctly constructing skytraq commands easier.
Simplified code path for NMEA processing marginally.
commit fe5123fa801f5dafed8b052da607899d1ef20500
Author: Anthony Towns <aj@erisian.com.au>
Date: Wed Feb 2 19:12:57 2011 +1000
ao_radio: generalise setup of packet size
commit 8b09cc1825645a57c256f38a2f9586ddecf6bda5
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 18 10:02:46 2011 -0800
altos/test: auto-configure acceleration parameters from the log file
The flight test code had static accelerometer configuration values,
making it impossible to use data from different boards without
recompiling. As the eeprom and telem log files both contain the
necessary data, parse that instead.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d3bc27fabb6159ce58b14d0f7929b0f46f67c378
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 18 09:54:01 2011 -0800
altos/test: Add dependencies in the Makefile for ao_flight_test
Yes, it would be nice to automate dependency generation here, but I
can't be bothered.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c3080fdafff5212f267ba7c765a2f083435be799
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 18 09:51:37 2011 -0800
ao-load: fix usage message to note that '=' is required for options
The usage message was suggesting incorrect command line syntax; long
options use '=' between the option name and value, not whitespace.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a09501ab714c0638410d06f80903a8769d93c688
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Jan 19 12:47:25 2011 -0700
update changelogs for Debian build
commit 2bb83d90aa03d825ca1b751418c91b194b72f1f9
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Jan 19 12:46:02 2011 -0700
elide changelog entries or re-release of 0.9
commit 9541ccd9ff9e67e0862ca31706358d8308fc85d8
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Jan 19 12:42:40 2011 -0700
update turnon script to prefer TeleDongle as programmer
commit 159fda30fe57349660c5e2d95017144ea3f5d7db
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Jan 19 12:26:53 2011 -0700
update changelogs for Debian build
commit 97f4f2e0d28eec1cf19d2d25140e42f6ac277700
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 19 11:21:52 2011 -0800
altos: Program default flight log max value for new boards
New boards have no config space values at all, and so they need each
value to be set. Yes, this should be fixed so that there aren't two
copies of these assignments.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 480587cf514ba21885b24c3b8fcb98d6b76ea8f4
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Jan 19 00:05:25 2011 -0700
update changelogs for Debian build
commit 6244f2316267738781e31a773b377bcf8c476918
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Jan 19 00:04:45 2011 -0700
prepare to release
commit 3c72103866f041107af49e01a5ccb6d4e6b6ac80
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Jan 18 23:55:42 2011 -0700
update changelogs for Debian build
commit 4ae724fe1d2ca0d712321c4fdc2200ff46d77428
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Jan 18 23:54:36 2011 -0700
we need an install target to prevent parent dir make from failing
commit ca7b549fbf62019b01a6e6c85da50645ea9a4502
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Jan 18 23:48:08 2011 -0700
update changelogs for Debian build
commit 9a5666f42d4d90a0a488fd0a85ae9914944fe0be
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 18 22:46:25 2011 -0800
doc: Build with 'make all' from top level. Build with 'make fat'
This will make sure the docs are up-to-date for both regular and
fat builds.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 72a04d679d06aaad9c2b4297fefd585fc393ce2e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 18 22:39:07 2011 -0800
fat: Add docs to Linux package
Oops. Missed this one.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5d91c250179f44ca17c26fff36718b7026aa8ee0
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 18 22:34:15 2011 -0800
fat: Add firmware for v1.1 and docs to mac/windows/linux installers
We'll need to be sure to update this each time we add a product.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 26c4cc3054b1c7c9ed6ce3c2f21f6254b3245718
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Jan 18 23:29:03 2011 -0700
freshen copyright year
commit e2e20f6ce8a9c2bca36fde5730ccd7151377ec6f
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Jan 18 23:18:42 2011 -0700
add 0.9 revision entry, with caveat about telemetry format change
commit 27e6dbbe95ae9b361d60576e0cbadb66792307f3
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 18 20:39:58 2011 -0800
doc: Add v0.9 features from altosui to documentation.
New flight download UI and new config items.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 92d7841edcfc8a841f71f7f97cc541f8e55c4627
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 18 20:39:30 2011 -0800
doc: Don't delete telemetrum-outline.pdf
This has a drilling template for the board.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c411dce69be58238b8312c2fd7405cbe8b5d4a5a
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Jan 18 17:27:11 2011 -0700
update changelogs for Debian build
commit da42f406e88ccc821cd45d5a94d5afec65ec50e9
Merge: ea4cdfb cf550f9
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Jan 17 09:50:17 2011 -0700
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit ea4cdfb87e03ecfb974f98305671265b6fb95372
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Jan 17 09:49:45 2011 -0700
update documentation to reflect reality that modifying a board or separate
pyro battery is not as simple as one trace cut on v1.0 and v1.1 boards
commit cf550f9b96fa94d8db559e01df0e265bb1c7b572
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jan 16 23:23:45 2011 -0800
doc: Remove mention of ao_wake_task
This has been removed from the altos sources, so remove it from the
docs too.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4b71c4f4ed6cae23a7f4a2e7ae697da9ec614898
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 15 12:26:53 2011 -0800
altos: Use 5V reference data to correct accelerometer measurements.
When the 3.3V and 5V values shift relative to each other (usually due
to changes in power consumption), the measured acceleration will
appear to shift. This patch converts the 3.3V referenced acceleration
value into a 5V referenced acceleration, eliminating this error.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2887fe7affc0706dbeb2f04df9a00a9b799903ed
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 15 12:25:57 2011 -0800
altos: Optimize fetching of ADC data in flight code
This stores the address of the desired sample in a local variable and
then fetches through that. Saves quite a few instructions.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2681a17500913cbaf3966f09380bb1d6b59e3863
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 15 12:18:32 2011 -0800
altos: Sample the accelerometer reference voltage on v1.1 boards
This places the 5v reference samples in an array parallel to the basic
ADC values. It doesn't do anything with the values, just stores them.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 69290588980bb15732a99eca5c911a3b6e9a37b9
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 15 12:12:02 2011 -0800
altos: Ensure flight code gets first crack at new ADC data
Instead of having everyone wait on the raw ADC ring, have the flight
code wait on that and have everyone else wait for the flight code to
finish looking at the data and move its pointer forwards.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1b8d7313504240ed04e0747e9b0f6e9a83d323e2
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jan 16 15:57:15 2011 -0800
altos: Auto-calibrate linux-based flight testing code
Use the provided ground acceleration average to set the two
accelerometer calibration values so that the flight code will
detect pad/idle mode correctly.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit afd3d3cdb8c2291c1c7cda7908392d68cd04f87f
Author: Mike Beattie <mike@ethernal.org>
Date: Mon Jan 17 15:03:40 2011 +1300
Rework invalid accel cal detection code
Slightly reduces code space.
Uncalibrated accelerometer now enters invalid state as well.
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 3566dee1cf83870396a0bb164f5549dd3faf58f5
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jan 16 14:40:31 2011 -0800
altosui: Remove spurious colons from eeprom selection headers
This colons make the presentation a bit confusing.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ab31b1c737d8fd32af482e5b06699f1b832a25a1
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 15 00:56:22 2011 -0800
altos: Add DATA_TO_XDATA to linux test harness
The flight test harness needs to expose every function used by the
flight code in some form, and this macro is about to become used.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit add2802a8a33336180fe6856241a7f4a8200e89c
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Jan 16 00:10:30 2011 +1300
altos: Added check for out of bounds accel
Chose invalid flight mode instead of idle to give user feedback.
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 58838c0b96a91da0bd0cd77c3ff312b589c08136
Author: Mike Beattie <mike@ethernal.org>
Date: Sat Jan 15 23:21:26 2011 +1300
altos: Added check for an accel value above 1.5g
When detecting flight or idle mode, this should indicate
that accel cal values are out of whack.
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 118fe84c9ff1cc9d1653e67a2315e22e19d60a14
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 15 11:26:31 2011 -0800
altos: average 512 accel/baro samples at startup instead of 1000
This lets us use a simple shift instead of a divide, saving a huge
amount of code space.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8a775b8f9ecefa143050653d74dfd218b32b9bb5
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Jan 16 10:54:45 2011 +1000
altos: Restructure skytraq NMEA parsing code to save some space
Splitting this into several smaller functions appears to make SDCC
generate better code.
commit 7a35b2d7048669a96256d4ea0086299f8a0cb1df
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 15 22:42:38 2011 -0800
altos: Flush log when full
When the log storage is full, make sure any pending writes are flushed
out so that the last bit isn't lost.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 47ee4597e55749e8f66f61a585ea32776979bf80
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 15 16:25:10 2011 -0800
altos: TELEMETRY PROTOCOL CHANGE. Switch to 16-bit serial numbers.
What a terrible mistake! The flight computer serial numbers were
recorded in only 8 bits, so serial numbers > 255 would get truncated.
There's really no fix other than bumping the field to 16 bits and
reflashing every TM and TD on the planet. Very unfortunate.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b22ba359a02297e39a446cbd5ef51e63b795624a
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 15 12:05:50 2011 -0800
doc: inkscape tracks the filename inside the document
telemetrum-outline.svg was renamed from telemetrum.svg and inkscape
appears to care.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d0a841b285fb398f0be72183ec3c9d1e358419a9
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 15 12:02:43 2011 -0800
altosui: Require 4 sats to light up the 'GPS locked' light.
This tracks the same GPS signal requirement needed for 'GPS ready' and
ensures that we have a 3d fix.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1bfdce6fc3367fdf03e0dc7ddd94da18723b8ba3
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jan 16 14:30:38 2011 -0800
altosui: Ensure serial device is closed after eeprom download finishes
As this code is all event-driven, track which events will trigger
further work and block closing the device in those specific cases,
ensuring that all other code paths end up closing the device.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 987039b8f0b1d889aca9109d4c6a83f034ff64a7
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jan 16 14:29:57 2011 -0800
altosui: Remove debug message when eeprom downloads are complete.
This message isn't useful now that this code appears to work.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fb534aae15f0f1e5d69790e159d0287b6b8a514a
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jan 16 14:28:35 2011 -0800
altosui: Use long input flush timeout when remote.
100ms isn't long enough to capture pending remote serial input, so use
300 ms in that mode.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d4add23186b3586c99579d83efdc003f79e9bf7a
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jan 16 14:26:18 2011 -0800
altosui: Make serial debug more complete and accurate
Display all serial input, including telemetry.
Wait to display serial output until flush time, to debug missing flushing.
Show when devices are opened and closed.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit deb3c7b9206be0c9c46f75d35c8f766c26d9838f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 15 22:43:37 2011 -0800
altosui: Reset eeprom download instance variables before reading flight
To deal with downloading multiple flights in a single invocation, make
sure all relevant instance variables are set back to start of flight
download values each time a log is read.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit eec9eb2e81535e62c52fbb2e57a2d33f88f92c1a
Author: Mike Beattie <mike@ethernal.org>
Date: Mon Jan 17 07:56:53 2011 +1300
Close serial port if Download/Delete dialog is cancelled.
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit df1c6ab3ac079199b5a12328c9ff5cfa6ac29b36
Author: Mike Beattie <mike@ethernal.org>
Date: Mon Jan 17 00:40:07 2011 +1300
Convert EepromSelect dialog to use a GridBag
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit fef302656f21ae0ab4772f72979cbb7f071da89a
Author: Mike Beattie <mike@ethernal.org>
Date: Sun Jan 16 20:25:19 2011 +1300
Re-order and re-arrange eeprom download dialog
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 35adb7c98fe02e84fff70c1bee22bfa019cfacc2
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 14 21:44:59 2011 -0800
doc: Add telemetrum mounting template in svg and pdf forms
telemetrum-outline.svg and telemetrum-outline.pdf
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fdba0f24afd59becc499d750bbdb80aea86066ac
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Jan 14 18:01:16 2011 -0700
update changelogs for Debian build
commit 646e1926cdf56e2cf2425413ce716e6999b64a58
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Jan 14 18:01:00 2011 -0700
update changelogs for Debian build
commit d908c2ebd0b11a54cfd922a192249d0f0df0ddb0
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 14 16:47:36 2011 -0800
altosui: Add preference for serial debugging.
This dumps serial input/output to stdout.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fcaee12a64d5e195b55b8f77c19dfc0c57ef5d58
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 14 16:47:19 2011 -0800
altosui: Ensure serial line is flushed after disabling remote link
Flush the '~' character.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2d154be89246e111a36f7c2700effbb2c97da541
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 14 16:44:50 2011 -0800
altosui: Show dialog after successful delete or when no flights
Make sure the user always sees confirmation for flight log management.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b490455807d1c70c81785ed8931a07ab44e8e421
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Jan 14 14:31:19 2011 -0700
update changelogs for Debian build
commit 97b1ca994599ad262400eb3c685799582f7f1b94
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Jan 14 14:30:49 2011 -0700
update changelogs for Debian build
commit d794ef9e0fbe4d13259db1bbd69f01717c14400b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 12 12:41:26 2011 -0800
altos: check for valid flight number in ao_log_delete
Zero is not a valid flight number, and ao_log_flight uses that to
indicate 'no flight in this slot'. Check the user-provided input for
zero before looking through the slots.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8801b8c1947bd39f7c985b91a2ba8dbc81bcc91a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 12 12:40:45 2011 -0800
altosui: Add eeprom 'manage' ui to download and delete multiple flights
This shows the list of available flights and provides options to
download and/or delete each one.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 440d52e34364fdeeddc76a2d744cc6d1c934364f
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 11 21:28:07 2011 -0800
altosui: Add support for parsing list of flights from the 'l' command
This adds parsing support to enumerate the available flights, but does
not yet provide any UI to use it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7ad419d81c90ef6a16656970466313767fef830f
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 11 21:26:41 2011 -0800
altos: oops -- 'e' command was only showing 7 of the 8 bytes per line
Just a silly off-by-one error when printing out the data received from flash.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bd2480fd757b67557d9c7de42e402034002c3e37
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 11 15:39:24 2011 -0800
altosui: Split eeprom download code apart
Create separate 'download config data', 'read single record' and 'read
block' functions. This code will be shared with future multi-log
reading code for new firmware.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c437b14b7fc7afdfc7b809a04d7fa29d5e742307
Author: Anthony Towns <aj@erisian.com.au>
Date: Fri Jan 7 21:00:10 2011 -0800
altos: Remove redundant initialization of ao_interval variables
These are all initialized in the ao_flight_drogue state transition.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 57de960b8148bf485607898c3d66af6994d76481
Author: Anthony Towns <aj@erisian.com.au>
Date: Fri Jan 7 20:52:33 2011 -0800
altos: Remove unused accel_vel_mach and accel_vel_boost variables
Presumably left-over debugging code.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ca66f86a899c191b6362a334417fc84a79349677
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 7 20:46:29 2011 -0800
altosui: Add configuration of flight log size
This adds to the TeleMetrum configuration UI the ability to set the
maximum flight log size.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 52ac83fedbfd380d14d4df2e79992bbdfba3552a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 7 20:26:39 2011 -0800
altos: Check for full log and complain
Reports special tone along with the continuity checks.
Reports flight 0 in telemetry.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 00891b40754962ef6530b237ef52017bb58112d5
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 7 20:25:09 2011 -0800
altos: Check requested log max size against available space
Make sure the amount of memory requested for a single log isn't more
than is available on the device.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bbddcae2a15b6d430e84956ddf26955aa9173cc0
Author: Anthony Towns <aj@erisian.com.au>
Date: Fri Jan 7 20:18:25 2011 -0800
altos: Optimize Morse code generation
This reduces the size of data and code needed to report the
flight states
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 73620c41017c1774d6190dfd4be5b742eb64f8d3
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 7 20:13:28 2011 -0800
altos: ensure erase mark is written when erasing flights
It was getting called only when *failing* to erase a flight (oops),
secondly, it wasn't getting written because ao_storage_flush wasn't
getting called.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit edd22ee49adf60c35f2fe6ba97c111b7ad4131c2
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 7 17:56:06 2011 -0800
altos: report flight log offsets in hex block numbers instead of bytes
makes them compatible with the 'e' command.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1cc08af4f4a1ff61fc0deca3bdd95e8a5ca8ec5c
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 7 17:55:54 2011 -0800
altos: white space fix
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d8c9684239b67a69a4a3d24202a6df0d73c4f7f5
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 7 17:54:54 2011 -0800
altos: Speed up at45 and 25lc erase speeds
No need to read the block to be erased before erasing it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2722703bd848b07a02d3ce0c83a502eca52a9f1d
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 7 14:58:39 2011 -0800
altos: support storage of multiple flights.
This adds the logging support for dealing with multiple flights
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a9b210bc33cd95e7108ab51925fdf0d5e8deaf7e
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 7 10:05:11 2011 -0800
altos: Add configuration parameter for maximum flight log size
This parameter will permit available storage to be split into multiple
separate flight logs.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3bcf14f12f6681888c3162d0f33ef2d454eb75dd
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Jan 7 00:52:50 2011 -0700
update changelogs for Debian build
commit 408a3e04362d626778640dd0ce7d356d3863de53
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 6 23:38:13 2011 -0800
altos: Mark end of available flight list with 'done' to make the UI
code easier to write
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e991f52276248fa08d96fbecc458bc478e98d299
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 6 23:35:31 2011 -0800
altos: Rip out 'optimization' in ao_log_scan
Remove premature optimization to avoid re-scanning the flight logs for
the best empty entry.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 569a1dac55b70c30f01afa7bcb74442ecdd85d85
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 6 22:37:38 2011 -0800
altos: Move common storage code to ao_storage.c. Add M25P80 driver
This reworks the storage API so that you erase blocks and then store
data to them so that the M25P80 driver will work.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e4ba9bf4291bf17c777c8c3ef7c71e4a30b9947a
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 6 17:34:58 2011 -0800
altos: Require manual flight erasing.
This supports flash chips that require larger erase blocks.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ddcc94da4326f9ce954bd31a46b36165c58e6c18
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 6 12:51:39 2011 -0800
altos: Simplify storage API
This removes the config-specific APIs and exposes global variables for
the available storage space, block size and config storage location.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f3f1b1488bdc92fa9277dc549ba9f3210a8d4c8c
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 6 11:28:35 2011 -0800
altos: packet and usb i/o routines use 'char', not 'uint8_t'
Just fixing the type of a local variable holding a character
passed from the packet link to usb.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5688af4e4d7ca8e559d758257e79b7979f1cc924
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 22 21:13:56 2010 -0800
altos: Add telemetrum-v1.1 directory
This just clones the v1.0 build; changes will be added on top of this.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9f7296b3feab872bf51fc369ade69cc1e7cf7a3f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 22 21:06:22 2010 -0800
altos: Split out SPI driver.
For TM with the companion connector, the SPI bus will be shared among
multiple devices. Split out the existing SPI code into a common
driver, with the SPI bus protected by a mutex.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 51c410c1c952e0e9bcf1b2c438813de63753be5f
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 28 00:24:54 2010 -0800
windows: Update NSIS installer file to use compatibility IDs
This allows the file to contain a single InitDriverSetup function,
making things shorter and (I hope) clearer.
commit 4a42f9d5c20dcaf5fd7591ccf9e32c6130d9d538
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 28 00:22:14 2010 -0800
windows: Add compatibility IDs to telemetrum.inf
This will allow the .nsi file to reference just the compatibility ID
instead of needing to have all of the USB IDs listed.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 484b44e81b655f1ecb48256095382a56d2839bae
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 26 17:39:40 2010 -0800
altos: eliminate ao_wake_task
Waking up a task waiting on some random object is a bad idea. Fix
the waiters to look for suitable signalling.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 07213dc34fa20470a4b36a327a83d75b0f010ebb
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 26 16:14:15 2010 -0800
altos: clean up radio abort paths. Share radio code.
Instead of aborting the DMA and radio operation and expecting that to
be handled reasonably by the radio receiving task, rewrite things so
that the abort function just wakes the receiving task while that
terminates the DMA and cleans up the radio.
This eliminates all kinds of nasty bugs dealing with radio abort
smashing the radio registers at the wrong time, or interrupting a
radio transmission.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b62580855c5144f5bc7e0172289bce08814d9472
Author: Anthony Towns <aj@erisian.com.au>
Date: Tue Dec 14 03:40:18 2010 +1000
altosui: move maps to subdir, fix E/W mismatch
commit b8d2eb5509096fd5bd04598b1312077659109620
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Dec 1 00:15:17 2010 -0700
update changelogs for Debian build
commit ea95c060f8bd959cefc60dd6d411151f3c91384e
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Dec 1 00:12:05 2010 -0700
fix symlink paths in rules file
commit f95220b6f0cc74928e0e7d7c7e1f443eafc32a02
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Dec 1 00:03:23 2010 -0700
update changelogs for Debian build
commit ea7130e953622884afc348265f5a4c58f9876823
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Dec 1 00:00:58 2010 -0700
modify Debian package build to deliver one copy of background.png for
the themes and symlink it into place for gdm and slim
commit 3696b30a8d1eb351353d84b5f7af8eeff55c468b
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Nov 29 21:47:13 2010 -0700
update changelogs for Debian build
commit 11b3f9ff715017a2dec02003275885334f22c009
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Nov 29 21:46:02 2010 -0700
releasing 0.8.1
commit 5f3f11e11dff9b9f4d1dde279c0d474de0de12a5
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 29 20:41:49 2010 -0800
Add minimal release testing plan to Releasing
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f0a4deee23984a8f779917bbeaf74a66a0abf592
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 29 20:34:27 2010 -0800
Move "Releasing" to top level
This file documents the AltOS release process for all systems.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b727156ef0a7fb6e442ca28be27eb344a213ecf8
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 29 20:17:35 2010 -0800
windows: Add jfreechart.jar and jcommon.jar to windows install image
These are necessary for the Graph Data button to do anything useful.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3e2220a180f95971d222a597d2057ca328c27356
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Nov 29 21:29:14 2010 -0700
adding Bdale's release process document to the source tree
commit 61a924099800494b589cbbb87c65b552ccbd8394
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Nov 29 14:40:27 2010 -0700
fix an Altos vs Altus typo in the docs
commit e840b6594b8a939f148fa7231e1b06a280d94074
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Nov 28 22:42:43 2010 -0700
fix section layering
commit f39698bbc12afdfadfac56c90030e16db93cf4fc
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Nov 28 19:46:03 2010 -0700
fix publish target in doc/Makefile
commit 13cea7a96821165a10a8b2433af1da7508882b0a
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Nov 28 18:48:31 2010 -0700
moved doc dir in web content to AltOS tree
commit 6f3c72462af86a7d9dec20f4c813a524a5be9fbb
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Nov 28 18:32:17 2010 -0700
update changelogs for Debian build
commit a375942979dbcd8239d8c0addb10616e6048f6ea
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Nov 28 18:31:26 2010 -0700
rewind changelog to recover from stupid build failure
commit 263cf6c4fc5c1a240d719bb0ceb33393864fb3d6
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Nov 28 18:24:00 2010 -0700
update changelogs for Debian build
commit 2615289265b6f8fa08827be794b4eee569fc6333
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Nov 28 18:23:17 2010 -0700
update changelogs for Debian build
commit 5e23bcc2d2ad33a839fedd2158213098a05cd9ae
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Nov 28 18:21:31 2010 -0700
declaring 0.8 released
commit b09d3e11c32abd07f8e11b483ac4b57148f4f2d8
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 27 23:08:41 2010 -0800
windows: Bump .inf file version
commit 42c2394ccc1a1ee6dc134ed963a4f79acf031d0b
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 27 23:04:50 2010 -0800
windows: more .inf file hacking
Add a LayoutFile reference
Add the FakeModemCopyFileSection
Copy AltosMetrum.Install section to AltusMetrum.Install.NT section. I
don't know what this might do; existing files seem inconsistent.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 26369a92398f4ebe3fcd54ce34cebffae0cfdf07
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 27 22:39:31 2010 -0800
windows: remove some non-existent .inf file section references
The mfglt and VerboseResultCodes sections are not present in the .inf
file, so remove refernces to them.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 641c5373724d34c3adfcf42420a528d6bba736b9
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 27 22:35:18 2010 -0800
windows: try harder to get windows install to work
Add devIDs to .nsi file. Fix install section name mapping from the
hot-plug info.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cd414e2c04ce5ecbc75f19325a6d6f82cd489fb3
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 27 16:30:29 2010 -0800
altosui: Correct windows hardware IDs for nsis installer file
Need real hardware IDs (encoded USB ids) to get windows to
auto-install the driver?
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f834b22905db87557f729f942607dc363b013694
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Nov 25 22:31:33 2010 -0700
update changelogs for Debian build
commit da3b39d6b1b5ba48686c2a4add4b5448fd5711af
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Nov 25 22:29:01 2010 -0700
changed main document name from telemetrum-doc to altusmetrum
commit ab6c9c983a2830bc8807e1b75d2576141b73632d
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Nov 25 19:30:02 2010 -0700
update fat target in Makefiles to reflect move of altosui and libaltos
commit b8f05cdc0e9b4a96852eed9d38ff6d5950e2d2ed
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 25 17:29:28 2010 -0800
altosui: Clean up flash code to ensure swing gets called from right thread
This moves all of the flash code to a separate thread and passes
messages back to the swing thread to keep the UI up to date.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit adbb14c63d85b7a54223f88ac623571456f4a462
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 25 16:28:04 2010 -0800
altosui: Remove gratuitous threading from device flashing UI
There's no need for a thread here, and swing doesn't want us to use
one anyways.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7f88520089660845009148b69bfcea6c9dff9672
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 25 16:23:18 2010 -0800
altosui: Flight data download GUI operations called only from main thread
Swing doesn't like UI functions being called from non-dispatch thread,
so fix up the eeprom download code to use SwingUtilities.invokeLater
to make sure this works right.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6d3612e267cd4c1e7fdd74fc33952b3f26f870f5
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 25 16:09:37 2010 -0800
altosui: Eliminate unnecessary thread from config UI
There's no reason to use a thread to run a dialog box, and
swing doesn't like threads anyways.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 12fb7f0e70cd244475d84469f93283112478d1e1
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 25 15:56:42 2010 -0800
altosui: Only call swing display functions from main thread.
Swing insists that all display functions be called from a single
thread, and the flight window wasn't following this for display
updates. Use SwingUtilities.invokeLater to make sure the flight UI
updates happen in the right context.
Fixes a UI freeze on Mac OS.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b74cec6cd0bc043f53e9e28472765aa343136813
Author: Bob Finch <w9ya@qrparci.net>
Date: Thu Nov 25 13:30:48 2010 -0700
Updated AltOS PKGBUILD to track makefile changes
commit f88bde21d76a4ff91099a5051153ebace1619978
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 25 11:16:55 2010 -0800
altosui: Hack up standalone makefile to maybe build altosui again
This isn't tested, but at least the paths are more likely to be correct
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3d98440d53378aaa6da87ed65e9abb2f96f7ee49
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 25 11:16:28 2010 -0800
altosui: Make windows bits build after moving altosui directory
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4893ed50bc14772986ac02f9b39928f1882da923
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 24 23:54:08 2010 -0800
Revert "altos: Don't abort radio transmissions with ao_radio_abort"
This reverts commit 54468e5dc567aaac5c5c20e921859b7cec28bb88.
With this patch in place, TD could not be placed in 'packet' mode.
commit cb08bc264c71ca972027392b42f347a03df76a43
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 24 22:55:08 2010 -0800
doc: Rename telemetrum-doc as altusmetrum
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 554bdd25e132dbaec322bc11f94093d2c2e78751
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 24 22:49:33 2010 -0800
doc: Add more authors, fix URL formatting, note that AltosUI actually exists
Add aj and bfinch as authors. Insert an acknowledgements section. Fill
in the Fire Igniter section in the AltosUI chapter. Then change the
section talking about the future plans for Java to mention that they
actually exist now.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bcf78b67717374b5971820021b83061e2e9734cf
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 24 21:39:18 2010 -0800
doc: Reformat altos to use sections for each function
This places them in the TOC, making them easier to find.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 51c7741040d95c5deece939dae5e4136cc04afc4
Merge: d1dbe3b 4e47c44
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 24 21:00:52 2010 -0800
Merge branch 'buttonbox'
Conflicts:
doc/telemetrum-doc.xsl
Pull the buttbox version of the docs in as it had been updated.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4e47c44d335276cf0dc5ed3a0756e50c98c1b9b9
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Nov 24 21:44:53 2010 -0700
manually fold in documentation work from the master branch
commit 8a68c1da253c0b29a7cb9c7540c20585ad6e3dec
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Nov 24 21:21:53 2010 -0700
tweak rev history
commit 7cd1c7765d137df711caeeb69abaaba1b36e0a65
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Nov 24 20:53:36 2010 -0700
fix missing section close in Site Map content
commit db2b19b8f0d452d682d53c7ed0ff6e359b46efa0
Merge: b372f3c 915f881
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 24 18:57:35 2010 -0800
Merge remote branch 'aj/buttonbox' into buttonbox
commit b372f3c0ee4ec49aabe61c169cb1eb9bb4fb2cfc
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 24 18:50:46 2010 -0800
Missing change to top level Makefile to build altosui
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 915f881d61294dc6f5a6a3e8d75567e18492a631
Author: Anthony Towns <aj@erisian.com.au>
Date: Thu Nov 25 09:52:30 2010 +1000
doc: Document altosui "Site Map" tab
commit f01096c4b42f9a4720ed0414826c2a283a992545
Merge: 357826a 3fbefb3
Author: Anthony Towns <aj@erisian.com.au>
Date: Thu Nov 25 09:10:50 2010 +1000
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
commit 3fbefb3eea981d34a09496cf8abf0119de2e35bf
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 24 14:57:57 2010 -0800
Move altosui to the top level, placing libaltos inside it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 357826aa9c7b42c59f5d52b8eb016d73b6da0c7f
Author: Anthony Towns <aj@erisian.com.au>
Date: Thu Nov 25 09:07:34 2010 +1000
docs: Document altosui "Graph Data" button
commit 7811e6dfa6caf10251da7df7c24b98cdc3787892
Merge: 71b1949 7a50837
Author: Anthony Towns <aj@erisian.com.au>
Date: Thu Nov 25 08:47:36 2010 +1000
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
commit 7a50837ea0d92db3f469f197ec8210aee22aa143
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 24 10:55:18 2010 -0800
altosui: Make sure packet mode is turned off when the connection fails
When the packet connection times out, turn packet mode off when
closing the serial port.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7d90e2f6009e060fb59c519f7e564483a7ca6872
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 23 20:17:44 2010 -0800
altosui: Let people fire igniters that don't read as 'ready'
This provides for igniter testing with LEDs or other materials that
don't look like regular igniters.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f3233985a132e1d660e6df12d0056b6729f16faf
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 23 19:09:31 2010 -0800
altosui: Disable radio configation over packet link.
Attempting to configure the radio over the packet link will only end
up confusing the user, so disable it. This also works around a bug in
older TM code which would lock up when trying to do this.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6cd9be22f06f21d12ee2f668989d83d3c61d14c0
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 23 19:08:07 2010 -0800
altosui: New AltosSerial.set_radio function sets channel/call
Use this anytime you need to set the device radio channel and call
sign, either for telemetry reception or packet mode origination. This
uses the saved callsign and per-device radio channel number. Do not
use this when opening a telemetrum as there won't be a saved channel number.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ed7cf7d262fcf7c0c677c2fb981582b571de9e5e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 23 19:04:55 2010 -0800
altosui: Make AltosSerial.flush_input keep reading while non-empty
Flushing the input buffer can take a while, especially over the packet
link. Keep reading while stuff is appearing on the reply queue.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3b9db8c82d26a6a2e43d4ca40742fc1bdc502380
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 23 19:02:54 2010 -0800
altos: Make radio test command careful with the radio mutex.
Remember whether the radio test mode is on or off and don't try to do
either of them twice to prevent the mutex from being acquired or
released twice.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 54468e5dc567aaac5c5c20e921859b7cec28bb88
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 23 18:57:49 2010 -0800
altos: Don't abort radio transmissions with ao_radio_abort
We only want to abort pending radio reception to release the radio for
other use, or to change the radio channel. Let radio transmission
proceed. This fixes a problem with using packet mode to configure the
radio channel; if the packet transmission is aborted, the TM ends up
wedged.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d873dc28f0752aeb58a6263e42bdd5b9095bd392
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 23 18:56:46 2010 -0800
altos: remove unused variable from ao_igniter
The 'status' variable used to hold a reported status value from the
igniter after firing, but we ignore that now.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 71b1949e50f4533bcf44537da65b19bc67863c8e
Merge: a79225c f1892b1
Author: Anthony Towns <aj@erisian.com.au>
Date: Wed Nov 24 12:14:11 2010 +1000
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
commit f1892b137b1de3d6caf0293bd40ed5c3e4948066
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Nov 23 18:58:11 2010 -0700
lose the placeholder on how GPS works, as it's going to be a
while before I tackle that, if ever.
commit a79225c215f17fa5218ddd9db4fc3f5c563a9f74
Merge: 84cd5d4 853b711
Author: Anthony Towns <aj@erisian.com.au>
Date: Wed Nov 24 11:55:14 2010 +1000
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
commit 853b7112e34212040c4cb7289f9cfdb2f3ea9f90
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Nov 23 18:53:18 2010 -0700
merge Keith's AltosUI documention into "the big book"
commit 84cd5d42d8b5659463544fe2a400758b56478609
Author: Anthony Towns <aj@erisian.com.au>
Date: Wed Nov 24 02:13:32 2010 +1000
altosui: sitemap uses rocket gps if no pad gps
commit c7119c21baa9d4ca681975b8613ade6593f65577
Author: Anthony Towns <aj@erisian.com.au>
Date: Wed Nov 24 02:11:36 2010 +1000
altosui: don't switch away from user selected tab
commit ae55a107f12546dc65f04618c7abc17beb920d73
Merge: d1005f6 737f2fd
Author: Anthony Towns <aj@erisian.com.au>
Date: Wed Nov 24 01:53:46 2010 +1000
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
commit 737f2fdd012202f453120ece117ae5e859b32082
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 22 22:26:19 2010 -0800
doc: Add internal documentation for AltOS
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5523e7d55ecc8d310e495fa4f5115f7483c42d65
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Nov 22 21:07:10 2010 -0700
add a rudimentary --help for command line use
commit d1005f68376d695039c314b8d7a68bbf9acbca4f
Merge: 9a83e0d 22c0978
Author: Anthony Towns <aj@erisian.com.au>
Date: Tue Nov 23 10:14:55 2010 +1000
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
commit 22c09781af1df4b38562b577e9926c23e4a397f2
Merge: b27327a a79606a
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 22 16:02:22 2010 -0800
Merge remote branch 'origin/buttonbox' into buttonbox
commit b27327a05d249eaf969b67d2a8d12fc6a93841f0
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 22 15:56:04 2010 -0800
altos: assume igniter worked.
Many igniters don't go open when fired, so there's no way
to know if they worked. Assume they did as a failed igniter is
unlikely to do anything when fired again anyways.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 68323cbb222f1f33198a42abaa0550af22f75a93
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 22 15:53:27 2010 -0800
altosui: Close serial port when debug link fails
If the debug connection isn't working, close down the serial port when
reporting the failure.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9a83e0dc79f7a7467c7814d58daa2a2b89e50972
Merge: 902735f a79606a
Author: Anthony Towns <aj@erisian.com.au>
Date: Tue Nov 23 08:07:04 2010 +1000
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
commit a79606a6507fc01a74910f7959e84c4e9a730714
Author: Bob Finch <w9ya@qrparci.net>
Date: Mon Nov 22 12:24:42 2010 -0700
Added PKGBUILDs for deps into contribs
commit 377ee7e90ecd028f984cd1abce96b2efc3b5b977
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 21 14:03:17 2010 -0800
altos: Add on/off modes to 'C' command
This lets the user turn the radio on/off and then invoke other commands.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 902735ffbfdd97672d52b09f17cdcd619193fd05
Author: Anthony Towns <aj@erisian.com.au>
Date: Mon Nov 22 05:29:26 2010 +1000
altosui: keep sitemap more centred on rocket
commit b85df38b5611e45cb9296df07b720badf74ac26e
Author: Anthony Towns <aj@erisian.com.au>
Date: Mon Nov 22 05:22:17 2010 +1000
altosui: improve sitemap scrolling behaviour
commit 4a9ded5b39ed08e13abc2cddba8b712f62b983f2
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 21 17:39:50 2010 +1000
AltosSiteMap: ensure buffer around active tile
commit ec47bc93a487614714a752cb30ec9fe3d8f72929
Merge: 0393830 e7954c8
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 21 16:08:37 2010 +1000
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
commit e7954c820763f80e993f9f822e837725cf36af84
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 20 22:03:26 2010 -0800
altosui: When fixing eeprom gps time information, make GPS data valid
Eeprom files may be missing the GPS time (due to a firmware bug). Working
around this involves finding the next valid GPS time and using that to
create a fake GPS time entry. However, that next GPS time may not
be locked or may have few sats as it is from the boost stage of the
flight. Fix this by simply forcing the fake time packet to have
4 sats and be locked.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0393830f85da5efc96bbdf0d9769b66019c34b33
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 21 15:13:35 2010 +1000
AltosSiteMap: limit nr of tiles to 200x200
commit a08b2a6363c194195db92029743f6612676373ce
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 21 15:03:21 2010 +1000
AltosSiteMap: never accept 0,0 as lat/long
commit 84e570d8a8a52e0d358582135ec1b3a12be94c26
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 21 14:45:10 2010 +1000
AltosSiteMap: refactor tile collection
commit 71e487344395a8efc9cd279aad92f601ff4c6d3d
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 21 14:05:00 2010 +1000
AltosSiteMap: thread safe tile addition
commit c040bcd06679484175542208fb564d0271a7fc1b
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 21 13:19:36 2010 +1000
AltosSiteMap: try to get new tile construction right
commit c3994dd82d489289ebc99ff9c5fa88f560c023ac
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 21 13:07:11 2010 +1000
AltosSiteMap: extend map if rocket goes far away
commit 835b903727a2eabda8d9659cc46e53301f92897c
Merge: 440a0f3 8789135
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 21 11:15:02 2010 +1000
Merge branch 'sitemap' into buttonbox
Conflicts:
ao-tools/altosui/AltosSiteMap.java
commit 878913551a1e4e3c8f2b39fa4aeb234880735a1c
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 21 10:55:22 2010 +1000
AltosSiteMap: explain tile size better
commit 440a0f3f5130eb0c8e614691892be8c94e7fd3c3
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 20 16:55:12 2010 -0800
altosui: Set site map flight path lines to 6 pixels anti-aliased.
Much more visible over the map.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2a7dc3ba36bac81640a9498e0d0caf1470b57c19
Merge: e5b1ada ece2c86
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 21 10:45:15 2010 +1000
Merge branch 'buttonbox' into sitemap
Conflicts:
ao-tools/altosui/AltosFlightUI.java
commit 8df185cd95cfecbed8272dd1275d077c5b45535b
Merge: ece2c86 1e71264
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 20 16:35:48 2010 -0800
Merge remote branch 'aj/sitemap' into buttonbox
Conflicts:
ao-tools/altosui/AltosFlightUI.java
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e5b1adae9b23b98a6321986f5cd67c9d3166b87f
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 21 10:34:39 2010 +1000
AltosSiteMap: better gps check, lower zoom
commit ece2c86e2641b2cd613791293526c492b1606aa1
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 20 16:19:42 2010 -0800
altosui: Rewrite info table to mix with scroll pane well. Fix startup size
Using a single table for the info table means that the scroll pane
automatically picks up the table headers and shows them above the
scrollable view.
This patch also fixes the application size at startup so that no
scrollbar is required in the info table, and the window is < 800x600.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1e712647dd6df1e77650db705f3ac32a3c8f6907
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 21 08:58:44 2010 +1000
altosui: reindent
commit a59a204e188e40ec8848a0dc63d6de710cee3039
Merge: 8263630 37f0201
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 21 08:56:13 2010 +1000
Merge branch 'buttonbox' into sitemap
commit 82636305021c41d676f5f0f11378724fe0de0079
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 21 08:44:13 2010 +1000
AltosSiteMap: be more polite about preferred size
commit 37f0201d724693528f37ac7d275f68f90cf94da0
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 20 14:31:23 2010 -0800
altosui: change descent tab formatting to four columns
This places labels to the left of each field. For igniter voltages,
it uses three columns for the labels.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 66ebd954d9c9a44a8db0ee713c682e39306fabd8
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 21 08:28:24 2010 +1000
Add GrabNDrag.java
commit 72f5e05f9f0055f2cef8b840812f090556c94338
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 21 08:18:39 2010 +1000
AltosSiteMap: major refactoring
commit b47517d4c2e49f6f7b9954d2c85f96397fe1103e
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 20 14:06:37 2010 -0800
altosui: re-indent
commit 6f8bc2ad20b715343e0510563ab0f14787ef3e07
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 21 01:34:52 2010 +1000
AltosDescent: switch elev from height to range
commit 89f44c5587ea4f927d5e398b6af919df0d6561c3
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 21 01:27:01 2010 +1000
AltosAscent/Descent: tidy up layout
commit 51e403145d28ac913e36d205077a613845596be2
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 21 00:17:51 2010 +1000
AltosSiteMapTile: draw boost circle as well as landed
commit 25ffe1cc7823895886b4777f310b4bda1c80133b
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 21 00:07:16 2010 +1000
AltosSiteMap: automatic fetching of map data
commit 20f714bbe3137de8fb7491b39985021fd1774930
Author: Anthony Towns <aj@erisian.com.au>
Date: Sat Nov 20 22:49:51 2010 +1000
AltosSiteMapTile: seperate map and drawing layers
commit 58f8d069ce9488e2987b8e92caa69fe68cda7569
Author: Anthony Towns <aj@erisian.com.au>
Date: Sat Nov 20 21:06:37 2010 +1000
AltosSiteMap: add autoscroll and grabndrag scroll
commit 74cab8503b51ba6fb05a4d12a031c749e870b0ef
Merge: 0ecf033 9a99cab
Author: Anthony Towns <aj@erisian.com.au>
Date: Sat Nov 20 18:20:45 2010 +1000
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
commit 0ecf033110084f1a8be98282d7029dc14f70dab5
Merge: 081fbd5 71c41ea
Author: Anthony Towns <aj@erisian.com.au>
Date: Sat Nov 20 18:14:30 2010 +1000
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
commit 9a99cabc1c34c657fc95246192ba6d330f5f22d3
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 20 00:13:58 2010 -0800
altosui: Fix channel changing in flight UI to actually work
Replacing the menu with a combo box required reworking the way events
are delivered from that widget back to the channel changing
function. Just delete the old magic and use the JComboBox action
listener directly.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 71c41eadd12c3ece5fffce7669e4991778046d4e
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 20 00:09:03 2010 -0800
altosui: Initialize display thread state in constructor instead of run
Some state will get set before run is called, initializing it there
can be too late.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 081fbd5715f9d3d81d98e149fb95d40447c07a79
Merge: 90b9bc4 7920ed5
Author: Anthony Towns <aj@erisian.com.au>
Date: Sat Nov 20 17:40:49 2010 +1000
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
Conflicts:
ao-tools/altosui/AltosFlightUI.java
commit 7920ed5c34b088f45ce4213b061ddd1ffe22cee8
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 19 23:18:51 2010 -0800
altosui: calling thread.interrupt with null thread doesn't work well
This was a left-over from debugging the previous patch.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8c8dc3794c7b5fa5a5b43b1c461d6c8bb3ab425d
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 19 23:09:15 2010 -0800
altosui: When switching log files, don't terminate log thread
The log thread automatically switches output files when the incoming
telemetry changes. Don't use 'close' for that as 'close' terminates
the log thread as well as closing the file. Create a new
'close_log_file' function which just closes the file.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 594e80572821f1848db062d0cff18ca8bf0d90ce
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 19 22:44:48 2010 -0800
altosui: switch channel selector to combo box. Shorten displayed device names
A combo box displays the current value, which is quite nice to
have. Add a 'toShortString' for AltosDevice so that the window frames
and error messages don't have extra spaces generated by the
altos_device toString method.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fa07afc73bc5eccff8464a2def05ad600da33c97
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Nov 19 23:33:42 2010 -0700
update turnon scripts to use stashed copies of stable release firmware
commit 9ffc2eb53a47e435f39b02896b0e43ae5f47f450
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 19 18:25:48 2010 -0800
altosui: Use timeouts to recover from broken packet links.
This puts timeouts every place the system reads from the packet link
and aborts the in-progress operation if it takes more than a second to
get a response.
Also mixed in here are persistent igniter status displays for the
ejection testing UI.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 68078eab3c07d8dc83302747cf6f3dcb1797c6ce
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 19 20:44:29 2010 +0800
doc: Document the 'Flash Image' operation.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b4bdda65488e8ef27d2889cb6cc8eda3c5d50e0a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 19 20:29:14 2010 +0800
doc: git ignore generated doc files
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f0542085de2139ef562af068ec05fa73f47c73b1
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 19 20:26:49 2010 +0800
doc: Add preliminary altosui documentation
Also, update the Makefile to allow for further documents to be added
without a lot of custom rules.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0e7a10f71803d60f8b34c5a91efd220449442769
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 19 17:16:03 2010 +0800
altosui: Clean up global AltosUI configuration settings dialog
This dialog had a mish-mash of styles and was confusing.
Now it's got a label for each line, and suitable setters for
each element
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8f72f08839346fb225238420324f0edcd070e531
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 19 17:14:17 2010 +0800
altosui: Unify datafile selection to AltosDataChooser
Instead of having several separate intefaces, use a single dialog for
selecting data files for graph/export/replay.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 24ffcf86c43290ce0f70fb4ee0984b3debdb8a5f
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 19 15:41:30 2010 +0800
altosui: Add igniter ground testing code
Not yet hooked up, but the UI is finished.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 90b9bc4475011bead7117ed72fa5efa0f77b2813
Author: Anthony Towns <aj@erisian.com.au>
Date: Fri Nov 19 13:30:00 2010 +1000
AltosSiteMapTile: adjust scale to 1 nmi per tile
commit fa45336062523838ba8abb08427cdc4d9c7de7a8
Author: Anthony Towns <aj@erisian.com.au>
Date: Fri Nov 19 13:17:29 2010 +1000
AltosSiteMapTile: adjust centering calculation
commit fda93afcd8aa4133b0e5f008b824d072e338d0ed
Author: Anthony Towns <aj@erisian.com.au>
Date: Fri Nov 19 13:02:05 2010 +1000
AltosSiteMapTile: autoscale to about 2 nmi per tile
commit 483346a03c94b200692f5e6d59f3feee4dcf2ace
Author: Anthony Towns <aj@erisian.com.au>
Date: Fri Nov 19 12:09:46 2010 +1000
altosui: tile site maps
commit 939be6793238a275b7682ecc376fed14379cf044
Merge: e68fe94 1a4b6e9
Author: Anthony Towns <aj@erisian.com.au>
Date: Thu Nov 18 05:54:06 2010 +1000
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
Conflicts:
ao-tools/altosui/AltosFlightUI.java
commit 1a4b6e96f823035b113f01d1bdfd61afc1f33e25
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 16 22:46:29 2010 +0800
altosui: Add igniter status to ascent and descent tabs
Monitor igniters during all phases of the flight.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d0eb41619544ead6d9dab3a8d024a12936c9cdd0
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 16 22:20:00 2010 +0800
altosui: Cleanup flight UI layout
Use common constants for fonts and insets
Shrink fonts so that the window is < 600 pixels tall.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fcca333cda64be35f0c9fb0109eef1be3709dddd
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 16 21:49:59 2010 +0800
altosui: Add callsign configuration in AltosUI configuration dialog
This callsign is used during packet communication.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d1dbe3b69e6f95ef8ecd4cf959863b922ab47c66
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Nov 15 11:08:00 2010 -0700
add a paragraph about forcing TM back to idle mode if an accel cal goes badly
commit 39e371561469d8e5059638ffa4e7075f391de268
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 15 23:14:51 2010 +0800
altosui: add reboot button to telemetrum configuration UI
This lets you reconfigure and reboot telemetrum, including over the
radio link.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 257e97137325f5dbbd6aa034f20fd6937b67df90
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 15 22:38:35 2010 +0800
altosui: eliminate menu bar, moving elements to buttons.
This adds a new 'configure AltosUI' dialog to set the log directory
and voice preferences.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 524644d8d8ce3f8a5a914ecfc7e2a8d474d89095
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 15 22:04:44 2010 +0800
altosui: oops, missed a file in the previous commit
AltosSerialInUseException.java just defines a new exception, thanks to
java for making this live in a separate file.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 511903704f7e1b22e88dd3e3cc35fd3c0583820e
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 14 03:26:57 2010 -0800
altosui: With --replay option, exit when replay window is closed
Otherwise, the application hangs around forever.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 11c95f687b1f68d35fa1a0af2c4e7982b8bb226a
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 13 17:09:51 2010 -0800
altosui: Replace flight status table with labels, fix resize.
There's no reason to use a table for the flight status data,
replace that with a selection of widgets instead.
Also, set all of the grid bag constraints for the various flight
status displays so that resize does something sensible.
Adds a scrollbar to the table display so that it can shrink.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dcfa56498d1b65a213b8aba9cbd6c4806532383c
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 13 16:07:04 2010 -0800
altosui: Open serial device at 'new' time. Prohibit duplicate opens.
With the per-serial UI, there's never a reason to create a serial
device without opening it right away. This eliminates the bug caused
by not opening the serial device for telemetry reception.
Serial devices can now be opened only once; this eliminates errors
when trying to reflash or configure devices while receiving telemetry.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8463ffcaca6bcd31e645aba71c171f548dce96d8
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 13 15:19:14 2010 -0800
altosui: Eliminate unncessary import altosui lines
Java appears to automatically import every module from the current
package.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 566c6486c8815ae241e0b116a93b1a0ff4783831
Author: Bdale Garbee <bdale@gag.com>
Date: Sat Nov 13 12:19:12 2010 -0700
continuing to work on the docs
commit e68fe9454352087889c560d95797922493117acb
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 14 00:59:01 2010 +1000
AltosSiteMap: add targeting circles around landing site
commit 1e7e02987276847274493312202d22222c953149
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 14 00:57:45 2010 +1000
AltosTelemetryReader: actually open serial port
commit 9c32b93ef5fb43558fb0179ea1b047e35b7ed6e8
Merge: 991541f a6f30fa
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Nov 14 00:29:11 2010 +1000
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
commit a6f30fae906bd87dff192c5fd4d10df283f99930
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 12 17:02:22 2010 -0800
altosui: Add RF calibration to TeleMetrum config dialog
I think that's the last user-settable value.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1bdc6166f3bc5ce3f8e55acb1484923781412e21
Merge: f111871 5c6a533
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Nov 12 17:32:43 2010 -0700
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit f1118717780a81f9257d2eed7828b66538deb8a8
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Nov 12 17:32:21 2010 -0700
fold in content from Keith's email on the re-flashing subject
commit 7def9dd0d0a4ce9cf7c65de573100e664f278717
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Nov 12 10:58:54 2010 -0700
first cut at instructions on how to re-flash TM and TD devices based on email
reply to a user who asked
commit 991541f57f065f429c6ec425efd6ac731280b2c1
Author: Anthony Towns <aj@erisian.com.au>
Date: Fri Nov 12 23:42:42 2010 +1000
better error behaviour if no map
commit 1bcfa22de7821984149db10cb79913efed36b41e
Author: Anthony Towns <aj@erisian.com.au>
Date: Fri Nov 12 23:29:40 2010 +1000
pull up maps for arbitrary locations
commit beb6c881ec006241c7d2820c64e5381131d41180
Author: Anthony Towns <aj@erisian.com.au>
Date: Fri Nov 12 03:24:26 2010 +1000
make infotable scrollable, revert its fontsize to 14
commit 0327c1da01a3f6ede01f05c1d775651a57fd0c68
Author: Anthony Towns <aj@erisian.com.au>
Date: Fri Nov 12 02:08:58 2010 +1000
tabs -> spaces
commit 81e7b43ecad666e2e2310c7c94184f888bc86585
Author: Anthony Towns <aj@erisian.com.au>
Date: Fri Nov 12 02:07:41 2010 +1000
add site map tab, at least for QRS launches
commit 5394548fa5c7bdbfcc01e8aa19e93e1cf6345e2a
Merge: 891e629 75f7698
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 10 22:11:21 2010 -0800
Merge remote branch 'aj/buttonbox' into buttonbox
commit 75f7698b99a661ed17a91748a99699fa6761772a
Author: Anthony Towns <aj@erisian.com.au>
Date: Thu Nov 11 16:06:32 2010 +1000
add compass bearing during descent
commit cc0a730de093c49be2a921101d27622b6f592e92
Author: Anthony Towns <aj@erisian.com.au>
Date: Thu Nov 11 15:57:52 2010 +1000
add compass bearing to voice output
commit 317ec72a34906faad88c6924e634617b074e71db
Author: Anthony Towns <aj@erisian.com.au>
Date: Thu Nov 11 15:52:01 2010 +1000
use grayled.png for off
commit 8503943e3613f8670b128012b12ff14fb54321d7
Author: Anthony Towns <aj@erisian.com.au>
Date: Thu Nov 11 15:45:43 2010 +1000
reduce font size for FlightInfoTable
commit 3ffaa5d1c00b28be20fd4a26deb7bd41d953e92a
Author: Anthony Towns <aj@erisian.com.au>
Date: Thu Nov 11 15:43:05 2010 +1000
read preferences for --replay
commit 1f3e091efdfb2fe6f06a066cac60f5d267b94856
Author: Anthony Towns <aj@erisian.com.au>
Date: Thu Nov 11 15:40:37 2010 +1000
add --replay command line argument
commit b16b873723ee3e5097e6725c59ce191119439ad7
Author: Anthony Towns <aj@erisian.com.au>
Date: Thu Nov 11 15:38:27 2010 +1000
use value_font for values
commit 891e629f6ba20654b614f3ca7211a0f1c92670cb
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 10 16:28:19 2010 -0800
altos: Use grey leds when unlit - easier to see
commit 5c6a5335a057be0219450b4b9889c647d8d4a012
Author: Bob Finch <w9ya@qrparci.net>
Date: Mon Nov 1 14:36:41 2010 -0600
Updated PKGBUILD-git.altos
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b0d31910da592e2f67c47c8fc3e15ce8135d5094
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 9 23:34:32 2010 -0800
altosui: Add ascent, descent and landed tabs
This completes the set of tabs for in-flight status information.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 22d00785188a880700cd372528189a7a15278da9
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 9 14:40:58 2010 -0800
altosui: Add tab UI with 'pad' mode.
This creates a multi-tab interface for flight monitoring
and includes a special tab for 'pad' mode.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit eb77e806ded99532dc7eaa39c1893f075b028af6
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 9 10:21:34 2010 -0800
altosui: Create abstract interface for flight data display
This allows the implementation of the flight data display to occur in
the flight UI instead of the display thread.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a0a92c605e238277c9881545a7226e53b5dbc295
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 8 22:17:26 2010 -0800
altosui: Fix more calls to AltosPreferences.channel()
Oops. Two more.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 94f4a50d6430cc8280cbdaa9f39d3cb858d0e077
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 8 22:10:46 2010 -0800
altosui: Fix channel setting at serial open time
Was using the previous non-device-specific preferences API.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6b17d276271faa8a420a1c8f6be17faaa0c7043c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 8 22:07:04 2010 -0800
altosui: Create buttons for main actions
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 16916be51d746b1e1057b3219e5bec8f8814259e
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 5 23:44:47 2010 -0700
altosui: Split out flight monitoring to separate window
This creates a per-TD (or replay) window to contain the flight
monitoring information, allowing multiple monitors.
This also adds per-TD preferences for monitoring channel.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ca931b1c484bd6b64617370e81b16e169fdae1c2
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Oct 6 17:47:44 2010 -0600
update changelogs for Debian build
commit 811ced628d586134224c1b501b40ce9eb435fc7c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 6 16:42:27 2010 -0700
altosui: Separate out jfreechart and jcommon directories
This allows these packages to be referenced separately
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c2c4d515ef9cc2cae8a8f2803e9498bb0794c4ed
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 6 16:25:49 2010 -0700
altosui: Remove ability to graph data in .csv files
There's no reason to support these files when the raw .eeprom or
.telem files which generate them should be used instead.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d5caf6f2f4d9257e26aa4305b26c02d1b263fa24
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Oct 6 17:14:35 2010 -0600
remove the csv build dep, as that code will be abandoned
commit 43e23a60780191e3c6f61df44c5dd08cc8604c51
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Oct 6 16:27:57 2010 -0600
update changelogs for Debian build
commit 8103432bf7adfe6ee5bf3ee42e1672475e6edd5a
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Oct 6 16:26:33 2010 -0600
update changelogs for Debian build
commit 635066cd35fb24cacf8400a477ea4b4e3dd2c39c
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Oct 6 16:26:19 2010 -0600
update changelogs for Debian build
commit 4396aaaf34cda3751dcca0eceb05b4ffeb411cde
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Oct 6 16:25:22 2010 -0600
add build-dep on libcsv-java
commit 7475ab5804bf3fb12b1b755e850af90d5a15d3eb
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Oct 6 16:19:35 2010 -0600
update changelogs for Debian build
commit d8a2f4ceb1c70a6be976a78e2264c961de2f2277
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Oct 6 16:18:45 2010 -0600
add build dep on jfreechart lib
commit f0d1468ceae065f0cdae6f6ae3323dec5636f073
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 28 17:56:49 2010 -0700
altosui: Add KML file export.
Command line has switches now, --kml and --csv
Export save dialog has combo box to select kml or csv result.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5a119fd92532d53e552efe1f7c61e87181fcace0
Merge: 28da340 82744c3
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 27 22:28:07 2010 -0700
Merge remote branch 'aj/master'
commit 82744c3497d37650b88dee80be7956c4bd1cffb2
Author: Anthony Towns <aj@erisian.com.au>
Date: Tue Sep 28 15:27:07 2010 +1000
Add callsign/serial/flight to graph title
commit 28da3406426437604125d332e4cda90d459df487
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 27 22:26:56 2010 -0700
altosui: use Altos constants in graphing code
The Altos class nicely defines constants for all of the flight states.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ce7f59fbfb5a94a67a4ceced3cc371b4c6b6e5d1
Author: Anthony Towns <aj@erisian.com.au>
Date: Tue Sep 28 14:45:01 2010 +1000
Hax0r graphing to support telem/eeprom files
commit e2b9f47a205348d38756c70e928a2a9183de6884
Merge: 7ef3ad0 8032031
Author: Anthony Towns <aj@erisian.com.au>
Date: Tue Sep 28 12:55:47 2010 +1000
Merge branch 'master' of git://git.gag.com/fw/altos
commit 803203197e51e71e9c77b3610047fd5bf9a56c56
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 27 18:52:30 2010 -0700
altosui: Deal with eeprom dates going backwards across wrap
eeprom timestamps can go backwards as the GPS time stamps are
recorded when the first GPS character is received, but not placed into
the eeprom log until the last GPS packet is complete. If this happens
at the same time the tick count is wrapping, then the tick count will
wrap backwards across the 0 boundary causing time to jump forwards.
Fix this by letting time go backwards across the tick boundary, which
requires that we know when the first 'real' tick is read from the
eeprom file.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fe7eba2e4af36cf29d8dc2378ac6985be04f68c6
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 27 18:51:05 2010 -0700
altosui: .CSV output: add link quality, gps hdop and sat C/N0 numbers
This makes the CSV files contain all of the available information.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c89a34d1eb25155405b0036baeadc7bbfeade1c2
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 27 17:11:48 2010 -0700
altosui: Create iterables for log file scanning. Split out display threads
Convert from log file reading paradigm to using iterators which is
more idiomatic for java. Split more code out of AltosUI.java,
including the display update threads for telemetry monitoring and
logfile replay.x
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7ef3ad0c9354c0484c25badc69334b59c7f355e2
Merge: eb74866 e66919a
Author: Anthony Towns <aj@erisian.com.au>
Date: Fri Sep 24 10:28:06 2010 +1000
Merge branch 'master' of git://git.gag.com/fw/altos
commit e66919aa46193bd8c7a1e86fb32a3367dae121f5
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 23 16:52:51 2010 -0700
altosui: Require 4 sats for 'good' GPS data
Wait for 10 consecutive GPS reports with at least 4 sats before
reporting "GPS ready" state.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 34ca8c00f4be72c314baff4c96f1e2f010948454
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 20 06:30:49 2010 -0700
altosui: remove unused ReplayThread wrapper classes
These aren't used now that the replay opener dialog knows how to build
a reader from a filename.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fd010661ced6075f82a961625826665a3d8d1efe
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 30 14:00:04 2010 -0700
altosui: Factor some UI elements into separate classes
Clean up AltosUI by moving the two main tables to separate class files.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit eb74866e919e8c661153847871f5a79e66d37296
Merge: af404b4 1260589
Author: Anthony Towns <aj@erisian.com.au>
Date: Mon Sep 20 22:05:26 2010 +1000
Merge branch 'master' of git://git.gag.com/fw/altos
commit 1260589976c1a95848b298497fd251c4ee7d3f93
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 19 02:52:29 2010 -0700
altosui: Write raw sensor data to .csv files
For data export, provide the raw sensor samples instead of the
filtered values.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7a4d7110debb88f4e906fee7c46f2badd561809d
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 19 02:50:43 2010 -0700
altosui: Use recorded ground acceleration when reading eeprom files
The flight software records 1000 accelerometer samples and records
that in the flight log. Use that value instead of using the very few
samples recorded in the eeprom before boost is detected. This
generates far more accurate accerometer data in the .csv files.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit af404b428bd742039afc25ff3850f76bc92c7c29
Author: Anthony Towns <aj@erisian.com.au>
Date: Wed Sep 15 07:24:04 2010 +1000
Add JFreeChart to Makefile.am
commit 61590b8729831cb138b2ba6b88802c208d114753
Author: Anthony Towns <aj@erisian.com.au>
Date: Wed Sep 15 06:51:05 2010 +1000
Add graphing.
commit 3d64f5a6511529ca53699190f4d54de1ba62a9bd
Merge: ec6da08 b9623f8
Author: Anthony Towns <aj@erisian.com.au>
Date: Sat Sep 11 15:15:14 2010 +1000
Merge branch 'master' of git://git.gag.com/fw/altos
commit b9623f8ef26491e9fa14e2478295fe6f5cbbd87f
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 10 21:07:14 2010 -0700
altosui: Remember directory containing firmware files
Instead of forcing the user to navigate to the firmware directory each
time, this remembers the previous directory and starts there.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7f2204e0832b14b1edca4266a2cbc272141ecc2b
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 10 20:55:05 2010 -0700
altosui: set default .csv file name in file save dialog
This uses setSelectedFile to specify which output filename to make the
default in the save dialog.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7e053ae1f2d09347123ac9fa79e46645378b4c70
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Sep 10 10:42:35 2010 -0600
make the column headers comma separated, too, so they align with the data
commit ec6da0824474e46de842845d7b53fe1a1dde33ed
Merge: 7c2e411 1031067
Author: Anthony Towns <aj@erisian.com.au>
Date: Fri Sep 10 16:11:34 2010 +1000
Merge branch 'master' of git://git.gag.com/fw/altos
commit 10310672a83a66dc630718b151d653fc066f8e59
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Sep 10 00:09:25 2010 -0600
update changelogs for Debian build
commit 9d0e89e8ad8926dc8371fa809835a580ae49711d
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 9 23:04:59 2010 -0700
altosui: Stop parsing eeprom file after hitting 'landed' state
Sometimes there are additional records found in the eeprom file; the
reader is mostly worried about not losing anything, so it reads as
much as it can. However, the last record written for any flight is the
'landed' record, so we can stop looking at the file after hitting that.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 67b6952f7126704478ede5575e5e938d18fcc329
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 9 23:04:14 2010 -0700
altosui: Fill in time value of last Eeprom record read from file
The last record is handled separately, and was missing the code to
compute the time. Sigh.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8b0b584cd0ca7542e65aac0c7897ad7ab4115122
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 9 22:55:47 2010 -0700
altosui: Remove debug printfs from AltosTelemetryReader
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a80bfae15f1499c49f7ef47978bf0337d8120892
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Sep 9 23:57:34 2010 -0600
rewind packaging changelog, again
commit 78ce3120e5a53858ca0d43c734aa5d28b4948ce3
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Sep 9 23:52:20 2010 -0600
update changelogs for Debian build
commit 71c85613a28c24c3aad7b4aa3299d8677ef1268e
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Sep 9 23:51:23 2010 -0600
rewind packaging changelog
commit 7c2e4114a3a43f919a7a6c967d3f16e5d630f90f
Merge: ddc83b4 af200f5
Author: Anthony Towns <aj@erisian.com.au>
Date: Fri Sep 10 15:50:01 2010 +1000
Merge branch 'master' of git://git.gag.com/fw/altos
commit af200f5b84555de0556b52146379f3934774a3f3
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 9 22:30:48 2010 -0700
altosui: Fix telemetry file reader to handle tick count wrapping
The telemetry reader was ignoring tick count wrapping, so you'd see
time go backwards in jumps. Not useful.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 96ca7051f60ea299e3e05bafbe5717fc83c3afd2
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Sep 9 22:50:03 2010 -0600
update changelogs for Debian build
commit 2d5e48c5dc0e822fdf430f43804c1e5e79fdbf84
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 9 21:28:10 2010 -0700
Add --with-fat-dir configure option to publish finished stand-alone bits
--with-fat-dir specifies a directory to copy the finished
linux/macosx/windows stand-alone ("fat") packages to. A sub-directory
will be created under the specified directory based on the product
version number and the files copied there.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dd2b77b2a516a055f29191dcdfeb727e637aae86
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 9 20:59:29 2010 -0700
altosui: libaltos.so is built with libtool -- it's in ../libaltos/.libs
It used to be in ../libaltos
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 72a5c1258db92d0ddd660bfa875e8e55cab47af7
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 9 20:39:41 2010 -0700
altosui: Remove some debug printfs.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 031fd9a954f2e3447d0150eb4ecc81af7b620dca
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 9 20:36:12 2010 -0700
Add firmware and libaltos to 'fat' target at top-level
This ensures that all of the necessary bits are available to construct
the distribution images.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fcaa480b1dfeb2fd4044f9c4e1b6d50c46fc9984
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Sep 9 21:29:20 2010 -0600
update changelogs for Debian build
commit 48f57997452e17564e28fe3e37403f6f63d32dea
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 9 20:24:42 2010 -0700
altosui: conflating USB product and vendor IDs is a bad idea
We've now got a USB vendor ID called 'altusmetrum' for generic
altusmetrum devices (old USB ID 0x000A) while the general vendor name
for all devices is 'altusmetrum' as well.
This patch splits vendors and products into separate name spaces,
products are prefixed with product_ and vendor with (oddly) vendor_.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 632d276118ab04de67561104be650f8fb69a0450
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Sep 9 20:34:43 2010 -0600
update changelogs for Debian build
commit 1ac3d7e3ba52d1b0dc834eaa5d7886c730eaf307
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Sep 9 20:34:22 2010 -0600
initial cut at an altosui man page
commit 5c4e437975054d33604402591e1ea2f314932593
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Sep 9 20:06:09 2010 -0600
update changelogs for Debian build
commit 0ea75761416bff299233991e961ba25b6c7dcf89
Merge: 35d70c9 8ee3464
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Sep 9 20:05:27 2010 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 8ee3464d8064ebe1694c7b20177878c0d9961451
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 9 17:54:41 2010 -0700
altosui: Display error dialog when AltOS JNI library can't be loaded
Having an error dialog appear at application startup seems better than
simply failing to present the device dialog later on.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4224a7526e51eb8fbf1f0a31bae7ee68c6385095
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 9 17:52:46 2010 -0700
altosui: Store libaltos.so in $(libdir)/altos
It's not a public library, so hide it away in a subdirectory.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1e4c18777d982061f5e507a4d4f4f1cd4d685268
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 9 17:49:37 2010 -0700
altosui: Need to have JVM include path substituted into libaltos Makefile
The libaltos Makefile needs to find the relevant jni.h file, which is
found in the JVM_INCLUDE path, all nicely located by the configure.ac script.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 35d70c92307dd478bc619b2f6c5a88e155cdad28
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Sep 9 17:27:07 2010 -0600
handle versioning of ihx files (poorly) by just wildcarding the file name,
which assumes there's only one matching .. probably ok on Debian?
commit c286ada6457579d64e9d8ca44b927258b4a561da
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Sep 9 16:27:40 2010 -0600
update changelogs for Debian build
commit 6c0ae7e966a81ece35bccbe89d626a58afe899a2
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 9 15:25:18 2010 -0700
altosui: remove FATJAR from all-local to avoid building fat .jar file
the fat .jar file is used in non-native builds to run from a directory
containing all of the freetts jar files along with the altosui jar
file. We don't want this on a real install where freetts is installed separately.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 737a64c57a8f979f51c3fa6b3f214520c736cf8a
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 9 15:22:14 2010 -0700
altosui: hack to make JAVAROOT directory get created before javac runs
This ensures that the JAVAROOT directory gets created by adding it to
the variable used to set the CLASSPATH environment value.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b456bd9d7bcd9d968e43c38eeb6fa6ad8c58f895
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 9 15:11:41 2010 -0700
altosui: fix telemetrum.inf FFFE:000A product names on AMD64 and ia64
This appears to matter to Vista. Dunno why.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 16980b848651a6b20a0b458446f0a19fb517539d
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 9 15:10:25 2010 -0700
altosui: Add explicit requirement to create classes directory
The implicit ordering doesn't appear reliable.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 15da683c2f747baef49c8b8d321a86faede0de30
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Sep 9 15:51:50 2010 -0600
update changelogs for Debian build
commit 012e7176954a6b74b3b667317be0f6dc41d7ab70
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Sep 9 15:51:02 2010 -0600
add libtool to build deps
commit 3e5824b9a71971ce99bfe38a1e860b421e265f02
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Sep 9 15:43:47 2010 -0600
update changelogs for Debian build
commit ddc83b4c401be965a9947782becf20cc8c54e6a2
Merge: afea6c2 3d49d5f
Author: Anthony Towns <aj@erisian.com.au>
Date: Sun Sep 5 20:49:34 2010 +1000
Merge branch 'master' of git://git.gag.com/fw/altos
commit 3d49d5f69b41c27003dbc5ccf1899014bd13bd99
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 5 02:05:06 2010 -0700
altosui: ensure that 'altosui' script is installed. Pass arguments along.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b61fec225ada6a9e252e4c7920101ee18c77cbdc
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 5 01:55:56 2010 -0700
altosui: eeprom files place 'boost' time in the flight number record.
Instead of looking for the first state change record, use the Flight
record to get the boost tick.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6c653a4cba5fef8d49261cf1c024f3e86e9058c6
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 5 01:52:36 2010 -0700
altosui: Record flight number when scanning file, not when running
The very first record in the eeprom is the flight number, but it is
time-stamped with the 'boost' time, and so it gets sorted until much
later, delaying the return of data until the rocket enters boost
mode. This drops all of the nice pad GPS and state date on the floor.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 38e1d87c8d449866faac026577fefa9a118428cb
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 5 01:23:53 2010 -0700
altosui: Use local .class files in the classpath
This ensures that compiling only a few changed files will
locate the old .class files instead of using a stale .jar file.
commit 9941b05a1d03dafd6cd899b5fe999ed769efb1d6
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 5 01:21:14 2010 -0700
altosui: Prevent voice altitude data from queueing up
When flight status changes rapidly, the queue of voice data can get
quite long. This change does two things -- first, it remembers when
the altitude reporting happens due to flight events and delays the
periodic reporting until a suitable time after that, second it ensures
that the voice data has all been delivered before generating a new
altitude report.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4dec5c36702d76dc95beada7c1d3222a638a2cbb
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 5 01:19:11 2010 -0700
altosui: Add AltosVoice.drain() to wait for queued speech to finish
drain() blocks until all pending phrases have been processed, allowing
the UI code to avoid pending data that will end up stale by the time
it is emitted.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 410ba89eef9c9817eef81b702966cb88820ff7c4
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 5 01:13:01 2010 -0700
altosui: Start idle thread after the rocket leaves the pad
This makes the first altitude report time consistently 10 seconds
after launch, instead of some random time depending on when the rocket
launched relative to the time the device connection was made.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6205547ec7191aab0259a8449520e966a96129e6
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 5 01:08:50 2010 -0700
altosui: When replay thread is interrupted, don't make final report
Normally, the replay process makes one final report after the file has
been parsed. However, if the reading process is interrupted to display
something else, this report is just annoying, so don't make it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3d99584fcfe43b22e8581874e0ac77ce3d635d48
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 5 01:03:18 2010 -0700
altosui: Add elevation and range data to main display
Reported by voice, it's useful to see these on the display as well.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2d58f319a7c1a6a8ccc6a539722009996ba886ab
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 5 01:01:10 2010 -0700
altosui: Eeprom files contain only one date; save it.
While reading eeprom files, the GPS record is reconstructed each time
the system sees the first GPS log item (the time field), but as the
date isn't repeated, we need to copy it from the old GPS data record.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b2aa689bf3d61e4a3ebe7c828162d1be20aad0f6
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 5 00:59:54 2010 -0700
altosui: Remove debugging printf from AltosEepromReader
These were in place while validing the GPS data reconstruction code
that handles eeprom files missing the first GPS date line due to the
record overwriting bug in old firmware versions.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit eb0e7a59f0806734a4c959a3ce7c57f71cbe3986
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 5 00:57:38 2010 -0700
altosui: Return AO_LOG_INVALID instead of exception for eeprom files
When an eeprom file contains an invalid line, just return
AO_LOG_INVALID instead of throwing an exception. This allows us to
replay and parse files with extraneous serial communication.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c3a17c71a45207dd715d537704f161de9219f0d7
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 4 18:49:22 2010 -0700
altosui: Fix linux fat distribution
Again, use 'cp -p' instead of 'cp -a' to get files into the archive
instead of links. Also, make the shell script 'altosui' instead of
'altosui-fat'.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 828e9e4c68e3ac90b6ba2e9fd5f131a9975f7e4a
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 4 18:39:58 2010 -0700
altosui: Fix up Mac OSX .zip file
Must contain 'altosui.jar' instead of altosui-fat.jar.
Also, was using 'cp -a' instead of 'cp -p' which made files
represented by symlinks not end up in the archive.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 044fd27449c70474f51b99dec25fd23d3c03a559
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 4 18:20:45 2010 -0700
altosui: Fix windows installer to ship correct files
Was shipping altosui.jar instead of altosui-fat.jar
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 148b927c3b8bc7b7b5c5356392032faf2b1203d3
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 4 18:04:04 2010 -0700
Add top-level 'fat' target to aid building distribution files
Signed-off-by: Keith Packard <keithp@keithp.com>
commit aed59e1c057c13e28fd368dc2592aa4628211097
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 4 17:59:11 2010 -0700
Add version numbers to released files. Set version to 0.7.1
Instead of using git revision counts for version numbers, use explicit
versions numbers configured in the configure.ac file. Expose published
files with version numbers.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2808bba3efa1cff133cc060dabff06fab8b75388
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 4 17:58:52 2010 -0700
Ignore libtool files.
commit bc183400ab93d5902c52851319999cc77f27bc81
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 4 17:35:17 2010 -0700
altos: add some SDCDB config files
commit 887b11f6b9c81b9f15348d54017e700ca7dc5e55
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 4 17:27:17 2010 -0700
Use autotools for altosui and libaltos
This switches from hand-written Makefiles to automake with libtool
for these parts of the system.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e844e8a0695e27af6f8e3e37a5e3bcc865b862e3
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 4 01:13:42 2010 -0700
altosui: Add icons to application and Windows menus.
Use the altus-metrum icon for an application icon and a windows start
menu/desktop icon.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e9ea28504c646fc25791aab09b9e5faf73e0ac0c
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 4 01:08:34 2010 -0700
icon: add some icons for application programs
altus-metrum.ico: Windows ICO file
altus-metrum-16x16.jpg: 16x16 jpg image for java
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f550677df016070430ed38bfa2b2be33f1b8c40a
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 4 00:16:41 2010 -0700
altosui: oops. renamed the nsis file to altos-windows.nsi
And forgot to change the dependency in the Makefile
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c0988ddbf104ea729090c2e7e2a28cc6dc9e90f6
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 4 00:14:15 2010 -0700
altosui: ignore built files
commit ecb4a09535b6a8da0765010489a96e605dbdeb46
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 4 00:13:11 2010 -0700
altosui: Add windows installer build using 'nsis'
nsis happens to be packaged in debian, and it appears to build usable
installers, which is all very cool.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bf22923cd8b4f6f954718358b411b5b10d8e7b4d
Author: Bdale Garbee <bdale@gag.com>
Date: Sat Sep 4 00:46:29 2010 -0400
update changelogs for Debian build
commit 59798c6fd11502a9c8b66090c23ba50eb250692e
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 3 12:43:45 2010 -0700
altosui: Catch I/O errors on telemetry device, report to user
This catches the USB device being unplugged and makes sure the
user sees an error dialog in this case.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 16d8d6a8853d09f683b13f9cda3c3174a0aab130
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 3 12:31:05 2010 -0700
altosui: Must flush serial line after configuring for telemetry
Without flushing the configuration commands to the serial device, it
never sees them as the telemetry input thread doesn't flush.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d4f64e95e31e2335470efc15df2ab357b7d197f3
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 3 11:48:55 2010 -0700
Revert "altosui: Deal with altos bug setting radio channel while monitoring"
This reverts commit ba65e4aeb952a1cf49a77f1e24e235508fcea71f.
Testing the old code
commit 71191ecef3ba0e00d0f8a7cd1a24982bfa44ec72
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 3 01:30:33 2010 -0700
altosui: Allow 'connect to device' when already connected
Opening another serial device involves shutting down the display
thread (to reset its state) and spawning another one. Shutting down
the display thread normally closes the serial device as a part of the
process, and if this isn't done before the new serial device is
opened, then the new serial device ends up getting closed too.
Interrupting the display thread and waiting for it to stop before
opening the new serial device solves the problem.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ba65e4aeb952a1cf49a77f1e24e235508fcea71f
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 3 01:21:57 2010 -0700
altosui: Deal with altos bug setting radio channel while monitoring
If the monitoring thread is active, then setting the radio channel can
sometimes cause the monitoring thread to get stuck. I'm not entirely
sure why though. For now, work around the issue by making sure
monitoring is off, and the monitoring thread has stopped, before
changing the radio channel.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e5ef42c2b22c6639d90631dbbb588f9fd2494385
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 3 01:12:24 2010 -0700
altosui: Report telemetry CRC errors in UI
Telemetry CRC errors can signal problems with TeleMetrum or TeleDongle
units, so report them in the UI.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3b3aa448f3a0f44137f7530b04b58967ba5f22f5
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 2 21:11:29 2010 -0700
altosui: build Mac OS .zip file to include paths
Without the paths, the OS X zip file doesn't create a usable
application structure.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cff0d1ef6b338b3d5ad9450d4d5f95df934cb5e4
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 1 22:56:34 2010 -0700
altosui: Post error dialog on invalid ROM config values.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8d8980f56a4f2c7d6f2ce667130706e0f04f8ded
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 1 22:56:12 2010 -0700
altosui: Remove some debug printfs from AltosRomconfig class
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5ee6cd41ed189c3166f76558ecada80917f40652
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 1 22:47:15 2010 -0700
altosui: Hide internal rom config UI helper function
This was getting mis-used by the flash UI causing the rom dialog
'cancel' button to work just like 'ok'.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9a690c9795e8257d2a3225f905117681668a472f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 1 22:46:04 2010 -0700
altosui: allow flashing to be canceled from the rom config dialog
Was using the rom config class wrong, causing cancel actions to work
just like 'ok' actions. Oops.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2f07ad14a16dbf1b75c71784ceae303825c90ade
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 1 22:43:22 2010 -0700
altosui: Abort flashing if debug port isn't working
Check each command going over the debug port and make sure it works as
expected. This commit adds checks for initializing the clock,
selecting the desired program counter and running the flash
program.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cf30343aadd5039627a85319872685f743e64b16
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Sep 2 00:55:41 2010 -0400
update changelogs for Debian build
commit 59a40f6d5a2159b9009a3fa0737bb679efd5b32c
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Sep 2 00:55:01 2010 -0400
another distclean fix
commit 59ff9180f11063c257746b895a167179b3a4ff7c
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Sep 2 00:53:16 2010 -0400
and a few more distclean fixes
commit 3aafd70257b70b7c11ba9c55749157979bc61ea2
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Sep 2 00:52:04 2010 -0400
more makefile distclean target work
commit d5a6ad87c7a9ac03b2e694bed0a54b6cc4322a6f
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Sep 2 00:50:16 2010 -0400
update changelogs for Debian build
commit 14fa24ed93b3b1cec08a170004c6fb7f4d74f7e5
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Sep 2 00:48:31 2010 -0400
update changelogs for Debian build
commit 83552dfa0d38db9cdf3efc89e64e6c7896467856
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Sep 2 00:47:54 2010 -0400
add distclean targets to libaltos and altosui to all Debian package to build
commit 6f24d2a476759104a10b26b54faff2b18b0e208b
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Sep 2 00:46:21 2010 -0400
update changelogs for Debian build
commit d079bfe86ed40ff450ece445cf5f5e3970e44cec
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Sep 2 00:44:30 2010 -0400
update changelogs for Debian build
commit a470315e5d822a69ef5304512cf73c604c88e481
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 1 20:14:51 2010 -0700
altosui: Remove Manifest.txt from git repo as it's built now
This file is built with appropriate contents for each different .jar file.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1177e0a684328422be5adc68093d0091a218a824
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 1 19:53:24 2010 -0700
altos: Bounds check Skytraq GPS tracking data array
Missing GPS serial data could cause the tracking array reset to
get skipped, causing the array to be overrun, smashing critical data
beyond the array.
This was detected using the 'altosui' flash command to program a
device from TM. Hitting the USB that hard caused TM to crash with a
mutex error (3 beeps) after the ao_gps_task structure was overwritten
with zeros.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 775acb89660cdee2f3c54c38297baefe39f2414c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 30 22:24:09 2010 -0700
altosui: missed AltosReader.class in the Makefile
This caused clean builds to fail to make this file
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bd2b9d958c2b7f846031b076ed51c4fbaaf2d68f
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Aug 31 00:20:06 2010 -0400
update changelogs for Debian build
commit d006c5e1255433181aca4c8e6a277b2d1bc0841b
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Aug 31 00:19:37 2010 -0400
add runtime dependencies for altos binary package
commit c1c7d731e3774883fa0bb5538be225a59334d124
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 30 19:52:51 2010 -0600
update changelogs for Debian build
commit c35632efb1919764e4b8581ed6fcf2bedd4bd517
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 30 19:37:50 2010 -0600
update changelogs for Debian build
commit 2a004d17a13b4ff52d892bfdecff8ad3d0823f7c
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 30 19:37:17 2010 -0600
don't build all the "fat" jar deliverables by default
commit 507e429db6638f82c32449e9c5ca06b46da30134
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 30 19:09:00 2010 -0600
update changelogs for Debian build
commit 25764fcd1b65c3a5a817afdb5901ac30e8a5f0c0
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 30 19:08:29 2010 -0600
update changelogs for Debian build
commit 4790f78aead8a816e5b247c022b2998ce3a94053
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 30 18:48:50 2010 -0600
add a .gitattributes file, configuring the Mac and Windows binary library
files with the export-ignore attribute, in hopes that this will prevent
them showing up in source packages
commit 81318e5b7179b0311ab099043ecb04a25d763750
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 30 18:15:40 2010 -0600
make invocation of 'install' pathless to work on more Unix variants
commit cbc72399a0f4d7429df0189bcdae683dd491cb9e
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 30 17:56:56 2010 -0600
continue even if rm's don't have anything to do
commit a9a8d23c877e6f6c76857b7c85e3d43b4da1db27
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 30 05:49:11 2010 -0700
altosui: Devices with USB id 0x000a always get listed
List 'unknown' AltusMetrum devices anytime the UI needs a device
name.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a94900b8862b99b4e317ea0ee3edd2a560f270c7
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 30 05:48:23 2010 -0700
altosui: build debian-style altosui too
This adds the dependencies to make sure altosui and altosui.jar get built.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 38ac388baf8125c0644b868a7aaf8eba1bdf990d
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 30 05:28:37 2010 -0700
altosui: Build linux, mac and windows archives on Linux
This adds 'fat' archives for each target OS.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 35d9a8214252dbe79aeb69ae47d2e5c58a654702
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 30 05:27:45 2010 -0700
libaltos: Use overlapped I/O on windows
Otherwise, reads block writes and vice-versa. Crazy stuff.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c7ba92317ac55272acbde12416448ebd17b983a6
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 30 04:52:00 2010 -0700
altos: Windows sends USB Out packets of 0 length. Ack them.
This was an untested case as no other operating system sents 0-length
out packets (they're not necessary). The correct response is to ACK
them by clearing the OUTPKT_RDY bit so that another packet can be sent.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 20a472cfe3369200150ea4ff067ceb28968dbcac
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 30 02:58:23 2010 -0700
libaltos: Add pre-built Windows .dll
This lets us create the windows distribution on Linux.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0300fe581c949232bc52b05fe9c1f6032cad6b60
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 30 02:56:25 2010 -0700
libaltos: Add pre-built Mac OS X libaltos.dylib
This allows the mac bits to be built on Linux.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5d48c494325524bbeed10e0dc7300ed44e7e208e
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 30 02:53:26 2010 -0700
Update telemetrum.inf to include all current USB ids.
Windows 7 has 'encouraged' us to split out each product into a
separate USB ID. telemetrum.inf now has all of them listed.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit df34bbe7d1c43b12ab6d610fe810b6e1683e4c21
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 30 02:49:49 2010 -0700
libaltos: Improve Makefile
Builds Windows .dll correctly now and sample app.
Moves linux install target to end so it is not default
Adds .NOTPARALLEL to disable parallel gnumake.
Removes -g debugging flags to shrink file size.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dd5374b8e660012ae4f8b058454fd101e0749ca7
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 30 02:00:30 2010 -0700
libaltos: Fix windows build.
Need stdlib.h to get calloc/free defined, remove debug printfs, fix
serial timeouts.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 63c832394a829f41b8f77d075786530536360349
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 29 23:22:27 2010 -0700
altos: shut down packet mode cleanly
Instead of constantly bashing the packet master thread, let it shut
itself down in an orderly fashion. It will shut down fairly quickly as
all of the activities in that thread are bounded. Otherwise, the
master packet thread might leave mutexes locked and all sorts of other
horrors.
Tested on Linux and Mac OS X and shown to be reliable.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 43619c13f749b79c096d1e8fdab3d5cfb5fd85f1
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 29 22:42:23 2010 -0700
altos: Abort radio harder when terminating packet mode.
Make sure the master radio tasks don't get stuck waiting for an
incoming packet again by aborting the radio each time we poke the
tasks.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c4a8569f61eddf690d00337543462235ecbfbe54
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 29 22:41:18 2010 -0700
altos: flush pending output when terminating packet mode
Just in case the last command sent hasn't been transmitted, hang
around for up to a second waiting for the data to get across the link.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1acd3c7ec167b1b18e4ea493e5978c938a91cc89
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 29 21:45:19 2010 -0700
libaltos: cjnitest needs altos_flush now
commit 6527357d1f0e94faf9e7dacac10a39875131be7c
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 29 21:43:46 2010 -0700
libaltos: Missing OS_LDFLAGS on cjnitest build
commit b7fa1ea3338f63b8edcf8aacccb5e519ca0b213f
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 29 21:41:40 2010 -0700
libaltos: Mac OS X cannot use 'poll(2)' on serial lines.
Who ships this stuff, anyway? Instead of blocking, we'll poll every 100ms now,
otherwise, we won't be able to abort the read when the device is closed. Yay!
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e60c59123232915e808cee23ef89eb1a38ced34b
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 29 21:40:21 2010 -0700
altosui: discard invalid lines while reading Eeprom flight data
This shouldn't happen, but it's easy enough to get back in sync by just
skipping lines with weird contents.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ae02b1590439d5c8dfb472cf1f83a14fdcfbaf11
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 29 21:36:47 2010 -0700
altosui: provide separate flush_input/flush_output for serial. deal with monitor automatically
(yes, this should be two patches, but the diffs in AltosSerial were merged together).
First, this replaces the existing flush/flush_reply mess with two simple functions,
one to flush output to the serial device, making sure that all data written will be seen
while we wait for input. The other sucks any pending input off of the serial line and
discards it.
Second, AltosSerial now tracks whether the serial line is being used for telemetry
monitoring. If so, it enables monitoring, otherwise it disables it. Eliminates a
bunch of manual state tracking elsewhere.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit edcfb1bdf64772d3b83405ccf99385b8fea5d8e4
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 29 17:33:59 2010 -0700
libaltos: AltusMetrum devices use more than one USB ID.
List all usb devices, picking those with AltusMetrum IDs.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 236685807b63860ad033aa0254ce8f6d8d36d4ef
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 27 22:26:09 2010 -0600
update changelogs for Debian build
commit 1cda15fdef2d9d3e54354bd5c43a0bcc7e3240cb
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 27 22:24:51 2010 -0600
fix up for an 0.7 release
commit 4c5c7c7f198775c398c1ad2edafb3488384cc297
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 27 22:13:38 2010 -0600
update changelogs for Debian build
commit 42055af5c6f17d14a2f1c6a2b5e1ce6d3b45a615
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 27 13:13:19 2010 -0600
update changelogs for Debian build
commit 0bd4cc03b3bf23aa32b5ce1921078021d1d8a9c6
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 27 13:12:46 2010 -0600
fix path to installed shared library
commit 99c1d9b4ef10ec4ebbee058ce0bb38c954a0a3a6
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 27 12:41:26 2010 -0600
update changelogs for Debian build
commit cf65c6b8056c4af7c26b52ec6f9fbd3400cef638
Merge: 5f2f6a8 ae5eff7
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 27 12:38:25 2010 -0600
Merge branch 'bdale'
Conflicts:
debian/control
commit ae5eff7bc0b63047737223423009707bedcb00f5
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 27 12:37:36 2010 -0600
Revert "lose the prebuild hook for now while I'm fumbling"
This reverts commit a21b6bb60ac1c07ebd161534a4ea63bfde50dcdf.
commit de2e71c4923a0282df74dbe37d087c34b4ddd279
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 27 12:25:20 2010 -0600
fix man page delivery path
commit a8dbe082960dc9bdd44c6e4b1198423c4e566029
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 27 12:18:28 2010 -0600
install altosui man page
commit 5cc933039e4763b8675611c63b6147b42878a2bb
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 27 12:16:19 2010 -0600
fix permissions on installed jar file, switch from ao-view to altosui in
the desktop file
commit 138009e9fad01f79df4c3820fbc206f78688bdce
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 27 12:06:01 2010 -0600
update Debian standards version
commit c280071b7db4e9a7af31dc5740eb8d27f137950e
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 27 12:04:13 2010 -0600
fix up the wrapper's path to the jar file
commit 5f2f6a8f9ba56be867888758848bc7f152ccbd47
Merge: 63bd34c 9d1b27f
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 27 11:00:31 2010 -0700
Merge remote branch 'origin/master' into new-packet-format
commit 63bd34cd1b5a411489e8c3ab377f0fe0eec11f67
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 27 10:58:55 2010 -0700
altosui: add elevation and range information
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 72a18502e40f55cbba6418dc94315517881cd411
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 27 11:51:24 2010 -0600
add an install target for altosui
commit 72c33a72ee105ec692dad62d6d9c1ad40b89bfe8
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 27 11:45:19 2010 -0600
add install target for libaltos
commit a21b6bb60ac1c07ebd161534a4ea63bfde50dcdf
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 27 11:26:29 2010 -0600
lose the prebuild hook for now while I'm fumbling
commit 9ea94411c9730f7a271366d309ab4827beeeb839
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 27 11:17:54 2010 -0600
add a dummy install target
commit c443f43f8dee6e0fcbcecf9d09e948fd928b7af4
Merge: 2950431 2923cf5
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Aug 27 03:08:53 2010 -0600
Merge branch 'new-packet-format' of ssh://git.gag.com/scm/git/fw/altos into new-package-format
commit 2923cf5057f9cef110dd547d8677ea5b60e00796
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 27 00:10:29 2010 -0700
altos: prepare for sdcc 2.9.1
A few minor language changes -- non-standard keywords are now prefixed
with __, such as 'at', 'interrupt', 'naked'.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 68967157cee620ebedcc8c2ffd6fc7656532087b
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 26 23:55:44 2010 -0700
altosui: command line args are converted to csv format
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7e0506dc2014b7178f52b950e8c1cb820b35f9c6
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 26 23:54:53 2010 -0700
altosui: Remove debug printf from AltosState.java
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 49364608b59de7421ab00d87d2685bc3b5f58411
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 26 23:53:06 2010 -0700
altosui: When parsing saved telem files, errors shouldn't abort file
Make syntax errors in telem files just skip the current line and move
on to the next one instead of abandoning the whole file.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a16db143fc7ca72dc91e7989420049192114642d
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 26 23:50:51 2010 -0700
altosui: Serial line is in UTF-8 encoding. Deal with it.
We read bytes from the serial line and need to convert each line into
a string. So, save the bytes and at EOL, pass the whole mess to the
string constructor with the appropriate encoding info.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0942912163255523d923140c01afbdb5da1c19b5
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 26 23:49:37 2010 -0700
altosui: Add support for old (version < 3) telemetry files
This lets the code read telemetry files from pre-released versions of
the software. Not strictly necessary for production, but useful for
analysing old files.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e383595cd281687de903fb6176564bbef270cb83
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 26 23:47:38 2010 -0700
altosui: AltosEepromReader was mis-setting boost tick
It was supposed to use record.tick instead of the (unset) state.tick
value.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 651f6102ac79459fc8d5679d852c963dcb5bb3fc
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 26 23:44:25 2010 -0700
altosui: add rssi and distance/dir from pad to CSV files
Just adds a couple more fields to the CSV files that might be interesting.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3dc67c1401976d6e9e2e942d5a4707a4810a0404
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 26 23:43:00 2010 -0700
altosui: Add AltosGreatCircle constructors
This adds constructurs from AltosGPS pairs and also one from empty
args (which defines both distance and bearing as 0).
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f0fd423d0bf83bc5c3f9d39e9c09397fbe8caed2
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 26 23:41:26 2010 -0700
altosui: Move number parsing code to Altos general class
This moves these shared functions to the global shared class.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 68b2b66d7574dfd0bd5e3571b8ffad32ca5d2b73
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 26 23:37:29 2010 -0700
altos: mark gps date written only after it gets into eeprom
Data logging doesn't start until boost detect occurs. As the GPS date
is only logged once, if that happens before logging is written to the
flash, then the GPS date will never get saved.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit aa6c27df5db6bdae59d00affccb891854a6caa18
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 26 15:59:09 2010 -0700
altos: print GPS state flags in GPS 'g' command
Having the GPS state information can help with GPS debugging.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 34055129b4008f6a9833887b12dee39ffa408002
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 26 15:57:09 2010 -0700
altos: always rebuild ao_product.c to track git version
The git version is built into ao_product.c and saved in eeprom log
files, providing useful diagnostics about the firmware revision used
for each flight. However, if ao_product.c isn't recompiled, then the
updated version won't be included. Force recompilation of this file
each time make is run to ensure that the final output contains an
updated version number.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 99400fdc0f19ef538fc362dde5c3ab5b7cdac409
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 24 16:43:38 2010 -0700
altosui: flush replies from serial link when entering debug mode
We use replies in debug mode a lot and depend on them matching the
expected parameters. The case which caused trouble was using
TeleMetrum to reprogram TeleDongle -- sending the 'm 0' command (to
disable telemetry monitoring on TeleDongle) to the TeleMetrum caused
it to reply 'Syntax Error' which confused the subsequent flashing
operation. Flushing that reply gets things back in sync.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ba086cc77273efe5397f60dcaccd1e3771441481
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 24 04:02:27 2010 -0700
altosui: write USB serial number string while flashing
USB serial number is encoded in UCS2 as a part of the string
descriptors. Place those right after the other rom config bits so that
altosui can find it. altosui is changed to write the serial number there.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 220f3afdaa432c65f8ad45be7cdbe5c8a3616db3
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 24 04:01:47 2010 -0700
altosui: always display romconfig ui while flashing
commit f62b2aa08ebfd912b3c732397d43ff9f6162ec88
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 24 04:01:14 2010 -0700
altosui: fetch existing romconfig for flashing
commit d93787284c8e514a929edb9f944c98ae0206a33f
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 24 03:59:09 2010 -0700
altosui: Delay mapping Flash UI until flashing actually starts
The flash operation may be abandoned before it even starts; this makes
sure the UI doesn't flash up on the screen.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7d44cbd621d2b113ac2b802ef17e3d8a660ce7f2
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 24 03:58:00 2010 -0700
altosui: disable radio monitoring while using serial line for debugging
commit 7bd220dfd9b3fb0e42eb90c3b37eb7b4169eb21b
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 24 00:29:11 2010 -0700
altosui: Add ability to create CSV file from telem or eeprom files
This creates a comma separated value file to export data for
external programs.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 634a550149e7c344a22a637ba484f115592b1018
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 23 23:15:05 2010 -0700
altosui: refactor logfile chooser dialog to share more code
Move file opening logic into logfile chooser as it can be shared that way.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit afea6c264c5ebf12f1d629bd4bc724da86d11b7a
Merge: 0e17853 9d1b27f
Author: Anthony Towns <aj@erisian.com.au>
Date: Tue Aug 24 00:02:31 2010 -0600
Merge branch 'master' of git://git.gag.com/fw/altos
commit a55b132668a819cc26478a609cb79bd9190deb9d
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 23 23:01:36 2010 -0700
altosui: Separate out log file choosing dialog to share with CSV generator
This dialog will be shared with the CSV file generating code, so split
it out instead of duplicating it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 295043112ccde35092945c286596f9045ee6fa05
Merge: 2007288 ef8376c
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 23 23:11:22 2010 -0600
Merge branch 'new-packet-format' of ssh://git.gag.com/scm/git/fw/altos into new-package-format
commit ef8376c4dd8262a34e02b6bb9e19e907ac2f4330
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 23 22:08:30 2010 -0700
altosui: make default Manifest look for built-in freetts
commit 56b906f535ac2f86bcab71addbbcd376d74f6a73
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 23 22:03:36 2010 -0700
altos: Place rom config variables in fixed location
The device serial number and radio calibration values are stored in
flash, mostly so that TeleDongle gets them saved.
Placing them in well-known locations (starting at 0xa0) makes it
possible to find the previous configuration and to re-write it
easily, without requiring the .map file.
altosui doesn't have the .map file parsing code, so it relies upon
this new technique. As a benefit, it reads the old values from the
device before reprogramming it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4c0c099716197ef7539be0cf55bbb164f6804958
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 23 22:02:21 2010 -0700
altosui: Finish device programming code
Altosui can now reprogram Altusmetrum devices.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bd2b44ddd61fadd8bf8ee6bf783ce019b1be7cc0
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 23 22:01:38 2010 -0700
altosui: Remove debug printf from AltosRomconfig
commit c3f57ffdb6c74de90d982eacd604e658ce9b00a5
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 23 22:01:11 2010 -0700
altosui: flush serial output before waiting for reply
commit 8857ac5e43eac6db8d5594b8864df497a712242b
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 23 22:00:16 2010 -0700
altosui: remove debug printf from AltosHexfile
commit b1758be01397fd49c441f40852f3558fe9343a2d
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 23 21:58:50 2010 -0700
altosui: Add lots more cc1111 debug interface functions
These are sufficient to program the flash.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f9e80f39bc39e5882bfe75f959b6501cb3277cd2
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 23 21:55:49 2010 -0700
libaltos: use pipe to wake up getchar on close. use mutexes
commit 86f7b9314b042f2e512fdf35067817e68532867b
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 23 21:54:47 2010 -0700
altosui: pad TM config dialog values to avoid clipping descenders
commit b8519b8669ff54741dd738ac343fbd2424451247
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 23 21:53:37 2010 -0700
ao-dumplog: Fix --remote and --channel options to actually work
commit ebeb13688a9a5442c838641ede6ba0dc92c9a1a4
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 23 14:32:58 2010 -0700
altosui: Add debug dongle API, split flash UI out
Create an API to talk through the debug port on another AltOS
device. Split the flash UI out from the flash implementation so that a
command line flash utility can be written.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7f8d7978606abe544b1b9b6065c5480ed813b8ec
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 23 11:53:19 2010 -0700
altosui: Add .ihx file reading code and stub out flashing UI
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2007288da8a83e3aa925e11cc196f1c65aab2e5c
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Aug 5 15:00:15 2010 -0400
working on java packaging details
commit 44b26dd550eef789e70082ccaa46d7d430c67bce
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Aug 5 15:15:04 2010 -0400
add freetts as a build dep
commit 0e17853c08f77debef3e8cf82e9cdb6a5079fc9b
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 22 23:06:15 2010 -0700
altosui: Set callsign when fetching eeprom data over the air
The updated firmware places the callsign in each packet to comply with
regulations, this ensures that TeleDongle has the current callsign
configured.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 953bc3438b10b21f3d65d292356c4ab2de23cddd
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 22 23:05:20 2010 -0700
altosui: Add TeleMetrum configuration
This presents a dialog with all of the user-settable options in the
TeleMetrum set for editing. Combo boxes are used for everything except
the callsign.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e1463d8e265dfd42c824d90088cd2a51b4cf8131
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 21 17:57:31 2010 -0700
altosui: Make teledongle callsign configurable
Teledongle uses the callsign in packet mode; this provides a way to
set that.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 09252ec22d58e946494e4ca2cf367bf3bbe1cc50
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 21 17:09:41 2010 -0700
altos: Define USB product ID in per-product Makefile.defs file
This allows Win7 to tell which kind of device is connected purely by
USB id as it doesn't expose the USB product ID string to user space.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 22800dc094797e1e0ad99124198809d0360f7556
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 17 18:22:28 2010 -0700
altosui: Select devices by USB vendor/product ID.
Because Win7 doesn't expose the product name, we're swtiching to using
the USB idProduct/idVendor values. This patch adds support for
selecting devices by those new IDs.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d14c96663a1027164fa30ed89b53f5a9d3fdb82b
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 17 18:19:43 2010 -0700
libaltos: integrate Windows support.
This adds Windows support for discovery and I/O.
The API to the library is mostly unchanged, except that it now exports
product and vendor USB IDs as Win7 doesn't expose the product name
anywhere that we've been able to find, so we'll be updating the
firmware to use unique idProduct values for each product.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9d1b27fa147fc8b765d5be165ebef7ee0f85bd37
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 11 22:11:50 2010 -0400
update changelogs for Debian build
commit b6da90b4627dde1fe88240c38c51559d8f781dd0
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 11 17:15:39 2010 -0400
update changelogs for Debian build
commit 4918f73fd0a0f3f5d52907f95a0ec385e901d447
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 11 08:50:27 2010 -0400
update changelogs for Debian build
commit f63f16a70e4d0535667a6364cafcbff026ee6a8c
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 11 08:36:59 2010 -0400
update changelogs for Debian build
commit 294d9c7db21eaf1e71504dbcca5040371abcce55
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 7 22:30:55 2010 -0400
ao-dumplog: add --channel option (for use with -R option)
Sets the channel when downloading data with the -R option.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f317f1324b69b4241f4bb192e164b33d712d5a43
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 7 00:42:25 2010 -0400
altosui: Start adding code to write csv files from eeprom/telem files
This is a start to code which can write out a csv file full of flight
data from either an eeprom or telem input file. It's not hooked up,
but the restructuring necessary is finished and the output is started.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4738cb2fc639adb1d9237e6c903479f0690dd81a
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 7 00:40:59 2010 -0400
altos: add callsign to packet mode, increase payload to 64 bytes
Untested, but it 'should' work. Need to add callsign setting to packet
mode users.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b7699a5907e64bc7547fcc27e73f4a35bbaabfff
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 6 13:09:21 2010 -0400
altosui: Add comments to Eeprom reader
commit 0e917f3ff822616adb147517ac961422e5fedbfd
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 5 22:49:53 2010 -0400
altosui: Compute flight state from eeprom data
This lets eeprom files be used to replay flights.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a0a9b445a4d379730b67720f8d7b682d5206a582
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Aug 5 15:16:48 2010 -0400
update changelogs for Debian build
commit e075b8623533965b1b77b77d38c2df32f5f77fce
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Aug 5 15:16:24 2010 -0400
update changelogs for Debian build
commit 410de62715a0830f03b0a65d6c7730dff51e6ef4
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Aug 5 15:15:04 2010 -0400
add freetts as a build dep
commit 0b85160c44d934f3d1352c1c07c296d01ceffc32
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Aug 5 15:02:17 2010 -0400
update changelogs for Debian build
commit d091099753d9cae01c4805812425ebea19ec09cf
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Aug 5 15:00:46 2010 -0400
update changelogs for Debian build
commit aed55ef1ce45b0f6e6fefeebf50be97607b31d65
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Aug 5 15:00:15 2010 -0400
working on java packaging details
commit d8bf05f7ad55964c9bce0551e58f4ef6c9f721ad
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 5 13:50:18 2010 -0400
altosui: Split flight record out of telemetry class
This will permit either telemetry or eeprom data to be used to
construct the sequence of flight events for reply or data generation.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 85a670b5a904d6750d0f179ae307baeb8fc7cbd2
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 5 13:40:17 2010 -0400
altosui: Explicitly initialize Altos class
Because the Altos class is never instantiated, the static initializers
are never called, leaving the string to state mapping empty. Hand-code
the call to the initialer instead.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 02f17f2cd26189e2676a9dc0d86bd959ed0bc3f4
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Aug 5 00:54:05 2010 -0400
move to science menu
commit 9e8f7f75442303f9bfa99a0435984f5d36863ae6
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 31 10:34:21 2010 -0700
altosui: Split status and info panels into separate files
This moves some code out of AltosUI.java into separate files
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9c9b35254c693b3ade42b24d1e29eaf31e6ba2aa
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 31 10:24:56 2010 -0700
altosui: Clear displayed data rows as needed.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 88e0137a60d7a13ddb7781befa76650e13ad44ae
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 31 10:07:38 2010 -0700
altosui: Merge gps date and time classes into gps class
No reason to split out the date and time information from the other gps info.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1c3b2fe357d6acf28f48aeddd91693f10381be51
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 31 10:05:15 2010 -0700
altosui: Capture config and version info in .eeprom files
Instead of only writing the serial number to the .eeprom file, write
all of the config values and all of the version reply to the .eeprom
file. The config values, in particular, contain the accelerometer
calibration data which is needed to correctly compute acceleration
from the captured accelerometer data.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e286eb61ad2a90746c1c31f95d26d5edb48738d3
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 31 09:57:49 2010 -0700
altosui: rename AltosEeprom -> AltosEepromDownload, split out Altos constants
Renames the eeprom downloading code and adds a new file to share the
flight data constants across the various UI modules.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e3a9e3815db3f290e28b40ae02aa654f515cfc37
Author: Bdale Garbee <bdale@gag.com>
Date: Sat Jul 31 10:55:27 2010 -0600
update changelogs for Debian build
commit 8fc261c2b77bb8aab201a0649a84b5ffa236ce26
Author: Bdale Garbee <bdale@gag.com>
Date: Sat Jul 31 10:55:07 2010 -0600
see if my new freetts package works
commit 2f114c7ff6b0deddb790d34139bb11ac37f8c0da
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Jul 29 13:30:36 2010 -0600
update changelogs for Debian build
commit 7877496d47ce6d25210c0e1c6500666dbfc0876c
Merge: c71061a 4cf39b1
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 29 12:07:49 2010 -0700
Merge remote branch 'origin/master'
commit c71061a37d3d3be2855b61cde33d2371989d7681
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 29 12:06:06 2010 -0700
Make altosui test script executable
commit 4cf39b13a574cb656999cf329f5b08e7f910604b
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Jul 29 12:57:31 2010 -0600
update changelogs for Debian build
commit d1848193d8208388e4ccdfbed4e5663a9ba04dd3
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Jul 29 12:56:59 2010 -0600
add a jdk to the build deps
commit 9ad4984124b6c05114feac4c4ac078dc248ce16a
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 29 11:56:24 2010 -0700
altosui: remove option to install to alternate volume
commit 2e797b18f0724caf7aaf96f45997998c7416f34e
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Jul 29 12:50:57 2010 -0600
update changelogs for Debian build
commit 89109f9dff3ce855d80da166e3362375282f745d
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Jul 29 12:47:37 2010 -0600
ugh, fixing failure due to aborted build
commit 6fb8546575f6d99676dbb1dce190b0b7cf24b657
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 29 11:45:56 2010 -0700
Moved Mac OS packaging to altosui dir
commit 865d5cdf8931ffc796f608e3e12d7c5a70832825
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Jul 29 12:45:18 2010 -0600
add swig as a build dep
commit 91d75fb3919f606a1956bf8c6423a8012d99a56a
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 29 11:45:12 2010 -0700
altosui: Switch eeprom extension back to .eeprom
commit 33ffd89d5a64c991d28bd7369b61e1faa18f605b
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Jul 29 12:40:52 2010 -0600
update changelogs for Debian build
commit 62b4cc51a0f54ef363cbff46caef80a0afecdea2
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Jul 29 12:40:25 2010 -0600
update changelogs for Debian build
commit 6f86db5e0360bef26b21336769b7635e3a11e160
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 29 11:24:47 2010 -0700
Add Mac OS X packaging bits
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 950f0a8c54e5835ee5d8b0aea360bd8362c21bc5
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 29 11:09:19 2010 -0700
altosui: construct Darwin application directory
This adds the necessary files and build steps to construct
AltosUI.app on a Darwin system.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 669c5f52abb972a82ed6efbee7a8c7d20afb5cd0
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 29 10:48:52 2010 -0700
libaltos: build with java src encoding UTF8
Signed-off-by: Keith Packard <keithp@keithp.com>
commit efa0e034a161f4852947cbac06537d6ba4422a0e
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 29 10:48:25 2010 -0700
altosui: remove debug printf
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 53c279b9e96da8b69837ae84038a78ca5707f2a5
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 29 10:45:02 2010 -0700
altosui: Close serial, join reader thread, free altos_file
Separating out the close and free actions ensures that the reader thread will not
access freed memory or dereference a null pointer while shutting down the
connection to the serial device. Otherwise, a race condition exists between the
serial close and the thread join.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b8bc9994d8bfde6116c8a509e70ddf45fc4decce
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 29 10:24:59 2010 -0700
altosui: Remove unnecessary freetts .jar files
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e33dbbba94ce42295e9fed9f4ba7e46f9eff1517
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 29 10:24:09 2010 -0700
altosui: check for closed serial device before reading
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 27a2d0c00acf78628428c20ab68e2bfba06340da
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Jul 29 11:02:38 2010 -0600
update changelogs for Debian build
commit 537492dc961ee6a1945b1041ee3cc0d3f519a42c
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Jul 29 11:01:21 2010 -0600
update changelogs for Debian build
commit adf6cbcba23e24a3824f7e242ec37baa2750ab94
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Jul 29 10:59:18 2010 -0600
update changelogs for Debian build
commit d0fd53bdab2f480cd43b6d7010c2094f4fccda91
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 28 21:49:23 2010 -0700
Reset GPS ready status when GPS comes unlocked on the pad
If GPS becomes unlocked, then report that in the UI and via
voice.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5fd225c3a52445ecdc7c04fac5e3d9a0db177c66
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 28 21:01:41 2010 -0700
altosui: report rocket ground bearing at landing only if known
if state.from_pad is null, then there isn't any data to report.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d2d772164af95a35ea0f5d2413a5be67de9a210f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 28 20:18:36 2010 -0700
altosui: Replace device dialog. Center eeprom monitor.
This adds a custom dialog for selecting device, which makes it look
much nicer on the screen and allows the user to double-click on an
entry to select it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ea32290704a8ca468f01172166b561833b20c954
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 28 19:37:02 2010 -0700
altosui: Fix Save flight data monitor layout, add cancel
Use GridBagLayout to improve the appearance of the flight data monitor
widget, add a cancel button to stop loading data (useful if the
connection is wedged).
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ce90f3fe2aa6e23695ccccb36a8e6e614a08ba31
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 28 17:08:42 2010 -0700
altosui: Add progress bar for eeprom downloading status
This has a progress bar tracking the state and block count while
downloading stuff from telemetrum.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6599e9576c3da9325a1731144c1b8bc4943184c0
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 28 15:41:34 2010 -0700
altosui: Add eeprom data capture function. No UI yet.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8a6040e143ecc7830cc1c0114de85f3b72c067eb
Merge: 024d077 554a97e
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 28 13:29:51 2010 -0700
Merge remote branch 'keithp/macos'
commit 024d077302f91bdb17abe70d3211ab0949dab8b9
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 28 13:29:21 2010 -0700
Remove debug printf
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 826061eaca88c0dd75051a6006ef6703c91af595
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 28 13:10:11 2010 -0700
Add voice test command for help in adjusting volume.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 71da54a5ce255395376a44586782ab8b6f3b289f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 28 13:01:52 2010 -0700
Make voice and channel menus work.
Stores voice and channel data to preferences.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e76b9cc32bbcc5176d9bdd6f8d79778024627382
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 28 12:24:53 2010 -0700
altosui: Catch errors opening USB devices. Limit list to relevant devices
Avoids a segfault when failing to open a device. Limit listed telemetry
devices to just TeleDongle units.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 172a2817dde6718724f2b5fad5a7761801446fa0
Merge: f2a006f 81bf204
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 28 11:20:22 2010 -0700
Merge branch 'macos'
commit f2a006fd98045066bdf429cc142d033e9feb0a8f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 28 09:31:09 2010 -0700
Make ao_log_data re-entrant as it is used for both sensor and GPS logs
Because ao_log_data is called from two different threads, failing to
make it re-entrant would cause the 'log' pointer parameter to get
overwritten if another thread asked to log data while the eeprom was
busy writing out a block.
This would cause the second thread to re-writing data from the first
thread's address, but without re-checksumming the data as the checksum
is computed before the log mutex is taken.
The bug can be seen by log blocks with invalid checksums.
Here's what happens with the ao_gps_tracking_report and ao_log threads:
ao_gps_tracking_report ao_log
Writes a bunch of records
*blocks* in the eeprom flush
sets ao_log_data 'log' to global 'log'
computes checksum for 'log' block
*blocks* on ao_log_mutex
Wakes up
sets ao_log_data 'log' to 'gps_log'
writes remaining records
'gps_log' is left with svid = 0
*blocks* on ao_gps_tracking_data
writes data, reading from
the current ao_log_data 'log'
pointer which points at 'gps_log'
Making ao_log_data re-entrant fixes this by ensuring that the 'ao_log'
thread has its own copy of the ao_log_data 'log' parameter.
I made this function take an __xdata restricted pointer so that it
could be passed in the dptr register instead of needing to go on the stack.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 554a97ef455c801dcab825815f44520f96f4c3f3
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 27 19:29:38 2010 -0700
Force java source encoding to UTF-8
commit 81bf2042ca39eb106b789e5a08647c3114669358
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 27 15:29:28 2010 -0700
Java voice reporting cleanups.
Make sure it says something at the end of a log file replay.
Make sure it reports max speed after motor burn out, and max height
after apogee.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8f2f38f2a9fb0c106e2c6b60cdc205292ce329ea
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 27 10:18:20 2010 -0700
Java clean ups -- use varargs where possible, remove AltosSerialReader
Add methods that format stuff using String.format for voice and serial
link, remove AltosSerialReader class and just embed that in the
AltosSerial class directly.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 734cd15ccff691f851359518ce6118f29dc9f88d
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 27 10:18:09 2010 -0700
Remove directories as .class file dependencies; it makes them get rebuilt all the time
commit 809feb75e2155e84aebfcc431867edcfd9054670
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 27 01:22:56 2010 -0700
Clean up altosui build a bit
commit 3784578a40dcc61f447435cfdf22e13c409cb9c0
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 27 00:16:15 2010 -0700
Add application icons for Mac OS X
commit 2c273710ea9b76ebee4101893f9fe84be8a02354
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 27 00:11:58 2010 -0700
Add Mac OS X packaging files for altosui
commit a58c44cd904e5429b807e5c23913051ed6484edc
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 27 00:09:41 2010 -0700
libaltos: build fat 10.5-compatible library
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4e3285575e0c7d029e799258587e965779990099
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 27 00:09:18 2010 -0700
libaltos: make clean remove all built files
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fb8507975c6e081de2e909eca6faaa8f868b609e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 27 00:08:38 2010 -0700
libaltos needs -I. on all systems
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0a782026f6b19e84ffd44f1ae1b466363474bd30
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 26 18:10:07 2010 -0700
Darwin doesn't have strndup.
This provides a private version of this GNU extension.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b51497597868a40df039dd3ca11b35a6258bbbb3
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 26 18:04:10 2010 -0700
Re-enable Linux support for altosui.
This steals code from cc-usbdev for scanning the USB tree and uses the
same tty code as on Darwin
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e9153c4f2c71ed965822fcfe5112d2bc38506baf
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 26 17:04:04 2010 -0700
Re-enable freetts
commit 17188f36fe18c23bc2eb877ac9a01b7693f4b863
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 26 17:03:47 2010 -0700
Present list of altos devices in nice format
commit 005e2d6a7bb3b0546b0c1273296875621632ec6d
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 26 15:42:48 2010 -0700
Switch AltosUI to libaltos for device access
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c726d8f6eb861801d7543552beab6ee2c920c96f
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 26 15:41:39 2010 -0700
Add libaltos which talks to USB connected altos devices
commit 05111d5be4d37bedaaee6415d6ee27347e6a112c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 26 12:52:17 2010 -0700
When the EP0 IN buffer is full, don't panic, just skip sending another
If the host doesn't pull the IN packet out of EP0 before sending
another SETUP command along, the IN buffer will still be busy when we
try to reply to the SETUP command. While I don't quite understand why
this would ever happen, there's no need to panic about it, just drop
the reply packet on the floor.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d0647950b76bfa9942e4f8cf87353f2b724099f4
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Jul 21 14:26:36 2010 -0600
fix text since TM only has one led to blink
commit 8eda9fe94a7fd40cb84f50e17e64956f1584ebdc
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Jul 20 22:24:32 2010 -0600
update changelogs for Debian build
commit cd8aa79de72b8b6b3a26d0c2522e94c621b70f13
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Jul 20 22:24:01 2010 -0600
update to latest Debian standards version
commit 3284c7516e302e6db403d18866924ad926ffb2a7
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Jul 20 22:20:08 2010 -0600
update changelogs for Debian build
commit 8f1933717e3acfbcb09191da6e79a7944f91f9d9
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Jul 20 22:19:27 2010 -0600
reflect documentation file name change
commit 2cf1ef555a7feceeb1c333b273c19dd848e8d03f
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Jul 20 22:15:47 2010 -0600
update changelogs for Debian build
commit 74c67fc466118b86b4eb5173f7a6886ae220a985
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Jul 20 22:14:27 2010 -0600
add build dep for sndfile
commit 0794ab1e13313fa49b7caf01aef20b052ad78a88
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Jul 20 22:10:01 2010 -0600
update changelogs for Debian build
commit 15a6791ba8f8313b6b55752c3fa7dc254d56dd5c
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Jul 20 22:08:56 2010 -0600
update changelogs for Debian build
commit e747954b6a9e71705f619684df8a118a909b1039
Merge: bd40a5b 695879d
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Jul 20 22:07:22 2010 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit bd40a5b431847c071f5c486d754eca5627e5e3b9
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Jul 20 02:12:03 2010 -0600
significant update
commit 695879dbccfc5ec6b79698653c58814158f91686
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 14 19:07:02 2010 -0700
Switch DBG pins to GPIO when using any debug commands. Reboot to restore.
If you want to use TeleMetrum as a debug dongle, you need to flip the
three pins used to talk to the remote debug port from SPI mode to GPIO
mode.
This patch doesn't provide any way to get back to SPI mode, so you'll
have to reboot the TeleMetrum to write out config parameters or log
flight data after using any debug commands.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a9ec6be0e92dee01f7aac006ef6f7779c1da1b36
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 3 17:42:36 2010 -0400
Telemetry code was mis-computing RSSI
The RSSI data from the hardware reports in 1/2 dBm increments, and so
must be divided to report plain RSSI numbers.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 62294ea3830d3ea261a8761edc9fa6f98201d321
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Jun 24 12:38:23 2010 -0700
update changelogs for Debian build
commit 4766b13d1241fa585907c6f77707d2d4b3ccff75
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Jun 24 12:37:55 2010 -0700
update changelogs for Debian build
commit 52834517c0706b1f16fb81643a42dc1c1997e00a
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 21 15:53:33 2010 -0700
Abort any in-progress radio operation when changing radio channel
In monitor mode, the current receive operation must be aborted so that
the radio channel change can take effect without receiving a
telemetry packet on the old channel. Aborting any in-progress radio
operation will make sure that happens.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5933eaa44fe45027b856f1303dd657b974eb53e7
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 21 11:44:32 2010 -0700
ao-postflight: was walking off state.data array
commit 11d155d558d0b121b66f089adee0a47d71f65a78
Merge: 544003a 24393ea
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 16 21:54:06 2010 -0700
Merge remote branch 'mjb/master'
commit 544003a8da0248fd6f3c62ded86af74ab7cdadf6
Merge: 267923e 93c1e29
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 16 21:52:23 2010 -0700
Merge remote branch 'origin/master'
commit 267923e56e22b3635a21f42ef77a3a36158bc273
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 16 21:49:43 2010 -0700
Add special code for USB panic's.
The USB system may panic if the hardware isn't ready for IN data when
the driver thinks it should be. This adds a special panic code to make
figuring this out easier.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 50ae347bf9de49ccfc92d26888f36e155fb406a3
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 16 21:48:04 2010 -0700
ao-view: disable radio telemetry monitoring during channel change
This makes ao-view disable the radio so that the channel change has an
immediate effect rather than waiting for a packet on the old channel.
Note that this should also be fixed in the TM code itself so that this
change wouldn't be required.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 24393eab0ea085f2d0224b59fdc3c00693e5d3a9
Author: Mike Beattie <mike@ethernal.org>
Date: Thu Jun 17 14:04:01 2010 +1200
Extension to KML output format, and minor bug fix
Extended KML output by breaking flight into coloured segments representing
flight state. Add extra statistical information to description bubbles
visible in Google Earth when clicking on links in My Places.
Fix Bugs:
* output kml to file provided as argument.
* move kml coordinate output code to take advantage of nsat calculation
* remove superfluous %9.2f format specifier from raw_file output.
Signed-off-by: Mike Beattie <mike@ethernal.org>
commit 93c1e29b07c331a5ca6e0f647b9d2e9266ed3014
Author: Bdale Garbee <bdale@gag.com>
Date: Tue May 18 23:12:45 2010 -0600
updates from Bob
commit bb46c9a1da5788a082e4483e576a5a6d3963507b
Author: Bdale Garbee <bdale@gag.com>
Date: Tue May 18 00:26:28 2010 -0600
update changelogs for Debian build
commit 16c4cae7ebed7bd3ee0f12b8872bf950574f17e8
Author: Bdale Garbee <bdale@gag.com>
Date: Tue May 18 00:26:00 2010 -0600
update changelogs for Debian build
commit bc89d962c87b50e5487628f8ca25e4443ac4823d
Author: Bdale Garbee <bdale@gag.com>
Date: Tue May 18 00:24:03 2010 -0600
merge the altusmetrum-themes package
commit 0c6cf621dfd8339b8bc3915750a3147235f1331b
Merge: 32e430b 563a9dc
Author: Bdale Garbee <bdale@gag.com>
Date: Mon May 17 23:59:43 2010 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 32e430b8a5f93b312f6359b4d553bad92ed37b19
Author: Bdale Garbee <bdale@gag.com>
Date: Mon May 17 22:43:19 2010 -0600
merge in a derivative of Bob Finch's mere mortals guide as a getting started
chapter
commit 563a9dcdfef42718370c49f16cc2271642b3e055
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 17 21:30:57 2010 -0700
Finish basic flight monitoring UI with voice using FreeTTS
This captures telemetry data to log files and presents flight status
information in audio form using FreeTTS.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 69092ffd23ac1928d5c84413fd00c2423f313fc2
Merge: 3c2211a cc002c0
Author: Bdale Garbee <bdale@gag.com>
Date: Mon May 17 20:10:46 2010 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit cc002c0a43a02845ba67d1a61828be382f307b2e
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 16 22:31:23 2010 -0700
Fix telemetrum.inf, tested by Adrian and Keithp
commit 3c2211ad7877d622435bc9e8c9c0b01d62be6ff0
Author: Bdale Garbee <bdale@gag.com>
Date: Thu May 13 15:37:37 2010 -0600
typo fix from Bob
commit f0433c83d76e90d78fb86a1f4a2f145f3c57fb25
Author: Bdale Garbee <bdale@gag.com>
Date: Thu May 13 01:27:39 2010 -0600
updates from Bob
commit 0f05cf06e3f1ec510b11d993d9038211ac66c97b
Author: Bdale Garbee <bdale@gag.com>
Date: Wed May 12 19:54:04 2010 -0600
update changelogs for Debian build
commit 6bd85138c1bfbc1d8b78dce1501870a65a64db36
Author: Bdale Garbee <bdale@gag.com>
Date: Wed May 12 19:53:40 2010 -0600
lose the quotes since they apparently aren't necessary
commit d639144b9bb840fbbced199738787ec054eddf12
Author: Bdale Garbee <bdale@gag.com>
Date: Wed May 12 17:04:41 2010 -0600
update changelogs for Debian build
commit ae6854df00579ea1c3486f1bf8f19443d5ac9498
Author: Bdale Garbee <bdale@gag.com>
Date: Wed May 12 17:04:13 2010 -0600
update desktop file for conformance with current standards
commit 7191d74e680a63728f5eb139069a674fef969e6c
Author: Bdale Garbee <bdale@gag.com>
Date: Wed May 12 16:45:00 2010 -0600
update changelogs for Debian build
commit 68eaaa694bb7bf20642ad11eac8a13c1c8e21b7d
Author: Bdale Garbee <bdale@gag.com>
Date: Wed May 12 16:44:14 2010 -0600
add desktop file
commit 9d3d09578381bb6e6f88c39b0e945371bbc22c5a
Author: Bdale Garbee <bdale@gag.com>
Date: Wed May 12 16:34:49 2010 -0600
add desktop file provided by Bob Finch
commit 3cc1dad3b497524ffef61190dd68908cb19e8c35
Author: Bdale Garbee <bdale@gag.com>
Date: Wed May 12 16:28:35 2010 -0600
add initial package build scripts for Arch Linux from Bob Finch
commit 1b8671bd0a00cec6ae4ccf442cd007b18af82fb0
Author: Bdale Garbee <bdale@gag.com>
Date: Sun May 9 01:41:00 2010 -0600
lots of updates
commit 53b9a9bc28a9278249ff37f92110c21380e93cda
Author: Bdale Garbee <bdale@gag.com>
Date: Thu May 6 13:59:23 2010 -0600
update changelogs for Debian build
commit cde60f16f6ab2cdd5010a0e106ae312d144947cf
Author: Bdale Garbee <bdale@gag.com>
Date: Thu May 6 13:58:31 2010 -0600
Revert "Merge remote branch 'remotes/origin/fix-reset'"
This reverts commit 314d27a73c903fef2968dabac3d5313573713460, reversing
changes made to fa77db2ffd8a749c93767db5a6311131e00473ae.
For whatever reason, this is utterly not doing the right things today!
commit 8be04df7e1e0a369ffb1137c6e2ec63585e3c935
Author: Bdale Garbee <bdale@gag.com>
Date: Thu May 6 12:48:00 2010 -0600
update changelogs for Debian build
commit 314d27a73c903fef2968dabac3d5313573713460
Merge: fa77db2 823fc0a
Author: Bdale Garbee <bdale@gag.com>
Date: Thu May 6 12:47:30 2010 -0600
Merge remote branch 'remotes/origin/fix-reset'
commit 823fc0ac27b8df9b4ba1ca0f229b431baf5b46dd
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 5 12:50:39 2010 -0700
Don't change dbg clock while changing reset_n. Use 20ms everywhere
This changes the reset code to be more conservative about changing
things at the same time, and also sets all timings to 20ms to make
debugging with the scope easier.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fa77db2ffd8a749c93767db5a6311131e00473ae
Author: Bdale Garbee <bdale@gag.com>
Date: Wed May 5 02:34:41 2010 -0600
update changelogs for Debian build
commit 8b6767e24a88482dbd3d4c4c969a0be08917d22b
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 5 01:32:46 2010 -0700
Use ao_delay to sleep for 2 seconds instead of trying ao_sleep
ao_sleep doesn't delay for a specified time interval as much as one
might want it to.
commit e6bb80975fde20928a830170f0821d59a8c72690
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 5 01:31:57 2010 -0700
Fix all stdio reading functions to be __critical
Oh, right SDCC has '__critical' to mark sections of code that need to
run with interrupts disabled; no need to use EA = 0 and EA = 1.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ff03cdf746b83542ebcca00d32e6cc69ccfc122d
Author: Bdale Garbee <bdale@gag.com>
Date: Wed May 5 01:57:54 2010 -0600
update changelogs for Debian build
commit 8702f497c4278648303eced1aed5bd76d559521a
Author: Bdale Garbee <bdale@gag.com>
Date: Wed May 5 01:57:11 2010 -0600
initial attempt at a telemetrum turn on script .. needs work
commit 01cefa181b04e53c20109ef8f3ffff633744da73
Author: Bdale Garbee <bdale@gag.com>
Date: Wed May 5 01:56:51 2010 -0600
update changelogs for Debian build
commit 45a1c2d2dfb69e5269ef2756fcd0f734b48d41cb
Author: Bdale Garbee <bdale@gag.com>
Date: Wed May 5 01:54:33 2010 -0600
update changelogs for Debian build
commit f7ff3278bb670df59d7425a014cfe8e3718fea3f
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 5 00:44:42 2010 -0700
Disable interrupts while reading from stdin
With multiple input source support, there is a lag between asking a
device if it has data and then waiting for more data to appear. If an
interrupt signalling additional input arrives in this interval, we'll
go to sleep with input available.
This patch uses a big hammer by just disabling interrupts for the
whole process.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit aa9ff021d683764a43800eaa18ea0c9be5134939
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 4 21:42:54 2010 -0700
Revert "Add optional 's' command to packet slave to enable/disable slave mode"
This reverts commit e7dc7fab787df63a4de72c8450e94092eb04d7db.
This patch didn't work, and magically appears to break flashing TM
from TD.
commit 8c95f33686f69da717013ec2c25dbcd99c03aa45
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Apr 29 17:48:44 2010 -0600
more text created during SFO->DEN flight
commit af0613ffc178b9b1f011c315923f92f2581fe53e
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Apr 27 00:18:43 2010 -0600
update changelogs for Debian build
commit 99094f02bf4849ba1f6b9842ded6c39d894320f7
Merge: 641e76c 75d8ffd
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Apr 27 00:17:37 2010 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 641e76c5d419dab057298541b3a7546877643198
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Apr 27 00:17:15 2010 -0600
add some RF usage information from an email reply sent today, and re-indent
commit 75d8ffd4eadf31d50b2f58c021530c17ff1bdc66
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 23 13:53:25 2010 -0700
Autodetect flite voice registration function
Old versions of flite exported the function 'register_cmu_us_kal'
while new ones export 'register_cmu_us_kal16'. This patch just checks
which one is available and uses that.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 97f4874d19ec05c81a04a3ecd06abffcf7fbfafc
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 22 16:25:35 2010 -0700
More ALtosUI changes
commit e7dc7fab787df63a4de72c8450e94092eb04d7db
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 22 14:53:44 2010 -0700
Add optional 's' command to packet slave to enable/disable slave mode
This option has been selected for teledongle so that you can use slave
mode and hook two teledongles together over the RF link.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f4383394b5d2b275b21e3ce8040d8cb9e48bb375
Merge: 5f93cf8 c879b17
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Apr 18 08:36:07 2010 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 5f93cf8c73555f43c14b1b0757f264bde69e9b8a
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Apr 18 08:35:43 2010 -0600
capture work done on SFO->DEN flight
commit c879b178d83c9a9a521f42a960b10e19b11cee92
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 10 22:09:57 2010 -0700
Increase reset switch time to 100ms
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b3a2e1221735d54dc3f2b97b4e75ed6f33ab8227
Author: Bdale Garbee <bdale@gag.com>
Date: Sat Apr 10 15:01:14 2010 -0600
update changelogs for Debian build
commit 9394393c24c0a96b94319f2d0aa78fb498a121c9
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 9 17:51:01 2010 -0700
Only have the slave return a packet if it received one.
When the receive is aborted to switch modes, it's important to not
immediately re-acquire the radio and try to send a packet as the
aborting thread won't know to kick the receiver again.
This prevents the 'C' command from locking up as it tries to stop the
packet slave before turning on the transmitter.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ce39372a3aeffff1a08d609e63164a00cf974663
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Apr 9 13:50:49 2010 -0600
wrong Yaesu model
commit a832c7e9d9e9e420e1281136188bd53b34c56464
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Apr 9 00:10:03 2010 -0600
update changelogs for Debian build
commit c0ee1ae25e1d18138d8372f47085de48ffada344
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Apr 9 00:09:21 2010 -0600
file changed by auto tools
commit 25e69ebfec94560e0714cf2cc623dc9697b4ea99
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Apr 9 00:08:32 2010 -0600
update changelogs for Debian build
commit ea5d4f01d18d93d032f05933041b7b6881289780
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 8 22:45:04 2010 -0700
libflite may forget to reference libasound
commit 4b02f293e9c32a568fad89558274f21157e7d473
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Apr 8 20:08:07 2010 -0600
update changelogs for Debian build
commit 5c3b6e2d1989bcaa19ae3e294f297ec3e5648a53
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Apr 8 19:56:40 2010 -0600
update changelogs for Debian build
commit 01e524f11a67390a8ea1f20aa2d611909b4da363
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Apr 8 19:55:05 2010 -0600
choose a better set of docbook xsl files
commit f93c9bf3695862db31f2c3b3bc5a7bb24ef3766c
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 8 17:28:17 2010 -0700
When changing RESET line, delay 20ms
The GPS data sheet suggests a 1uF cap on the reset line to ensure it
is held low long enough for the power supply to come up to voltage. TM
v1.0 loads a 0.001uF cap there, but in case that isn't large enough,
it could be replaced with the larger one. This change makes sure that
even with that larger value, the debugging link will be able to reset
the target.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit baaaac499cfbc1286ae55374cfdc796d32983b92
Merge: a4356b9 dec9971
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 8 13:31:23 2010 -0700
Merge remote branch 'origin/master'
commit a4356b9bcf679c4d7b88fbbad77a98ecb0f80098
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 8 13:30:16 2010 -0700
Use 16-bit flite voice (which appears to have changed symbols recently)
commit 447c121fc1ceb878e45718ad1364a5349965a59a
Merge: 10330d2 53ca3f9
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 8 11:46:56 2010 -0700
Merge remote branch 'origin/master' into altosui
commit dec9971d70f17067ba0051206851b49c7604ac85
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Apr 8 12:43:03 2010 -0600
update changelogs for Debian build
commit 6629ec52def8917ad033847812a1adc4c3e9c947
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Apr 8 12:42:47 2010 -0600
lose the url entirely for now
commit a1539a075a0cc79c9122fea878d9a20ee722a18c
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Apr 8 12:41:42 2010 -0600
update changelogs for Debian build
commit 934434ffb3514fe9ff95692784750d7c5217a5d3
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Apr 8 12:41:28 2010 -0600
fix typo in url
commit 8a067cd0eebbec313fc39086747ef618f2d1cf37
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Apr 8 12:36:18 2010 -0600
update changelogs for Debian build
commit 05ad58389fa3814ecb56344bf4ec3a3e025920a2
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Apr 8 12:34:54 2010 -0600
need another build dep
commit 6fbdc7037db185f03bd5ff96b9d9320646572df7
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Apr 8 12:28:49 2010 -0600
update changelogs for Debian build
commit 8f1d47e9cd61738e516d15fc97d5730d80611e87
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Apr 8 12:28:20 2010 -0600
update changelogs for Debian build
commit 10330d23518c94a8b791193a97a6cc07b1c9a97c
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 6 00:58:00 2010 -0700
Enable telemetry monitoring
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9e10e43eff9de3f034da49c4f88728fb933f5035
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 6 00:56:57 2010 -0700
Tasks may move in task structure as a result of ao_exit
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a7fc7901cd591c93d9d0cffeec2977ebb17554d4
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 6 00:55:19 2010 -0700
TD reports "not-connected" when GPS has 0 sats
commit e064d05da87926c19fb665b40fb280fb59328183
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 6 00:54:52 2010 -0700
serial port read function cannot be interrupted. poll every 1 second
commit c099a67d9ea37e731e0eca318102560281ac240f
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 5 22:42:05 2010 -0700
Interrupt running replay thread when starting another replay
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cc600a0389720bc7e435dbda8bec080ef19e0c58
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 5 22:21:46 2010 -0700
Add Linux device discovery
AltosDeviceLinux.java scans /proc to locate suitable devices. This
will be hooked up to the UI shortly.
commit c28646d72005daeadb70b95fd3b0050bd752cc55
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 4 20:55:30 2010 -0700
Switch TeleMetrum from v0.2 to v1.0
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d22ba55ae0e056530a727df50f14ad853d79a2c8
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 4 20:55:18 2010 -0700
Clean up some altosui comments
commit 6251e89c6eea655769f77bc18e98e79c99cf3cad
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 4 19:54:46 2010 -0700
Don't abort the radio when enabling telemetry monitoring
If telemetry monitoring is already on, then there isn't any point, and
if it's not on, then presumably there isn't any radio work to abort.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b0b99f30c4e00689e9faceb363a5c7284541c6be
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 4 19:48:50 2010 -0700
Make ao_radio_idle keep trying to get the radio to idle.
Attempting to abort a radio operation could lead to a hang if the user
of the radio jumped in and started using it again before the task
attempting to abort woke up. This change just keeps smacking the radio
until the radio goes idle long enough to detect it.
commit 0e7abc9fedec568b431c983d3df1b0b29f4f10e3
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 4 16:32:04 2010 -0700
Use RXTX for serial comm. Add logdir preference saving
commit c66eebad323e4572bb7cc23bc476ee144f03e9b8
Author: Bdale Garbee <bdale@gag.com>
Date: Sat Apr 3 08:02:44 2010 -0600
rewrite urls in docbook format
commit 3d34c488c5b71020d86f83156fd821fd860bf214
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 3 00:02:44 2010 -0700
Make .jar file
commit 4bea4c327e002ce8f88218f0d840af7c1521bc35
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 2 23:25:02 2010 -0700
Remove unused cell renderer class
commit 4ad062969ae8a608b8428620579bbe114e580a11
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 2 23:20:38 2010 -0700
Remove GPS data missing from skytraq. Save max height/accel/speed
commit ebd49d4ec6b0b60c85b2de45cfe2e36add8fe9bf
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 2 23:05:40 2010 -0700
Report current gps nsat, not last locked nsat
commit 3f9b66b307ee88172151e3bee58e50f5acbde109
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 2 23:00:30 2010 -0700
Clean up GPS data formatting
commit 9cc48698ec14c34d437baad7b6540edc31e9741c
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 2 22:47:40 2010 -0700
Fix state updates
commit 6d523ee4dad3b9890d3cf05852459101fe7e26ea
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 2 21:48:41 2010 -0700
Fix status update
commit caa0bf49668344937483190d1c258bfa32971d19
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 2 21:44:00 2010 -0700
Fix up table formatting
commit a579402f428dd6a0529505069d1846f70b83ab5d
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 2 18:10:59 2010 -0700
Display table of flight info. gps is not working yet though
commit 65079f84ea64220fa928c3ad96652fed159bf74b
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 2 16:07:40 2010 -0700
Steal C code from ao-view
commit 02f2be90879b682b6e648cf2debc83223d127b9d
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 2 13:37:52 2010 -0700
Add telem parsing code
commit 8c600abf87c95f8f214b5e56ff6eab955795dff5
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Apr 1 23:56:47 2010 -0600
crudely incorporate "day in the life" info from web page
commit 53ca3f98aeb70cb780031fee788de950e4388cf6
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Apr 1 23:39:42 2010 -0600
tweak copyright assertion
commit 6454e309858aeef7912e862de8632618d89b4205
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 1 18:31:14 2010 -0700
Fix windows install file
commit 584ab100640a07dec6e06829e73b7260d17d2232
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 1 18:30:56 2010 -0700
Add Windows install .inf file
commit a06bee96e648d9ded8776f3d6cba9505e7be1a60
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 31 23:05:03 2010 -0700
Add telemetry data parsing code
commit 7f233369e32c3254165ee251df0a3dbc21ea5a29
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 31 13:49:54 2010 -0700
Start adding java-based UI
commit 76768804e68ed09421d7a48cb0b390f102ce2d76
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Mar 30 23:26:35 2010 -0600
make lintian happy
commit eb3cc3e9b60ec23acbb7d797affa743d671801ab
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Mar 30 23:19:48 2010 -0600
update changelogs for Debian build
commit 00f49c8fb0aa38331360bdb85c32bcebe60dcdc3
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Mar 30 23:19:07 2010 -0600
fix typo
commit f03ed0876c67b58624abf0c14bf73444b0322d3c
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Mar 30 23:18:37 2010 -0600
update changelogs for Debian build
commit b41e617080fe825f7810ee5eee52ea37f7618ec6
Merge: 28e40cc df7bda1
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Mar 30 23:15:32 2010 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Conflicts:
ChangeLog
commit 28e40ccfcd80ab8764d4aa235257cea4d193a0c1
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Mar 30 23:14:47 2010 -0600
update changelogs for Debian build
commit 20d4d410e0fc04fe192e309811eed6c0194fa5a8
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Mar 30 23:11:40 2010 -0600
initial harness for documentation
commit 9801ff7de21027935f52ccabaa3ff157e22d21ce
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Mar 15 12:04:18 2010 -0600
move gbp.conf into debian/
commit df7bda1f32b0049c3878c325ea0b55999f3980e3
Merge: 23da4f3 a7042fe
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 12 10:38:26 2010 -0800
Merge remote branch 'origin/master'
commit 23da4f3bcdd1d780c9e1f6b68ad2fb309fcae6ba
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 12 10:37:32 2010 -0800
Document the ao-dumplog '--remote' flag for radio-link downloads
The --remote (or -R) flag uses TeleDongle to fetch data over the radio
command link from TeleMetrum. It's been there for a while, but the man
page failed to mention it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 93df98898f8cd199ae13158bc4f65e3494c954ad
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 12 10:35:12 2010 -0800
Round radio calibration value instead of truncating
The radio calibration function in the bring-up code was truncating the
radio calibration value which caused the resulting frequency to
always measure above the target frequency, instead of trying to get as
close as possible. This change will result in a closer frequency
match, but may sometimes be below the target frequency.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a7042fe7d065d1da1252be5ad43e3c9856214dc8
Author: Bdale Garbee <bdale@Deborah.(none)>
Date: Fri Mar 5 19:11:11 2010 -0800
update changelogs for Debian build
commit eda5e1166a97766aa22561beaa1086ba4e19ee16
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Mar 4 17:33:39 2010 -0700
update changelogs for Debian build
commit 6e61170d42936c18cd6efba6f4c14af616a30745
Author: Keith Packard <keithp@keithp.com>
Date: Sun Feb 28 18:24:46 2010 -0800
Need to duplicate new altitude conversion code in aoview.
Altitude conversion is now done with a smaller table and interpolation
instead of a giant table.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e4e17e6d3844ae682a0e7a9469a522359bac77b6
Author: Bdale Garbee <bdale@gag.com>
Date: Sat Feb 27 17:36:13 2010 -0700
update changelogs for Debian build
commit a1478f65538fdaac7b58ffbd958a035b74956099
Merge: 901fce5 bbf8c9f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Feb 27 15:19:33 2010 -0800
Merge remote branch 'origin/master'
commit 901fce5fe3e2762406079ecaa787612b5ed4b34a
Author: Keith Packard <keithp@keithp.com>
Date: Sat Feb 27 15:18:47 2010 -0800
Add .gitignore for ao-bringup
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7aab73a265841aac817ea34235dd1eb819debf76
Author: Keith Packard <keithp@keithp.com>
Date: Sat Feb 27 15:14:04 2010 -0800
Fix up LED colors for each product.
Different products assign different color LEDs to the two available
LED drivers (P1_0, P1_1). Make the LED color pin assignments
per-product (in ao_pins.h), then deal with not always having a green LED.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1d6d8d76ec65373ffee70add75d183f5c4168f61
Author: Keith Packard <keithp@keithp.com>
Date: Sat Feb 27 15:11:44 2010 -0800
Eliminate deadlock when writing config from radio link
Writing the 'Saved\r\n' string would fill the packet buffer and cause
a flush to occur, which would need to wait for the radio link to
receive and transmit a packet. The radio link always re-fetches the
radio channel number when lighting up the radio, so it need to look in
the config space. If the config mutex was held by the config writing
process while the radio was trying to get the channel number, then
we'd get a deadlock.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f1956ebadd7bf46b84a05a0c383b6404ca26b344
Author: Keith Packard <keithp@keithp.com>
Date: Sat Feb 27 15:10:16 2010 -0800
Leave .ihx files in the build directory too - easier to debug that way
sdcdb wants the .ihx and .cdb files in the same directory, so humor it
by copying the .ihx files to the src directory instead of moving them.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bbf8c9f1748af3f1fac08ddf80ae98da2e9b5727
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Feb 26 15:21:12 2010 -0700
create a turn on script for lighting up TeleDongle v0.2 boards
commit 461d4a1948e112ec7353caf88967391d876469dd
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 26 10:33:13 2010 -0800
Add LED test
commit 5d7a3a5fbc0af4621c67a6fd51a9c9d5ae688fa5
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 25 16:40:13 2010 -0800
Fix and document the ao-rawload --run flag
This allows ram-based programs to be loaded and executed easily.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1e60deca147c85a064719dfad14ccabd1049bbbd
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 25 16:33:34 2010 -0800
Allow product names to have suffixes (like board revisions)
When looking for a board by product name, just look at the prefix of
the name instead of requiring an exact match. This will allow products
to have board version suffixes.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f4d5790a284e2d02dd7568fbca90402fa5ed1aea
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 25 16:32:57 2010 -0800
Add ao_radio_xmit to help test boards without flashing them.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d7d551b0078acb1596a9b9023c3df6dbfa46213c
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Feb 24 17:30:23 2010 -0700
update changelogs for Debian build
commit 2f45953ee54034209a23c254e65da36e44cf075f
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Feb 24 17:29:47 2010 -0700
un-muck changelog
commit 540f86678853e7ea80ae91f3f2ec0ec88c5b1ca7
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Feb 24 17:27:51 2010 -0700
debugging
commit cdccd92f6ed97be7385e84de5694064cb8f43946
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Feb 24 17:25:28 2010 -0700
conditionalize use of git on executability of /usr/bin/git binary
commit 54dd7a200e6956aace5a580d4c4d6a10a13c654b
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Feb 24 17:22:45 2010 -0700
update changelogs for Debian build
commit 4b6b28530206c6fdbe46699b81746fbbcab5b148
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Feb 24 17:22:20 2010 -0700
see if this works
commit c74958d3e8c5ce8006a9f9f6853238fce0c77432
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Feb 24 17:13:29 2010 -0700
move git-using variable declaration into the prebuild target
commit cf091a7252eba09902a42a3cfe7b4d6a343907ce
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Feb 24 16:44:44 2010 -0700
update changelogs for Debian build
commit deccc10f0305c0cd02bf6317d6dc9d2ae38c3dac
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Feb 24 16:43:32 2010 -0700
add gawk as a build dependency since strtonum is a gawk extension
commit ac45da6e61597dcdb119b976f7301b2cc7fdced4
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Feb 24 14:57:26 2010 -0700
update changelogs for Debian build
commit 24912821b3230b8357b9e0094cd69fa0bccc5513
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Feb 24 14:53:27 2010 -0700
update changelogs for Debian build
commit 82fdbfe1229d1ea5e6906ea240d54b3da73d9a69
Author: Keith Packard <keithp@keithp.com>
Date: Sat Feb 20 21:35:43 2010 -0800
Must install .map files for ao-load to work
ao-load uses the .map files to rewrite the serial number and other
config parameters into the program flash.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a5215c2bd9249a285fc834db0c453fb3e7daed87
Author: Keith Packard <keithp@keithp.com>
Date: Sat Feb 20 21:20:05 2010 -0800
Add back stack size checking to altos linking phase
This verifies that the stack start specified during the compile
will work with the resulting program
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 18eeb79026f7e5c54bf99435537c024427011a36
Author: Keith Packard <keithp@keithp.com>
Date: Sat Feb 20 21:05:45 2010 -0800
Quiet make output.
This borrows ideas from the notmuch project to reduce the command line
clutter seen when compiling or linking stuff.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 004c2a9b7a4b44ef71ca60482573e8e9d8c6ce93
Author: Keith Packard <keithp@keithp.com>
Date: Sat Feb 20 20:36:08 2010 -0800
Update .gitignore files
commit 84c93bb2fc4558a5e4654794ba90e730a84eaf67
Author: Keith Packard <keithp@keithp.com>
Date: Sat Feb 20 20:22:16 2010 -0800
Change altos build process to support per-product compile-time changes
This creates per-product subdirectories and recompiles everything for
each product, allowing per-product compile-time changes for things
like peripheral pin assignments and attached serial devices.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fd0a42e0e96dcb8ecc9e999f70bcf70692692af9
Author: Keith Packard <keithp@keithp.com>
Date: Sat Feb 20 20:21:07 2010 -0800
Change barometer conversion code to shrink conversion table
commit 876e9a10b9096ead85fbe08ec9a6a0329cf7cbd4
Author: Keith Packard <keithp@keithp.com>
Date: Sat Feb 13 16:42:27 2010 -0800
Log GPS data on pad after boost detect.
This wakes up the two GPS reporting tasks and gets them to report out
any existing GPS data to the log file. To make sure the timestamps in
that GPS data are accurate, this also records GPS time on receipt of
the GPS data instead of when that is logged.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c83615567b4567f3dc45a7f7b894943b45fbb65c
Author: Keith Packard <keithp@keithp.com>
Date: Sun Feb 7 00:25:22 2010 -0800
Pull in a bit more data for filtering the start of the boost
commit f8967607b3dda0c0ce7afe8bb077da2da5ed3dcd
Author: Keith Packard <keithp@keithp.com>
Date: Sun Feb 7 00:24:56 2010 -0800
Compute daytime using GPS as time base
commit 2a6350149407c7d2e7d143906c40c5e331248aeb
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 11 18:48:56 2010 -0800
Missing ao_mutex_put in gps_dump
commit 9856b7c4397afcecc8f541af9a83824e817b3612
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jan 10 16:31:50 2010 -0800
Switch to using internal cc1111 temperature sensor
v0.2 has no temperature sensor, and several of the v0.1 boards didn't
get a temperature sensor loaded. Use the internal temperature sensor
on the cc1111 in all cases instead.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0c2533be15858774ef9381aa8c8344356fd5b971
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 9 22:06:19 2010 -0800
Force idle mode by shorting the SPI clock to ground at boot time.
This allows you to override the flight mode detection code in case the
accelerometer calibration is broken somehow. Hold the SPI clock shoted
to ground until the LED comes on, then remove it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 28346736a7799c0767e54511d9949cd61d35e471
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 9 20:57:48 2010 -0800
Add simple gps dump command 'g'
This just dumps out the data in a very simple format to verify the GPS
receiver.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a6082a8b4501ac4cb18584ace1f0c40e088e5484
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 9 20:57:29 2010 -0800
Remove flash debugging printfs
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 05bb953830604721c9a49dd56256b86f3666b5ff
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 9 20:42:57 2010 -0800
Don't set ao_flash_setup_done until we're actually done.
Because we're accessing this variable outside of the mutex, we need to
make sure it isn't set until the data it covers has been initialized.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 327e5e782958e516a7b7a786ab6c176b0decb8b8
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 9 20:04:42 2010 -0800
Dump config block from read/write config and flash_status commands
commit 05e5bb2d330b755967d06fb859585c81f5f5fbb5
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 9 19:46:46 2010 -0800
Dump more flash parameters for the flash_status command
commit d4c8895b349998e02e03ed83466a0ca7afb3d99b
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 9 17:57:52 2010 -0800
Add 'f' command to display flash status register contents
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c1334f712f01543adb10809bc1a3ca120e27290b
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 9 09:55:04 2010 -0800
Add at45db161d.h header file for new flash part.
Forgot to add this when I added the driver.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a0d4c1b06d27e850d233f8ddf8fe32912bf0ec8f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 9 01:29:41 2010 -0800
Remove green LED and temp sensor from v0.2 code
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dc8d18736239b14c2ec48a40a01515912c5c25e6
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 9 01:22:06 2010 -0800
Add AT45DBxx1D driver
This driver supports the AT45DB011D through AT45DB321D DataFlash
parts as found in TeleMetrum v0.2
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3bab7e66d25988f5d63ec139c8814a85b983f8f3
Author: Keith Packard <keithp@keithp.com>
Date: Sat Dec 19 20:32:18 2009 -0800
Remove dbg driver code from telemetrum/teledongle
The only board with debug outputs is the TI dongle at this point, so
the debug modules were disabled in TM and TD some time
ago. Unfortunately, the code was not removed then.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit eddb82390a0ecb07ef83c04861993842906b03ab
Author: Keith Packard <keithp@keithp.com>
Date: Sat Dec 19 15:31:36 2009 -0800
Ensure that ao_alarm waits at least the specified time
Because the timer tick may happen soon, it's important to delay by
another tick to ensure that we don't wake up early.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 598d168bd6552c3756e4b0267de44147eadab9f6
Author: Keith Packard <keithp@keithp.com>
Date: Sat Dec 19 14:03:11 2009 -0800
Disable monitor mode before attempting radio test.
If monitor mode is left active, then the radio lock will not be able
to be acquired for the radio test.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d4cf1446680d8b47396bcda338e8df7af395d102
Author: Bdale Garbee <bdale@gag.com>
Date: Sat Dec 19 13:53:38 2009 -0700
update changelogs for Debian build
commit 10d1bbcd9709a5eee8d50989215242b16feb7232
Author: Keith Packard <keithp@keithp.com>
Date: Sat Dec 19 11:34:16 2009 -0800
Use ao_radio_get/ao_radio_put in packet code.
The ao_radio_get function both acquires the mutex *and* configures the
radio channel and frequency. Failing to use this in the packet code
would leave the radio frequency unconfigured.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a15abc1882a3bdd2c980eed169f3b80337528390
Author: Bdale Garbee <bdale@gag.com>
Date: Sat Dec 19 12:15:29 2009 -0700
update changelogs for Debian build
commit bbb152c712801653374a8f82869e2e8bf41f7279
Author: Bdale Garbee <bdale@gag.com>
Date: Sat Dec 19 12:05:40 2009 -0700
update changelogs for Debian build
commit 7ac8efea5d60b81adccdc1e38ac4c13facfae7c9
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 15 23:58:29 2009 -0800
Add --cal to man page
commit 5481082b18226a0de6b377215b3b330bdbc4a6c6
Author: Keith Packard <keithp@keithp.com>
Date: Sat Dec 5 19:50:38 2009 -0800
Allow radio calibration to be set from ao-load
This moves the initial radio calibration value into const memory where
it will be used if no eeprom configuration value is available, either
on an unprogrammed board with eeprom or a device without an eeprom.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 46f03ab3145a61139c8ca6fc99e8f2798728b5a9
Author: Keith Packard <keithp@keithp.com>
Date: Sat Dec 5 15:36:12 2009 -0800
Re-order config values. Change frequency to cal
Place more often used values at top, and consistently call the radio
value 'calibration' instead of 'frequency'.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bf29a62532fec12e6af2d2f3a6624882c863e933
Author: Bdale Garbee <bdale@gag.com>
Date: Sat Dec 5 11:03:42 2009 -0700
update changelogs for Debian build
commit cd49847f3125df1733f298b56a43e8027ab5ce05
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 4 23:38:26 2009 -0800
Add radio calibration configuration.
The crystal we use is only good for 20ppm, which generates a fairly
significant error bounds at our RF frequency. This commit adds a
configuration variable that sets the RF frequency control variable so
that the output frequency can be adjusted.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c671a3f31f54715284beef5baa4a72ca922e4018
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 4 23:36:54 2009 -0800
Make ao_cmd_decimal produce both 32 and 16 bit values.
ao_cmd_lex_u32 is produced in addition to ao_cmd_lex_i so that
functions can easily read 32-bit values from the command line.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e6d6ad66ce177eb6e49eaa04b1ecc6426f4bbdbf
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 4 23:35:40 2009 -0800
Remove send_serial and serial_baud commands.
No longer useful, and they take up space.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ce7325cefbbe91054c1e8174cf40a6c687f6694b
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Dec 4 21:02:07 2009 -0700
update changelogs for Debian build
commit 9a1d7dd78c07d18954ef620b6ed25d6701df21e2
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 4 14:35:39 2009 -0800
Change default callsign to "N0CALL"
commit 291e2004e77debdc1543912cf11043c849305de8
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Nov 26 11:18:37 2009 -0700
update changelogs for Debian build
commit 40533095a96b6c6364eebdc4b7d53c4eabe72e9a
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Nov 26 11:16:04 2009 -0700
update changelogs for Debian build
commit ab1075e7219b02258c1613d93379582be4168947
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Nov 26 11:15:13 2009 -0700
change home URL in control file to be the AltOS page
commit d34dcc5f3616e59ee90ed172770fe2a3eb1e0cac
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Nov 26 10:40:07 2009 -0700
fix absolute path in debian/dirs, add Suggests for slim-altusmetrum
commit ea40561b36519a5dcabedabe18672b79ea5e9993
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Nov 22 10:18:44 2009 -0700
update changelogs for Debian build
commit d6ba07e885bdc62ba64719c9d8cc42fcecbcb09d
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 22 01:10:44 2009 -0800
Automatically extract flight number for eeprom and telem filenames.
Extract flight number from either telemetry or eeprom files and use
that in the resulting filenames. To ensure that files remain unique,
add a new field, -seq-%03d. This is appended only when the sequence
number is non-zero as it shouldn't occur in normal usage.
This also eliminates some duplicate filename creation code in the
library and aoview sources.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 06cebd1026dc1bd6ee51526fa2d02905df3b3b37
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 22 00:52:58 2009 -0800
ao-postflight: don't try to use missing gps sat data
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a9ada1b538af3308e1b22bd024d9204521184173
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 21 22:12:21 2009 -0800
ao-postflight: compute barometric alt for each GPS position
Print that to the --gps file, and use that in the --kml file for the
altitude. Gives a very different picture of our flight tracks,
presumably far more accurate (at least in altitude).
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b84b634d9ae8ce6ab1c02833a3ed8514404e1ca3
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 21 22:11:45 2009 -0800
Don't crash if --plot isn't passed on ao-postflight command line
Crashing is not nice.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2d77c18b15834046b7b79d49d87211828f2409e9
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 21 21:10:09 2009 -0800
Convert telemetry file GPS satellite information in cc_log_read
The satellite info wasn't being correctly converted from telemetry
files to the data log structure, so ao-postflight was not seeing it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1e7fb61700f1f6f2ed5fdbc4380d7187b0cd187b
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 21 21:09:03 2009 -0800
Fix --plot arg handling. Add -all option.
The --plot file name handing is special as the library wants a
filename instead of a stdio file pointer.
Add a --all option that just creates all of the possible outputs.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 199f0cecae22645140185238682b9e1aba0e5715
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 21 20:36:20 2009 -0800
Make TD print 0000-00-00 for invalid dates.
This 'shouldn't' happen, but in case it does, I want to know about it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 238d03462a56dc1b7c871608cb00f961a88c1b97
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 21 20:35:22 2009 -0800
Make ao-postflight create filenames using input filenames.
Instead of requiring the user to provide names for the various output
options, just create them from the input name by replacing the extension.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1a3b4c02a01187f8b7b9a9c97712476d0007ab35
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 21 19:52:26 2009 -0800
Document ao-postflight --gps and --kml options.
These were missing from the man page, but included in the --help output.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 80b23f3044a654d61212891a61fadb8a3a4e5572
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 21 18:57:45 2009 -0800
Decode HDOP data from skytraq GPS
The hdop data was getting dropped on the floor, but is rather useful
when deciding if the GPS position is crazy or not. This reports HDOP *
5 (giving a useful range of .2-50).
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8f036ee7cd30ce3ed2e5cc8501914a4c19b73875
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Nov 20 13:19:02 2009 -0700
update changelogs for Debian build
commit 87e6f3e5c1688503ab8595912d8d6eb7139830b7
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 20 12:16:37 2009 -0800
Eliminate SiRF state values from ao-view.
With Skytraq not having any visible GPS state information, just
remove this from the display.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8065b8146a31438e66f83c13b99281ec47439a73
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 20 11:56:48 2009 -0800
Add GPS date/time output to ao-postflight.
GPS date/time information was already being stored in the log, it just
wasn't getting displayed by ao-postflight.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6894541e0ee144bfc689cc02d4ed333711d3b500
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 20 11:55:28 2009 -0800
Reduce igniter firing time from 500ms to 50ms.
Given that the system will brown-out with the longer pulse, it doesn't
make sense to even try; failure at 50ms probably indicates a short.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b75aa1c825b84bd7fa1578320fbc7e904c373a7d
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Nov 19 21:43:13 2009 -0700
fix typo in comment
commit c2f661b75ec035f6a3f700962290ef297f9ab0af
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Nov 20 11:44:06 2009 -0700
update changelogs for Debian build
commit b0d7e3f9c9322542e9b649bb6ad7f7e5bb99dffa
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 15 16:20:18 2009 -0800
Stop using SiRF state info.
With the switch to the skytraq GPS unit, we don't have the same level
of detail in the GPS stream, so stop reporting that in the telemetry
stream, in the UI and writing it to eeprom.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 524665fc221b0d483453c67b7211e282cebc8980
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 15 16:04:41 2009 -0800
Add date to GPS data, captured from GPRMC packet.
Pull the date out of the GPS stream and send it over the telemetry
link and write it to the eeprom.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3ee279ba76c2a79d142c466f19ef758cf4c01d70
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 15 15:59:01 2009 -0800
Add flight number to telemetry stream.
This makes it easier to tie the telemetry and eeprom files together as
they're now both labeled with serial and flight numbers, which should
be unique.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6391c89bd5b89f5f46255b8365c658a873e5959a
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 15 15:53:01 2009 -0800
Switch order of serial/flight in ao-postflight summary
commit 9b06e294e2777f69bcf5e98789c3f5477097d53b
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 15 15:51:58 2009 -0800
Enable telemetry receive in ao_view
commit 4cffc9c4b079e39c8196ddbaf91129cda6df7f8b
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 14 22:24:37 2009 -0800
Share telemetry parsing code in cc library.
ao-view had a private copy of the telemetry parsing code which
included the ability to parse the newer version of that file. Those
changes have been moved to the library version and the private copy removed.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0e0db8ca3af4c07bae909938486766c646bf580b
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 14 22:24:09 2009 -0800
Provide a dummy 'uninstall' target in the src directory.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1c654a9369294c9b8066c33f91161d8005b96680
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 14 22:17:24 2009 -0800
Loosen tolerances for main->landed transition
Detecting that the rocket has landed is required for the system to
flush the eeprom log and re-enable the RDF beacon. This patch changes
the landed state entry requirements for the accelerometer to require
only that the accelerometer stay within a quarter of a g (down from
1/10g) and changes the testing interval from 20 seconds to 5
seconds.
The requirement that the barometric altitude be within 1000m of the
launch altitude and that the barometer change by no more than 0.05kPa
are unchanged.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 03092d1a72a9651711e22c58dca6d6aba5705c5e
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 14 16:35:12 2009 -0800
ao-postflight: fix sloppy gps sat data realloc code (was crashing).
Realloc'ing the wrong data, and failing to set the realloc'ed size was
causing ao-postflight to crash while reading long logs.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit adf656192441eb7f44792955c86e469145477e29
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 5 22:11:59 2009 -0800
Return radio to telemetry settings when packet system closed.
To receive telemetry after disabling the packet system, the radio must
be reconfigured for telemetry mode.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 83afdbdc154fe013bfe35ce5ecf1d61570b04ed6
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 5 21:45:00 2009 -0800
Add reboot command.
This resets the processor using the watchdog timer.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0358988ac0ee25a564d48af79b1c3fb0c0fe0a88
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 5 21:44:31 2009 -0800
Add Watchdog Timer Control register definitions
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4114210e0b813f4af99d0cb7755ad2ac2c4b120e
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 5 21:43:21 2009 -0800
Move ao_match_word from ao_ignite.c to ao_cmd.c
This is a generally useful command line utility.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5a79a04ddb0b3ee64de34e366f71a0f6db509c01
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 4 21:59:51 2009 -0800
Stop recording in ao-dumplog after receiving an invalid block
If no samples in a block are valid, assume the flight log is over.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 843ee489aac34ad6d81f55f1c85fb9eecc42d86b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 4 21:59:12 2009 -0800
Flush pending input when switching to remote packet mode
Any pending input would just confuse the application, so pull it off
the link and dump it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 036400a2db303f3db3be7cc0426f88359c6bd2b1
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 4 21:42:51 2009 -0800
Explicitly use USB I/O routines in packet code
Using the implicit stdio functions (putchar/getchar/flush) would
result in essentially random redirection of each, depending on whether
the packet code had characters available when getchar was called. This
would cause lockups in putchar.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3ece984f4d72b4f720a5efdfaad7cff77a93d676
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 4 21:32:07 2009 -0800
In USB pollchar, wait for packet before re-checking USB out len
This probably wouldn't actually cause a problem, but it seems more
reliable to wait for a packet interrupt before re-reading the packet
OUT len register. This could avoid spinning while waiting for a USB
packet, which seems like a good thing.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bc62bb254085cc705203b57260c04ac5e14c6611
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 4 21:29:37 2009 -0800
In packet master, move USB flush from packet thread to echo thread
This keeps the packet thread from blocking on USB and also makes the
flush happen after every packet (slightly more USB traffic, but
packets are slow anyway).
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 27ebaf8e13aed06bb1ea6e770f767495a02be6c5
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 3 01:27:37 2009 -0800
Add ability to dump eeprom data over radio link.
This adds a '-R' option to ao-dumplog to redirect the connection
through a USB attached TeleDongle over the radio link to a remote
TeleMetrum device.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1de322b960005c9a16051afa1881fadb00f4bcd6
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 3 00:40:38 2009 -0800
Pass accel calibration over telemetry stream. Telemetry data format change.
This allows the ground station to convert the accelerometer sensor
values into acceleration and speed data. This requires a new telemetry
data structure, and so TeleMetrum and TeleDongle units must be updated
synchronously. ao-view will parse either telemetry stream, and the
serial format from TeleDongle now has a version number to allow for
future changes.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b529e5e8998702986909111a457f3ce9932e1ccf
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 2 23:48:29 2009 -0800
ao_flight_test was using accel value for pressure too
commit f57bea012d4fbca097df0d98fcd30eb4abd9701a
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 2 21:47:41 2009 -0800
Reformat ADC values to show all 16 bits
commit 79718e798e96567f0ba11c61f187e432fdcf95ee
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 2 21:48:16 2009 -0800
Remove "f" command
commit a4137263b69864c524d39c6ff88a0225fd06e79b
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 2 21:47:15 2009 -0800
Remove "d" command
commit 47f510464907d2b9488109c96ade87a41d878842
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 2 21:46:39 2009 -0800
Remove "l" command as ao-dumplong no longer uses it
commit 144db05f6b286a0450d486f69ce192632a2c0656
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 2 21:38:18 2009 -0800
Add two-point accelerometer calibration.
Calibration now uses two values, one upside right and the other upside
down instead of a single horizontal value. This allows the use of
other accelerometers and compensates for variations in the divider
circuit to provide more accurate data.
commit 17611788aadc9460287145a340a7c18bf63766aa
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Nov 2 16:54:06 2009 -0700
update changelogs for Debian build
commit 7db9d86178ecfd58cc1c17ac9fcbdcfd2f13aaec
Merge: b219801 f9de200
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 2 15:47:40 2009 -0800
Merge remote branch 'origin/master'
commit b219801fb0e5eaff7778d21701da977104522da3
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 2 15:45:58 2009 -0800
Add ao_usb_pollchar to ao.h
commit b92333ff5e75bf96804359e9fbf464d3b518bd95
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 2 15:45:42 2009 -0800
Disable interrupts while removing tasks from task list
commit d519564fd08d2defe1211de83ccbdfa3c7cfe702
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 2 15:45:07 2009 -0800
Add more docs to the README file
commit f9de20000794c97a04d5bc2476191864bd2af371
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Nov 2 16:00:11 2009 -0700
update changelogs for Debian build
commit 127c3125e5a4b86b8f304bc2889e313688c3d83e
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Nov 2 15:59:12 2009 -0700
update changelogs for Debian build
commit 6b1e77569e2fed3c44606ed268421df5d3ed4020
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Nov 2 15:57:41 2009 -0700
update changelogs for Debian build
commit 8203bfa58af32a1d07a44c1c151b200df0b65f15
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Nov 2 15:56:42 2009 -0700
de-version the libreadline-dev build dependency
commit 0b483233118673cbc2cda1be6acd379df82bc95a
Merge: ca5d323 550482d
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 1 20:59:02 2009 -0800
Merge remote branch 'origin/master' into skytraq
commit ca5d323a3d206050d95f52a61e92c69e1f54e7b5
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 1 20:57:03 2009 -0800
Enable packet-based communcation to command processor
This splits the packet code into master/slave halves and hooks the
slave side up to the getchar/putchar/flush logic in ao_stdio.c
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6c1a9ce16b966a21c885bf3be31cbcb85368b3fa
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 31 01:30:22 2009 -0700
No need to wakeup &ao_tick_count now
commit cd0d495d7ef276956e730196476daa70a4359918
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 31 01:20:26 2009 -0700
Poke master to speed up packet rate when things are busy
commit 442b1ef18c8320d4e5329dc92bb5268a36058fc5
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 31 01:19:41 2009 -0700
Use ao_alarm for ao_delay so it can be easily interrupted
commit 4f7ed9ff484778381db647c27d2a34d0cadec41e
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 30 23:53:03 2009 -0700
Do more flushing in packet test code
commit 6a7aa1810a90a9216160aec55ec4bd02b3240e1b
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 30 23:52:44 2009 -0700
Add RFIM register
commit bf65e0b2a1299b49adc2d339ab9d9c7599aded9e
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 30 23:52:22 2009 -0700
Send SYN packet to set sequence numbers
commit d46797e5c08d4955d516458185e2cfb51ee2d567
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 30 23:51:38 2009 -0700
Use ao_radio_done to wait for TX to completely finish with packet
commit c5ec6fcfa1bd17aad0f85d2fbe603f1d125836e6
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 30 23:50:54 2009 -0700
Switch packet code from timer thread to ao_alarm
commit b428faf74ae145126ec1da972028fcfe0b4b2b18
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 30 23:48:36 2009 -0700
Remove reason from ao_dma_abort
commit 73db30b2f9128c37dc7fa075793a8862814ce044
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 30 23:46:21 2009 -0700
Add ao_alarm
commit 251b0971f049cbf2f8db79a32729d47441ce65f3
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 30 23:45:43 2009 -0700
Wait for TX to finish sending data
commit 9b31f07fe3556896b3e997bba156e30ef5777a80
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 30 23:43:52 2009 -0700
Add radio carrier command
commit 7b14c3e609749f4fc00dbd660541375048535218
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 30 16:39:15 2009 -0700
Initial packet bits. Just testing transmission
commit 690fc263516d8beb6b24e86fbcd6588f42ce4e5c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 21 17:18:49 2009 +0900
Add keyhole-markup generation for ao-postflight.
This lets you see the flight path in googleearth.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b657aa209b9ea3b3efd33a940283b3ba60a169af
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 16 12:59:53 2009 +0900
Add ao_wake_task and ao_exit
ao_wake_task signals a specific task to wake up.
ao_exit terminates the current task.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d709a0688eff84e25e24d755850ef045d6b0c3de
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 16 12:56:45 2009 +0900
Save some DSEG space by marking cmd functions __reentrant
__reentrant causes the compiler to place args and locals on the stack
instead of in the data segment.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 550482d953c491a5ede9f2d243493afb13289898
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Oct 12 16:58:46 2009 -0600
update changelogs for Debian build
commit 2de548f45d0f50b558acc83f57e1e2fc1223ab92
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Oct 12 16:58:19 2009 -0600
oops, forgot to specify the repo to push to
commit 68008ac11c2735ca53a1b474324df43f2f1d5cdd
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Oct 12 16:57:33 2009 -0600
update changelogs for Debian build
commit 513328ac5f7c25f9ee144ab6befbea60d69eed1a
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Oct 12 16:56:50 2009 -0600
automate push of updated and tagged master branch during debian/rules prebuild
commit 67bf7d388a6dd2dbf65575bf4f0423ad355b4f2f
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Oct 12 16:54:44 2009 -0600
update changelogs for Debian build
commit 23bc21a93ccb9f35917f283ac5df6ce0870df71a
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Oct 12 16:54:16 2009 -0600
undue damage from partial build
commit 7da56ad8576ef212ffb6cb573bdaf578453e3fe0
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Oct 12 16:52:52 2009 -0600
add support for tagging git repository on each Debian package build
commit 8d4aa4ee54f85f4951cdd7293d58aaa405cfcdc5
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Oct 12 16:49:34 2009 -0600
update changelogs for Debian build
commit 241a860fe856b1dfad6e792736313648300d5c24
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Oct 12 16:48:43 2009 -0600
flush repetitive junk out of debian/changelog, and update the prebuild target
in debian/rules to put git commit details into the Debian changelog
commit 6c4cdc927b43736b39be29d23ac3dc723f69e4d6
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Oct 12 15:57:19 2009 -0600
update changelogs for Debian build
commit c57bd7fd2f80e50b0b4c87fccb024ab07c93773d
Merge: adf8764 2b76572
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Oct 12 15:57:08 2009 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 69b6f6bb465163cf767bb68e0e4a716d8ad2b39c
Merge: bc77da6 2b76572
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 10 17:16:21 2009 -0700
Merge branch 'master' into skytraq
commit 2b765728ce177e26899f6feef00bfdf6aeaf2678
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 10 17:15:38 2009 -0700
Add apogee igniter delay.
Provide for a delay after apogee before the drogue charge is
fired. This allows TM to be used as a back-up altimeter.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bc77da68c9cb7d4cca483eadbbb7e9ccf71c0060
Merge: 46cccf6 8f7ea3d
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 10 15:09:48 2009 -0700
Merge branch 'master' into skytraq
commit 8f7ea3de7037f40b0ff462b60d503c19431ae62b
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 10 15:08:14 2009 -0700
Report igniter continuity in pad/idle mode via beeper
one short beep = drogue
two short beeps = main
three short beeps = both
one long warble = neither
In idle mode, it does this just once. In pad mode, it keeps testing
and reporting.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit adf8764bc4591795ba4e618ccbd6393fc6ce6450
Author: Bdale Garbee <bdale@gag.com>
Date: Sat Oct 10 15:11:23 2009 -0600
update changelogs for Debian build
commit 541da6f3bbf81be93dfe3c01f7c8cfd757b28a2b
Merge: dfc73cb 5f26ad6
Author: Bdale Garbee <bdale@gag.com>
Date: Sat Oct 10 15:05:50 2009 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 46cccf62fb40514b5930fcb2ffdaf2735415c764
Merge: fb8f3fe 5f26ad6
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 10 14:00:03 2009 -0700
Merge branch 'master' into skytraq
commit 5f26ad663b3f60dddc9d967206e365f45dc4acd1
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 10 13:58:16 2009 -0700
ao-dumplog: switch to 'e' command, display progress
Using the 'e' command allows additional checking of the data,
including end-to-end checksums and detection of missing data.
Progress is displayed by showing the recorded flight state along with
a '.' for each eeprom block read.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fb8f3fee6a1bab1e46d782e84405845cee2dadb4
Merge: 22856cf b8fc397
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 10 13:41:00 2009 -0700
Merge branch 'master' into skytraq
commit b8fc3975bd92037a0cf53b0ff2b0e05ce0ba668f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 10 13:39:01 2009 -0700
Send 0-length IN packet to flush USB after full packet
USB bulk transfers are a sequence of maximum-sized packets followed by
a short packet, which signals the end of the transfer. When the last
packet of the transfer would be a full-sized packet, an additional
packet of zero length is sent to signal the transfer end.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 22856cf8bb0f5e1f37c9b774132d9ef6934526ed
Merge: 2f76034 e29961f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 10 11:44:20 2009 -0700
Merge branch 'master' into skytraq
commit e29961fdb2a48874c895829880eadbf13e094c0c
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 10 11:43:31 2009 -0700
Add channel menu to ao-view.
Sets radio channel when TD is connected, saves selected channel in
gconf database.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2f7603490a169df8f18b565db4fa967832ffc9bd
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 9 22:48:29 2009 -0700
Build two versions of TM, one for SiRF, one for SkyTraq
This creates two separate images, depending on which GPS unit is
connected.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 33b0b6f2f2e07de105619a7b463226d2813152ab
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 9 22:02:40 2009 -0700
Add support for the SkyTraq GPS unit
This is a build-time option selected by hacking the Makefile at present.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a3771bfc5ce740f9d89193e9f8b1d7987aa57264
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 6 20:06:00 2009 -0700
ao-view: fix snd_pcm_open return checking
I don't know how this code was supposed to work before...
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ac4b8a73848f434999a532eab4665253c267c597
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 6 20:05:36 2009 -0700
ao-postflight: dump out GPS signal data
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dfc73cba1bee8b121e00e8cba45e7dfaaf79e9d8
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Sep 21 22:46:59 2009 -0700
update changelogs for Debian build
commit 459ff3d377297f80ee2fba0df0a29ff6603467a1
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Sep 21 11:00:32 2009 -0700
update changelogs for Debian build
commit 327c64305a59f48ababf19875874a550af6b9cef
Merge: c8a81a4 74f0fb4
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Sep 21 11:00:22 2009 -0700
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 74f0fb4dd189abc1d5027c64fa5a648a6003285a
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 20 13:33:59 2009 -0700
make bit-banging reset script actually reset
commit 7ea371a09385e2a93199f78685e8cb86793ed104
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 20 13:33:26 2009 -0700
Add --gps option to ao-postflight
commit bc7ccb339e538a0e6120db0e5c0d9130c565e0dd
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 20 13:32:59 2009 -0700
ao_rawload: Don't reset after we finish loading
commit c8a81a419f7f2331624f90bd6c107a86f6b04451
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Sep 20 09:21:00 2009 -0600
update changelogs for Debian build
commit df42ccaaf468cdc5d93cbd1c001f58df58419722
Merge: 0b24e40 078e9cd
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Sep 20 09:19:28 2009 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 078e9cdbdb388b22c6151f76ff0660fc14b8ef55
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 10 11:53:06 2009 -0700
Plot raw accel data for the motor accel section.
This shows a short sequence of accelerometer data without any filtering.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8b485d937ff148848ebda7f9ca6be29bb1de1f16
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 6 21:02:48 2009 -0700
Show acceleration only during boost phase.
We're interested in motor performance; the rest of the flight is
boring, after all.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9e660315e1bd2bf71ab1c0574e895e1f7608a58f
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 6 21:01:44 2009 -0700
Fix cc_period_make to not get stuck on samples with matching time
When two samples have matching times, step to the second one;
otherwise, we'll get stuck forever.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 932f1539b38567e565fd484171c13539b1467308
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 6 20:26:17 2009 -0700
Color plots, integrate only flight portion of data.
Telemetry files have piles of pad data which shouldn't be integrated
into the velocity data as it tends to generate huge values from the
noise of the sensor.
Also make the data lines colored to keep them visually distinct from
the rest of the plot image.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9177f5f4e9d832558ddd9ab227c4511f6201e7e5
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 6 18:11:24 2009 -0700
Update usage and man page for ao-postflight
commit 0b24e4034f93010372a3d084668d10f0e4a2c2e1
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Sep 6 18:01:20 2009 -0600
update changelogs for Debian build
commit a5e94aa0677070a051714443cf7fd7e2b5e90269
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Sep 6 17:59:47 2009 -0600
need a run-time dependency to pull in the cairo module
commit 97acef95cc9843998963921459fdd71dd7eaa6b4
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Sep 6 17:48:23 2009 -0600
update changelogs for Debian build
commit 3f95a5abbf8ada70328ced45fbb2781ed1cb3d29
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Sep 6 17:48:10 2009 -0600
more build deps for plotting lib
commit 9d7e96e323d652de08b2f2a73e0eb3c321080185
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Sep 6 17:47:56 2009 -0600
update changelogs for Debian build
commit ae4e131b61244e06020b82919e31e05dd7dba88f
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Sep 6 17:46:39 2009 -0600
update changelogs for Debian build
commit 37e6c9a492a1d51373bf9333fb3172e0c377720f
Merge: d256f82 2e6686b
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Sep 6 17:46:10 2009 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 2e6686b1e183c66188ea447b8a54e4c29402443b
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 6 16:45:47 2009 -0700
Use plplotd instead of plplotd-gnome2
commit d256f8204e9fce53ae4309562bb4c0cde1fae43e
Merge: 0fc344d 32d3536
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Sep 6 17:34:08 2009 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 32d3536706324808df6cd02248a236302b831571
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 6 16:24:35 2009 -0700
Add plots to ao-postflight using the plplot library
It's not perfect, but it generates .svg plot output.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0fc344dfc031a8b1eef7cc40efb1d5ba7782269d
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Sep 6 14:15:57 2009 -0600
update changelogs for Debian build
commit 4b0de757874c0ecaf38e3dfd3beefc398150e3d5
Merge: 773c4ff d0eac98
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Sep 6 14:15:53 2009 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit d0eac989b1ffc8ae30ba12da403eb4bf1ad42d6b
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 6 13:15:10 2009 -0700
Don't look at NULL strings (summary_name)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 73f4a57239f770aff603b961169c0e2cfe2c276b
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 6 13:08:54 2009 -0700
Use pressure speed for drogue and beyond states. Fix differentiation time.
Drogue state should always use pressure speeds.
Differentiation code was using centi-seconds instead of seconds.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 773c4ffbc1d2e02eb02cfa543a077a408986da30
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Sep 6 14:05:55 2009 -0600
update changelogs for Debian build
commit 45ede4a4b203ef9da5bf05c49cb9c5a2e6382ec5
Merge: 45e2938 e35e485
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Sep 6 14:05:51 2009 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit e35e485ffe6b26034788ab295121bc2693b7eec1
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 6 13:04:31 2009 -0700
Initialize summary_name and detail_name so stuff appears on stdout.
Uninitialized variables lead to mysterious results.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 45e2938121411d1fc9b3aec3fdeaaeb3c90db5ed
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Sep 6 14:02:14 2009 -0600
update changelogs for Debian build
commit d42ebf0661ecf15455e5051de1e16ae66f8dd857
Merge: 384dbe9 7a19aac
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Sep 6 14:02:09 2009 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 7a19aac5e881e635962a64fff73027ca2143b96f
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 6 12:51:48 2009 -0700
Add DSP code to filter data, allowing for integration/differentiation
This adds the computation of speed from both accelerometer and
barometer measurements and then presents a periodic flight profile
using filtered data as a detailed flight record.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 384dbe9fc7fa8e4e5dceec5e150f0f1d3383bbdc
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Sep 6 10:40:06 2009 -0600
update changelogs for Debian build
commit 35c54b3a278fa9bc2bc7f4b5ee04866697c93ba0
Merge: 4f8eff7 6d018ab
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Sep 6 10:39:23 2009 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 6d018ab933832e2d80bb1564c339d9fb18b57be2
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 5 22:45:49 2009 -0700
Handle vageries of .telem files in ao-postflight
Telem files have multiple entries of the same state, and sometimes
long gaps between recordings. Deal with this as best as possible.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c46e832b28820d7c5be4efaacbbd7c0607927fe5
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 5 22:03:31 2009 -0700
Add simple post-flight analysis tool (ao-postflight)
This tool reads either an eeprom or telem log file and displays some
rudimentary data (max accel/alt for each flight stage).
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 26f56b51bd11aa91f1d77b81827b49c28cb6ec5f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 5 00:29:26 2009 -0700
Add ao-dumplog to capture flight log from command line
This duplicates the functionality of the flight log stuf in ao-view,
except from the command line where it belongs.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 73adae3661160d410dcc802873b530d255c210e5
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 4 15:30:22 2009 -0700
Add --device/-D support to the command line tools and manuals
Use the new cc_usbdevs_find_by_arg function to locate suitable target
devices connected via USB.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4f8eff7401ee2d8092ab36fa33411f9b23dda880
Author: Bdale Garbee <bdale@gag.com>
Date: Fri Sep 4 16:03:55 2009 -0600
update changelogs for Debian build
commit 332b056459b1352e233a8bf5f08498df12d32160
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 4 15:01:32 2009 -0700
'fix' ao-eeprom to read two blocks at once. Work around kernel bugs.
The kernel appears to leave serial data undelivered at times. Reading
two blocks at once appears to make it relinquish the queued data.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit df88ae4c5f229efcc0ea5cb0a81fc2bb8f96fea2
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 4 14:23:02 2009 -0700
Add 'ao-list' utility to show attached AltOS devices
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0935d6a7e907e20381a42882ae728051f9bece02
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 4 14:21:19 2009 -0700
Parse the USB serial number as an integer.
AltOS devices use simple integer serial numbers, so parse the USB
value as such to make matching values more forgiving.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0c771d999914f9d17c723900f2987acc45fd0fbb
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 4 13:00:02 2009 -0700
Move usb scanning code to ao-tools library
This will allow the scanning code to be used by the command line tools
as well as the ao-view GUI.
Now that ao-view depends on the ao-tools library, it has been moved to
the ao-tools directory as well.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 15341b6e6dcf52df083d6aa37ef881ea6ad48ee5
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 4 12:25:37 2009 -0700
Set all of the values to reset the radio for telemetry
Was sizeof(rdf_setup) instead of sizeof(telemetry_setup) when
resetting the radio back to telemetry data mode from rdf mode. With
the length value removed from the rdf config, these two arrays are no
longer the same length, and so the last config value was not set
leaving the radio sending garbage.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fee46389b70a624ab5b1128a8b4c3083c7747bcb
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 4 11:46:55 2009 -0700
Make RDF beacon only run on pad and after landing.
It's pretty much impossible to RDF the rocket during flight, and it
interferes with the telemetry data stream. Leave it enabled on the pad
so that radios can be tested, and then re-enable it once the rocket
has landed.
This patch also turns the rdf 'on' time into a parameter so it can be
changed, and then sets that parameter to 500ms, once every 5 seconds.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 54545640b0db7747137655f84bc67fd290ecb904
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 4 11:45:52 2009 -0700
Add back the RDF tone generator
Tracking the rocket on the ground may be easier using tones than using
the digital data stream, so we'll try that and see what we think.
This reverts commit 3a3bfd471a868d546d83cdc431b53c8f5208edb9.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9fafee109e96435c96639b21211cac0500673a63
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Sep 2 23:18:15 2009 -0600
update changelogs for Debian build
commit cb4a73f3b65ba72f645fd37ab8712829c9537bf8
Merge: 9ddd869 e2e449d
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Sep 2 23:17:37 2009 -0600
Merge commit 'origin/master'
commit e2e449d5c23356e913f312de1fb2611a9dd5a352
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 2 22:01:52 2009 -0700
Remove bit-banging debug support from TM board builds
Our current TM boards don't have the wires to do bit-banging to
another cc1111 board, so it doesn't make sense to fill up their flash
with useless code (and the 'help' text with useless commands). Leave
this to the TI board until we have boards that can serve as debug dongles.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit acea083d80e1ecc4287083519ea666964016b257
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 2 22:00:37 2009 -0700
Make the ao_log_record structures 8 bytes again.
When the GPS signal strength data was added, the structure was
accidentally extended to 9 bytes, making all log records 9 bytes
long. While not a serious problem, this left log records spanning
across eeprom block boundaries, which seems like a bad plan.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7d39f17684feb49ac8a0017902158f298696e37c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 2 21:57:54 2009 -0700
Make eeprom reads and writes across block boundary work
Reading and writing across the block boundary was not stepping the
eeprom position after the partial i/o operation at the end of the
first block. This meant that the operation would re-use the end of the
previous block, either re-reading or re-writing it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9ddd8696b4004ccc03238d95a8c2a1d07075e0fb
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 31 16:48:03 2009 -0600
update changelogs for Debian build
commit 6926c4ab5d87a8f2eb4fcde2c673fb3a4639e115
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 31 16:47:44 2009 -0600
pixmap file should not be executable
commit 1495e2f27acde3743c3764a0c31ee082224d6c64
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 31 16:42:55 2009 -0600
update changelogs for Debian build
commit c8c5b7963babe8eb16e2651fba9cd2c8d1cba74e
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 31 16:42:37 2009 -0600
deliver an icon for the Debian menu system
commit 591b99c232e780246fc07841c09c8c4e7835facb
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 31 16:26:00 2009 -0600
update changelogs for Debian build
commit b34474c1f3083e73b7184d519f54d4c8031836fd
Merge: 8df1697 0d65bff
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Aug 31 16:25:32 2009 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 6358041f846ba9a20fa650c367d907dc4336e54c
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 22 13:38:56 2009 -0700
Enable GPS degraded mode, set 10 sec degraded timeout.
No reason not to let the GPS report solutions whenever it likes, let's
see how this works.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0d65bff443c17d4d98c18b620ec075ab66b30efd
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 21 10:47:46 2009 -0700
Turn off GPS tracking data when not present in data stream
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8df169791835510d96c11a3b0aa3cc5b79fa7fde
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 19 02:21:23 2009 -0600
update changelogs for Debian build
commit 42ab6d52540d0326ef89e9d57954b08248558468
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 19 02:21:06 2009 -0600
fix location for delivery of sources.list fragment
commit 977f5dc0bc7c666dcc1f21db77416efca0d696aa
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 19 02:11:11 2009 -0600
update changelogs for Debian build
commit 8d4d6655f1b4c2fbc522fd255bfb75406e5ddaef
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 19 02:11:00 2009 -0600
oops, aoview is now ao-view!
commit b9a97aea65f871fd287bc0bb566d8664766f4afd
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 19 02:07:16 2009 -0600
update changelogs for Debian build
commit 21e3dd0affac89919e5d0e29c6e9eb1eacb51801
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 19 02:06:49 2009 -0600
enable support for Debian menus
commit 0087c1776e0253fc2bd3b86f15bf9d1b32bdc45a
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 19 00:52:57 2009 -0600
update changelogs for Debian build
commit 4486d9156e19e4280b42bcd422d81d04f2d04a92
Merge: dd09f0b 33edd62
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Aug 19 00:49:24 2009 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 33edd62992a32b0ec8ca66d879fa300871db5937
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 18 23:38:16 2009 -0700
Update ao-view to add GPS satellite tracking data
This adds another column to the display to hold per-satellite GPS
tracking data and a count of the visible and locked sats.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 29687cbd462a332d9a36ed87500c5b737dcae3f4
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 18 22:35:15 2009 -0700
Handle GPS satellite tracking data
SiRF message #4 includes signal strength and GPS engine state for each
of the satellites being tracked. This data is now parsed and sent to
eeprom and the radio.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dd09f0bc2b950c00f3b489878cd69ad8a003f46c
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Aug 18 21:57:01 2009 -0600
update changelogs for Debian build
commit cd5ce661e2a8f9694933358ccb5b916fbed089c2
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Aug 18 21:49:39 2009 -0600
add support for building Debian package
commit d996aa9b32fb0eb385bd3d158256c29788a42fe3
Merge: b3b2d3c 7d4ceb7
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Aug 18 18:56:09 2009 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit 7d4ceb75a454e6c9b3fe0bd934fadcb5104dea36
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 18 17:55:22 2009 -0700
Add ao-ejection.1 man page
Document the input requirements and output format
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b3b2d3c475a135084b5628c730fc6fca1ba0817b
Merge: 4685fc5 da12b89
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Aug 18 18:36:03 2009 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
commit da12b89fb056a68e65ba363fef91d266727cb685
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 18 17:30:43 2009 -0700
Create ChangeLog from git log
commit 7d69e2b3715faed10ce21ad562fc4d25dfc5f9c1
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 18 17:29:29 2009 -0700
Fix ao-bitbang examples to not have . in the first column
commit 4685fc541466afbeefc151bcb64cd054739c048b
Merge: 1c2a0b6 c29275b
Author: Bdale Garbee <bdale@gag.com>
Date: Tue Aug 18 18:09:38 2009 -0600
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Conflicts:
ao-tools/ao-bitbang/Makefile.am
ao-tools/ao-eeprom/Makefile.am
ao-tools/ao-load/Makefile.am
ao-tools/ao-load/ao-load.c
ao-tools/ao-rawload/Makefile.am
commit c29275b72438637d46d7a50742882d2736eb176a
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 18 15:21:57 2009 -0700
Add manual pages for remaining commands.
Manuals written for ao-bitbang, ao-eeprom, ao-load, ao-rawload and
ao-view.
Manual for ao-dbg updated to reflect program name change.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9b03d620722dc54630539afba40720c30de69b2d
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 18 12:19:31 2009 -0700
Use --tty/-T on command line to specify target device
Also, use the ALTOS_TTY environment variable in all tools. Note that
the magic value of "BITBANG" switches the library to connecting
through a CP2103 instead.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7c790fe859dff062692964338091ffbbcdf63257
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 18 12:40:24 2009 -0700
Rename tools to ao-<foo>
Use a consistent prefix to make it easier to remember which programs
belong to this package
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1c2a0b6653623b689d68d7349a6b2dce3e20a4a6
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 18 13:36:54 2009 -0700
re-add debugger sources
commit 9a9cce5510b87252f863239ac807b9fb4395b288
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 18 12:19:31 2009 -0700
Start working on using getopt for the tty name
commit 9789ca5e8caa9a013e804f307b9da380e147bd75
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 18 12:40:24 2009 -0700
Rename tools to ao-<foo>
Use a consistent prefix to make it easier to remember which programs
belong to this package
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a5782398d968e7cb11f7203afada7c216f233b3b
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 18 11:34:28 2009 -0700
Remove unused cctools code paths for old libusb and cp2103 ioctls.
Communication with the CP2103 board has gone through three revisions,
first using ioctls supported by the CP2103 kernel driver, then using
the old synchronous usb library and now using the newer libusb
asynchronous interface. There's no reason to keep shipping the old
stale code now that the new stuff works reliably.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7cba411de0780c65e3490ab67186a514f0ea42ec
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 17 20:47:31 2009 -0700
test for sdcc, nickle and readline
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f48dcffae761700355a17b59345d55a60703f0c4
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 9 20:43:10 2009 -0700
Sync USB data after each memory write command
This makes sure we flush the USB link often enough for the other end to keep
up.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cd5456f18e4b39ad76d5549df91a0e0cfb18a2e9
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 9 16:08:07 2009 -0700
Handle partial ALSA PCM writes
The ALSA spec says that snd_pcm_writei will not return a partial write, but
at least on the OLPC, that's not true. Deal with this.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3056cb8eef5aee0dcd342488386355d8b8f574c8
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 9 15:55:19 2009 -0700
Check more alsa return statuses
commit 8ddf3345afd8cbf638e81993633f7861d8dbca63
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 18 01:47:34 2009 -0700
Don't report distance to rocket without valid GPS
When there's no valid GPS data, don't try to report the distance and bearing
to the rocket after landing.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fbcb7b20fa701a6e534d38e307839466545668e3
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 18 01:05:33 2009 -0700
Add B command to set serial baud rate
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 91b023e7e4eeed838e0320d2ddac0f6aac39e565
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 18 01:05:13 2009 -0700
Get rid of spaces after minus sign in climb value
commit 28be20cf914fb34dc3c776519708d0f02091764e
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 18 01:04:39 2009 -0700
Switch to 57600 baud for GPS data
commit d3f76ce58b9c0ed2e5a9fe3bbc7fb9cb38247714
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 18 01:04:17 2009 -0700
Drain serial port before changing speed
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d7c2d358ed8a1afc9f0ba2bd830b10f6b56dc7b1
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 18 00:44:42 2009 -0700
Display last known GPS coord while unlocked
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5195fcfe239e430e1f9f11774c9a245c7b29dae9
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 18 00:44:01 2009 -0700
use g_source_destroy instead of free on serial object
commit 1e5e98bd8f5ea0bc15592de454e3629383462371
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 18 00:43:22 2009 -0700
Trim aoview_serial_set_callback args down to just port and callback
commit 08f37056deec25d77062bc411a04033401b033a5
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 17 22:11:03 2009 -0700
Reset GPS at boot time
commit 1150aa850f5a025b849556e32c4dddb27937d9af
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 17 22:10:43 2009 -0700
Fix up serial debug output
commit 2a7956a64935246475f92d44c08369e0230b676a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 17 21:34:13 2009 -0700
Allow the GPS port to run at 4800 baud if desired
commit 8d650769c319261c97f5e68eff9138207b95c0f8
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 17 21:33:53 2009 -0700
Initialize the GPS serial protocol state
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ab40d224b39ba6d29c4056e2d2c365e1eb3d3793
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 17 21:33:18 2009 -0700
Use uint8_t for comparisons to avoid int conversions
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d6749bf24792bb41ca700cf4b8e5e1ac1a63cbf0
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 17 21:30:53 2009 -0700
Add AO_GPS_RUNNING state.
This tracks whether the GPS receiver has ever sent a valid report to the
flight computer, allowing the user to tell whether the GPS receiver is
working at all.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a1da7e871aee75308bc05ce1b7a0dc402e4c9509
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 17 21:25:35 2009 -0700
Add M command to monitor serial bytes
commit ddfa2308c0be4c002f982ae9da6032ee7854117d
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 17 21:24:45 2009 -0700
Support the not-connected GPS state
commit 34f148500df427c148188c0ada20bf914a7c74ba
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 17 19:23:10 2009 -0700
Use 57600 baud for GPS. Clean up gps init.
Assume GPS is either in 4800 NMEA or 57600 SiRF mode, send just the sequence
to get from 4800 NMEA to 5760 SiRF.
Also, eliminate threads from the gps test program.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2deca0c52cd6cfb4baceb59c8a5458344bada338
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 17 17:09:20 2009 -0700
Try harder to get the GPS receiver serial link sync'd up.
We cannot assume that the GPS receiver is in any particular state when it
boots, so we try to send the serial configuration at several rates and hope
that it eventually sees something that it likes.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 31d5670a9144b943ce9c8cb00deb5fb659af0b1c
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 17 17:06:18 2009 -0700
Rolling average for pad location. Say 'GPS ready'.
Use a rolling average for the pad location, instead of just averaging all
positions. This filters out old (presumably less accurate) values eventually.
When enough GPS samples have been acquired, say 'GPS ready'.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bfe1e76c82738baaf65abbc58c3244a07ea8fefe
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 17 16:22:51 2009 -0700
Split GPS data into a separate column
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5f0179652e8bb85add9067e5253e981c60f2c51e
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 17 16:03:35 2009 -0700
Fix up SiRF parsing and test code so that it actually works
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0b35447d05a0c7eaf4fefcbcf0065fe3320bba82
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 17 13:58:14 2009 -0700
Add host-side gps protocol testing program
commit fef7334bddb9fccfbd6deab7d5d466ab3e76323a
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 11 00:56:13 2009 -0700
Hook aoview directly to alsa
This skips the flite internal audio stuff which opened and closed the audio
device for each phrase. This caused the first part of some phrases to be
missed when using an external audio device.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 80cadf44f5f1accd6ddfca25c2af8d4d424f26d9
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 9 20:55:10 2009 -0700
Show speed. Format numbers. Timeout and report final status.
The speed value is now shown in the top label bar. Ascent shows
accelerometer-derived data, otherwise it's baro derived.
All of the numbers displayed are now given sensible printf formats so they
don't contain way too many digits.
Instead of doing periodic reporting based on flight tick count, data is
reported every 10 seconds based on wall time. After landing, or when no data
have been received for a while, final flight information is spoken.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 19630ef084866f4230e68ccf11284b30c68128b1
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jul 5 08:35:28 2009 -0700
Dont smash aoview_monitor_parse input buffer
commit e506ed4b6efb86eab50204658fcd433b987e3831
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 30 15:25:52 2009 -0700
Integrate flite into aoview directly. Fix great circle computation.
Use a separate thread for flite rather than a separate program.
Save voice state to gconf.
Add filters for replay file selection
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5b988e0146075d57434f8484e1ec9fcf3e183df2
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 30 15:24:53 2009 -0700
Make window taller
commit 696233b088645bba1aaa6aa6c5358c3ecfa5cd3f
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 30 15:24:31 2009 -0700
Use 16kHz voice
commit 2e06772c8b6fd74f86e640ed97f0d5bc8c095c2f
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 30 11:58:30 2009 -0700
Add telem replay and larger labels
Replays telemetry files in real time
Shows height/state/rssi in big values at the top.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 566dde161385263700eaae51095eecfa9b5972ee
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 29 23:06:47 2009 -0700
Update aoview/.gitignore
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4ca2d910f3be689fd3c78a4f1be0555d6b1a30c1
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 29 23:05:27 2009 -0700
Use flite to announce flight state
This uses the flite voice synthesis library from festival to announce
altitude and speed information during the rocket flight.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 527d7c803ed9597b210634018cb2eb9d048d9846
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 29 23:03:58 2009 -0700
Add GPS speed and error data to telemetry and aoview
Having switched to the SiRF binary GPS format, the velocity and error data
can now be displayed.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ee4919dd771b00e2a2dd1083c9528efa7baab50f
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 29 13:54:00 2009 -0700
Convert GPS to SiRF binary protocol.
This switches the GPS unit from NMEA to SiRF protocol at startup and then
parses the binary data. The binary data uses a different encoding of lat/lon
than the NMEA strings, and so the telemetry and eeprom data formats change
with this switch.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 49bf37767d2453869f2ca2c0832d1124322c66e0
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 17 23:22:25 2009 -0700
Add ejection computation utility
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e59520e343c2573b1b92c0b3c4aaa93e51bc55d3
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 17 13:55:23 2009 -0700
Fix clock initialization to not try to use 32kHz xtal on P2_3/P2_4
None of our boards have a 32kHz xtal oscillator, instead we use those pins
(on Telemetrum) for the deployment firing circuits. The old clock
initialization code was switching from the 32kHz RC oscillator to the 32kHz
crystal and overriding our use of those pins.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1c3cc12c08ddefbd6456a55c54ef87dd94d4ae9a
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 14 17:25:34 2009 -0700
Some kernels reference USB ttys as tty/tty* instead of tty:tty*
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0f2cbd41332b1b63865c5f1a4e749419b469853a
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 14 16:45:19 2009 -0700
Rename state apogee -> coast
commit 5834a12c1d3d71105c9e3d1ceaf9f3ffac9ff1eb
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 14 16:39:28 2009 -0700
rename states. launchpad -> pad, coast -> fast
commit 8c40f19acd09fe93d492c9355da8a1198c34b1c3
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 14 16:36:29 2009 -0700
Disable monitor mode when communicating via usb
commit 7adea9c59c73acd52743446c74fb675e0a1d6d05
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 4 14:38:45 2009 -0700
Format GPS seconds as %02d.%04d to avoid spaces in the value
The aoview GPS parsing code doesn't deal well with spaces in the middle of
the value, so pad the seconds field with a zero as needed.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a0e6bfee635b64092262936c858542318f6fc6dc
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Jun 4 13:11:48 2009 -0600
newer INSTALL file pulled in by autogen.sh
commit cf1e258d52b878df10b51a047709b10ecd51a68e
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Jun 4 13:09:29 2009 -0600
add a distclean target to src/Makefile
commit 176052b7c14fcad067835ecb550778faf67cf4da
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Jun 4 13:07:10 2009 -0600
add lib to the front of the subdir list
commit 208bc15714c7b4020c017eef19011c4eb9ab51e2
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 4 11:20:10 2009 -0700
Move build and debug tools to 'cctools' directory.
These tools were merged in from the ccdbg package.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 17d2432a8b9c15963cd3b821f025ad33972ef477
Merge: 210dbaa 8a9a3f0
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 4 11:13:15 2009 -0700
Merge ccdbg and altos sources into one giant repository
Keeping these separate isn't making things any easier.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 210dbaa23cdacf3a6f2d6e23493e96ee2ac9bca7
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 4 10:41:34 2009 -0700
Use autotools, move altos to src subdir
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8cce307bb3156584ba17ae5a787f645dfee5fb94
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 4 10:25:30 2009 -0700
Make menu seperator insensitive
commit 778cae8fc5a4b30e5045e4703316fc61ae18562a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 3 17:07:34 2009 -0700
aoview: Add eeprom data fetching
Fetches the last flight data from a TM device connected via USB and writes
it to the flight log directory.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bf140966e9649e75b884c8aa5f25ffbf9eed10ea
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 3 10:57:46 2009 -0700
Stop log dumping at flight end. Print 'end' at end of log.
No reason to continue dumping data past the end of the flight now that the
logging stuff has been demonstrated to work reliably. Also, to make
automated log dumping easier, this prints out 'end' after the log data so
that aoview knows when to stop reading.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 35ac66969abe24ca23776618306a59fc17770e06
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 31 09:22:01 2009 -0700
Start adding bi-directional packet link
commit 3a3bfd471a868d546d83cdc431b53c8f5208edb9
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 28 23:17:33 2009 -0700
Eliminate RDF tone generation.
Now that we have a viable telemetry-signal based RDF device via TeleDongle,
there's no reason to continue to waste power and bandwidth with a NFM tone.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4d83eef0fe1d24a845ab29a535dfc56e13e7ee20
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 28 23:17:25 2009 -0700
Change .gitignore to match new aoload procedure
commit dcfcf3bec6788460b6fe8c239c80bad4526bd15b
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 27 22:01:37 2009 -0700
Leave serial number writing to aoload
Instead of building per-serial hex files, leave that
process to the new aoload program
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8a9a3f02b951382573ff74dd6ce5a1c0f335fa86
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 27 21:53:15 2009 -0700
Add aoload to load serial-numbered altos binaries.
aoload is a custom version of ccload which edits the data before sending it
to the target machine, writing the target serial number into the data.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5a7a63c34b778e40a61ddabd16ec1af9a2be50c3
Author: Keith Packard <keithp@keithp.com>
Date: Sat May 23 21:20:12 2009 -0700
Fix aoview telemetry GPS parsing code to use correct columns
This code was trying to pull the GPS data from the wrong columns, causing
aoview to fail to display GPS information.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 26988c3e7acb2fa832810475e43e08fd2867459c
Author: Keith Packard <keithp@keithp.com>
Date: Sat May 23 21:18:57 2009 -0700
Parse both telemetry or log data ao_flight_test
Change the way data is fed from files to the flight test rig to handle
either kind of input file.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d6f5a0689023546464a71561f53fa2c943077c88
Author: Keith Packard <keithp@keithp.com>
Date: Sat May 23 21:16:22 2009 -0700
Avoid 16-bit overflow in velocity computation.
Adding two 16 bit integers together can wrap around to negative numbers,
this resulted in velocity values which never decreased, making the switch
from coast to apogee state not occur.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit aa6d87aeb616dd62f0debaded297232022b4f8bd
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 20 09:44:55 2009 -0700
Make file handling more general so it can be reused.
The log file handling stuff will be useful for saving eeprom data, so pull
it out of the real-time log handling code and make a general interface.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b730c8bcbce649cdddba935e1112aaae538bc526
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 17 23:54:44 2009 -0700
Ignore aoview_glade.h
commit 91b07410122d0eaaf292cdb31c200925d45eaf2c
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 17 23:36:21 2009 -0700
Transmit computed ground pressure and acceleration values
These are the last two values relevant to figuring out the state of the
flight computer, and as they are computed by averaging 10 seconds of 100Hz
sample data, they're a lot more accurate than anything the receiver could do
on its own.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 71d1689759829f1bc8550f1a4d8c9f2dc90b2ab4
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 17 23:18:09 2009 -0700
Provide install target
commit f301b95e87c8ec1e3b58d595a05d486bede5e0c2
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 17 23:13:20 2009 -0700
Embed glade file in executable
This eliminates install issues nicely.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 26361686d6fc63dc22d22285f0543c5c2c756fb4
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 17 23:05:23 2009 -0700
Add About dialog to aoview.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0f3233c49f43cd4e372e613303919ce4d50255b2
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 17 22:44:19 2009 -0700
USB device names can contain '.' too
Depending on the hierarchy of devices, names can contain '.', so allow those
too.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 33221277690e6ee30387c506c3f2b8237ed48efd
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 17 22:43:34 2009 -0700
scandir returns -1 on error
In which case, the namelist is invalid, so don't look at it, and don't free
it.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7cb9fb675f56bf30ab6bf0bcdc5cb679709ffe3e
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 17 22:29:54 2009 -0700
Send computed accel/vel/pres values over the radio
These computed values reflect what the flight computer is actually refering
to for state changes, and will be useful in debugging the flight software as
well as provide a filtered view of the data.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2c780d67b8a22d75a2da4b2af21fd35f0c6f5236
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 17 22:29:06 2009 -0700
Handle disappearing serial devices
Put up a dialog when the serial open fails, and shut down monitoring when
the serial device disappears while running.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 69616104813fc5ba89fb3128d04fb9328961c59c
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 17 22:24:53 2009 -0700
While on the pad, zero out velocity every second
We integrate acceleration to get velocity, but that means sitting on the pad
for a long time can add substantial error to the velocity value. Each
second, take the velocity value from a full second ago and subtract that out
of the current velocity. Once we detect boost, this will stop, which means
that as long as we detect boost within a second, we won't have subtracted
out any "real" velocity.
This keeps the pad velocity hovering around zero, which is pretty useful.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1234694eb903b204488ddc7cb30bcfe34bf1e677
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 17 01:29:06 2009 -0700
Clear table, reset log on disconnect
commit 4316b6af86b37522038e642235c163fcaad52e96
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 17 01:28:16 2009 -0700
Add pad lat/lon, max accel, max height
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4348281bd788a13ea700413537f12da3c00356e4
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 17 00:46:09 2009 -0700
Clean up GPS display
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ff68e38770351ddac3285ce275cd85adab01fd3d
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 17 00:45:38 2009 -0700
Make aoview window taller
Signed-off-by: Keith Packard <keithp@keithp.com>
commit be3f4fed7b863c8cdaabe32b61b65a8b3cd11355
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 17 00:13:45 2009 -0700
Add lots more aoview UI bits
Logs data to files, displays current state in window.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 93d7ce8e054515ed7b166eb042ae7f47e564d21d
Author: Keith Packard <keithp@keithp.com>
Date: Sat May 16 20:45:26 2009 -0700
When logging starts up, right the whole ring to the log.
This preserves the data pre boost-detect for later analysis.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fec4212a59a7b3321536b25707dcabc43c797c33
Author: Keith Packard <keithp@keithp.com>
Date: Sat May 16 20:04:31 2009 -0700
Abandon use of accelerometer for apogee detect.
Integrating the accelerometer data to compute velocity worked for one rocket
flight, but additional testing shows that it doesn't work in other
airframes. Until we figure out how this should work, we'll rely on the
altimeter to detect apogee.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 09771c644de54ae354e8f98af7ba74289b3c0fcc
Author: Keith Packard <keithp@keithp.com>
Date: Sat May 16 02:25:04 2009 -0700
Add preliminary aoview code
AoView connects with TeleDongle to present telemetry information in a
reasonable form. Right now, it just displays information to stdout, but it
does have fancy dialogs for finding the USB devices.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 37250b00f6286aee4b3b28604f5d463db3079a89
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 13 20:41:54 2009 -0700
Discard usb output before connection. Handle USB reset.
Discarding output before USB is plugged in allows threads that send output
and do other things to work without a USB connection. Unfortuantely, there
doesn't appear to be any way to detect when the USB link is disconnected,
which means that once USB is enabled, future writes will continue to block.
USB reset causes the USB interrupts to all be reconfigured back to power-on
state.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9b974217958b1017e62d6c4f4568f547ccc30c58
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 13 20:40:42 2009 -0700
Enable radio monitor by default in teleterra, teledongle and tidongle
These ground loads want to monitor the radio constantly, and not require use
of the 'm' command before listening.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 25fc03a333b2cfad0a93ebc385fbcf74b63c229e
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 13 20:39:28 2009 -0700
Remove monitor/rssi functions from telemetrum load
Telemetrum is now a flight-only load, use teleterra or teledongle for ground
boards.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 05493b98eb1ae4d30cb0b600849d70b03fa33594
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 13 20:38:11 2009 -0700
Split out ao_state_names to separate file
Allows state names to be used in programs without monitoring enabled.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d085d43701e3cdd2119e947a9ae45baa78c80318
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 13 14:29:30 2009 -0700
Indicate RSSI with a blinking LED
Blink the red LED at a rate proportional to the RSSI value.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 055331d5f7d5adc40c348c3efd331a562dcda82a
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 13 11:19:13 2009 -0700
Make ao_flight_test show AGL altitude and positive acceleration under boost
This makes the output more readable
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d91208fbf5fc7797b93087ef8619454c4bed0130
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 13 11:18:24 2009 -0700
Make ao_flight_test able to read raw logging data
Protect ao_flight_test reading functions so that a simple
'script' output can be fed to the program and have it work correctly.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d3dbd8949e1102220ad5fd0863f493c819b96e46
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 13 11:16:53 2009 -0700
Print only RSSI when packet CRC is invalid
Packets with invalid CRC usually contain bogus data, so don't print that,
just print out the RSSI which may contain useful data.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8168820b667cc1deffab64dd81cb4e6e2e6eabe4
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 13 11:00:43 2009 -0700
Accelerometer-based velocity values are invalid after apogee
Because the orientation of the flight computer relative to the ground is
unknown after apogee, the accelerometer data cannot be integrated to compute
velocity. Main deploy is now based purely on barometric altitude and landing
detection no longer checks for a low velocity value.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 24fdda44ff8604e40510b196ead17564d8f8cd3d
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 13 10:59:04 2009 -0700
Add velocity check for boost detect via accelerometer
Bumping the rocket can cause a brief period of high acceleration, which may
cause a mistaken boost detection. Require both a high acceleration and
reasonable velocity to trigger boost phase.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7a1aa3fdbc0d1fae5e7ee027bf8904598c6ebe41
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 13 10:58:30 2009 -0700
Typo in callsign
commit 497c89a7d08920630894b2605c3b6a0bdc4c229b
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 10 23:11:06 2009 -0700
Use recorded accelerometer baseline data in ao_flight_test
With the flight computer recording a long-term average value for the
accelerometer in the flight record, use that to prime the flight test code
when running a log file through the simulator.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ba3c53636e485450f48093d0a88a6629775f7c3a
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 10 23:01:16 2009 -0700
Don't re-initialize the landing range data at each apogee detect sample
The landing range values are used only after apogee detect, so we need only
initialize them on the transition from apogee to drogue.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b623b1098bc7a10d471730259438fb82804221d0
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 10 23:00:06 2009 -0700
Initialize ao_min_vel with |ao_flight_vel|
As ao_min_vel is stored as an absolute value, it's important to preserve
that invariant, even though we don't expect ao_flight_vel to be negative at
coast.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e9584e846b9bd7926d61451d32ba5d7a30416f7b
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 10 22:58:31 2009 -0700
Decrease telemetry rate on the pad to 1/sec instead of 20/sec
Transmitting telemetry through the radio consumes a significant amount of
battery; reducing the rate to 1/sec will reduce power usage while waiting
for launch.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 97cecb517cd7bf75e1219c76a93bfe6964c07052
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 10 22:57:19 2009 -0700
Increase the initial accel/baro average to 1000 samples
To get an accurate baseline of the launchpad state, take a longer average of
the two sensors as the unit boots up.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 98806b1ff3f41484663d61ff430e9e2764c7b5e6
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 10 22:54:14 2009 -0700
Record average accelerometer value in flight start log record
The average accelerometer value cannot be extracted from the log as the
record starts after that is computed. As that drives much of the
accelerometer-based state transition logic, it is an important value to
have, so we log it as part of the flight start record now.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a12edbfe21fe27a9efbf87bacda9ab4806256e2b
Author: Keith Packard <keithp@keithp.com>
Date: Sat May 9 10:24:10 2009 -0700
Add version command to show product information
commit e80b87f5e3ccf152d67a2e87bdefda161c455599
Author: Keith Packard <keithp@keithp.com>
Date: Sat May 9 10:23:49 2009 -0700
Pad callsign with nuls
commit beae3360828da21eb1a3c4f88e930f242d4e36b7
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 1 08:14:57 2009 -0700
USB spec limits bulk endpoints to 64 byte payload max.
For full-speed devices, bulk endpoints may use 8, 16, 32 or 64 bytes, but no
more.
commit de7814c738488c2c16c6216c93fa78128895e5d5
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 29 17:46:56 2009 -0700
Use 'char' instead of 'uint8_t' for character data
String and character constants are of char type, so using uint8_t causes
promotion to 16-bit types when comparing the two.
commit 4ae74fffb939d67424efa3e7f433637f1f920ebc
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 29 17:46:36 2009 -0700
Eliminate incorrect cast in printf string argument
char * is a pointer to a string in the default address space, not a generic pointer
to a string. As such, the compiler (at least 2.9.0) mis-compiles this if the
cast is included.
commit 39f2a3c6bd501d12a92bfd38434ce67bb5beb70d
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 29 17:44:41 2009 -0700
Correct radio frequency shown in config display.
Radio frequency base is 434.550, not 435.550
commit 75ca1751b7cac2f8074d0713ee96d6ab45b54f19
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 29 17:42:26 2009 -0700
Reset landing interval tests at apogee
This moves all of the interval management into the landing test code and
out of the main loop. The interval is reset at apogee to make sure the
sensors produce a stable reading for at least 20 seconds
commit 7a1b77c2d7253a681389f32b70e2460aac188807
Author: Bdale Garbee <bdale@gag.com>
Date: Sun Apr 26 17:53:13 2009 -0600
clean up host programs, too
commit 5df80c346d65a9d56a8699b056dc44924acb31fe
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 26 16:04:07 2009 -0700
Was missing v_batt in adc dump command
commit c3fec2c4c65db71e88ef0c05c69463438a7cfc6c
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 26 15:38:28 2009 -0700
Add manual ignition and igniter test commands
commit 819f1de8dd6010fae050bcef930943c7923929f9
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 26 15:38:03 2009 -0700
Clean up commands a bit
commit 178abb5c8439509926a5507911d7148b84f051b8
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 26 15:08:58 2009 -0700
Clear more files on make clean
commit 70a69f3acdca27b80cdb2069de59bbc6dba83dbd
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 26 15:05:29 2009 -0700
Label binaries with product and serial info
commit 5ed3b1cb52b573db1fee9655a29a0e6dd72f53fe
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 26 01:37:02 2009 -0700
Make sure full log is written and flushed on landing.
The final state change to landing is recorded in the logging thread, so have
that turn off logging once it has recorded that state. Then make it go to
sleep.
commit 2e737ad00cad5d893b252d8aa9dbff3d9b800731
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 26 01:36:53 2009 -0700
Clean up monitor output a bit
commit 38a0b61b0a0b3c00f064c8d562950a17a6ddff4a
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 26 00:11:32 2009 -0700
Add configuration support
Current config variables:
Main deploy altitude above launch (in meters)
Acceleration zero g calibration (manual or automatic)
Radio channel (freq = 435.550MHz + channel * 100kHz)
Callsign (max 8 characters)
Supporting this involved shuffling code around so that the
non-telemetrum builds could include only the stuff they needed.
commit c65f1a1acd2ca00758833cec5d3f8056d303d3e2
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 25 14:44:33 2009 -0700
Allow for slower ADC operation. Add power saving code.
This tries to make the flight computer use less power by disabling USB in
flight mode, lowering the telemetry rate after ascent. It also disables the
RDF beacon during ascent and re-enables it once descent has started.
commit 8e7b48b5f090be81980ab00fbce814ae1cc253e4
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 25 14:44:04 2009 -0700
Allow ADC to be disabled
commit 7bc3d9962872850e7b420221cf689db16b4305cc
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 25 14:43:23 2009 -0700
Place CPU in P0 state while idle
commit e45fce7f82d704d677f84c69b0e07588d109d780
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 25 14:42:20 2009 -0700
Add RDF beacon and callsign to telemetry
commit 61510f98404bca6861b2da98f6cd9ba9deb76968
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 25 14:40:51 2009 -0700
Add radio code to emit a 1kHz tone
commit 0f07803d84b5ac89500ee33a6818c50583e3ff7f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 25 13:18:37 2009 -0700
Allow the USB system to be disabled/enabled at run-time
commit 45976af820fc41099928df71ea8304c56eb9fc7c
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 25 13:16:27 2009 -0700
Make LED usage depend on target device
commit 4a050704ad2c497e9f1b0988334228b0bbc4c170
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 25 13:13:24 2009 -0700
Make some functions reentrant to save DSEG space
commit 6b3d25a6d6d7847765eb03b836913dd5ecef2993
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 24 19:17:37 2009 -0700
Add monitor task to flight software
Allows the use of telemetrum in teledongle mode.
commit ad0d2d88a91cbd02c56ea5ff6dab23e16aec6510
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 24 19:17:19 2009 -0700
Report difference from ground to max altitude at landing
commit f94ab879ff6f97708827c74facd11003a2d8b590
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 24 19:16:29 2009 -0700
Display data with units while running simulation
commit 6fb26340b150e831a8a9e25e3b68074c29e48dbe
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 24 19:13:31 2009 -0700
Enabling apogee detect via speed: < 200m/s && < max_speed - 50m/s
This change ensures that we actually got going fairly fast, and then slowed
down a bunch before enabling apogee detect. Otherwise, we'll detect apogee
right off the pad as we're not going very fast at that point...
This also adds the 'f' command to show the current flight status on the USB
port.
commit 20b9f304ecbddd73a0ee2461b4c5e80f08157f98
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 24 19:12:28 2009 -0700
configure igniter ports, set values to measured ones
commit 6bf1d91ce0b723abe2bcec89668c13135ec044cf
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 24 19:11:40 2009 -0700
Move ao_led_init to end of file to be consistent with other files
commit b4de7d550ec9a09ccf5f6a72debc6646706e3516
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 24 19:10:20 2009 -0700
Define ao_state_names in ao.h so other people can share
commit 8e62747b3692d0ac75b08eaf5c3e4b5d766be6ad
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 24 19:09:31 2009 -0700
Bump NUM_CMDS to 10
commit 2f781beb73ef24ab5fbe2688a83d07ad26c15972
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 24 19:09:09 2009 -0700
Move beep_init to end of file to be consistent with other files
commit b99315cee4ab796376458a2442cf36806fa4aed3
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 24 10:19:31 2009 -0700
Update flight algorithm based on data collected from SN-1 Flight 1
This now correctly sequences through the flight data collected from the
first TeleMetrum test flight.
This also completes up the flight algorithm test harness (ao_flight_test),
which runs the flight algorithm on the Linux host from a captured data log.
commit b32f2f0090ff967edac07ae4d7a9895ed0b96d31
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 23 22:17:44 2009 -0700
Add igniters and update flight control algorithm
commit f155333ae18a25068644792e8940269d9fb28033
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 24 00:15:09 2009 -0700
Avoid ram from 0xfda2 through feff, its funky
commit f9c1c545c9dc11c3190a6cf7504883131fffce2f
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 23 22:18:33 2009 -0700
remove ao_flight_test until its ready
commit 86e73c009f78dc4664883353124fc891fbb01dce
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 23 20:50:07 2009 -0700
Add teledongle module
commit 204daac71ad56926730f5d6860bd70c645302e19
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 23 14:26:01 2009 -0700
Set telemetry rate to 100ms
commit 306b28f632e21b42ab165e7944283cf9764b590e
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 23 14:23:26 2009 -0700
Wrong license on ao_monitor.c
commit dca3a6de26d26c0020f3fb2cf5d8ac1552c195b1
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 23 14:23:00 2009 -0700
Crank up radio to 10dBm
commit fbe3096f7e9a8112dbc79f376eccdaa6872ae520
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 22 16:03:28 2009 -0700
Add COPYING file
commit 9b7788f18bbaf3c4e5ebbf6c5ebd926468b0e045
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 22 15:55:01 2009 -0700
Clean up TeleTerra files
commit 61cee50c86e275f9fde875bd317c3e74255394ec
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 22 15:53:55 2009 -0700
simplify ao_time function
commit 3703ecdc9e190f2e0b7ead0e71b78be881c1f3b7
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 22 15:53:46 2009 -0700
One line radio status
commit 1fbb3c17672a03ea6318fee07f9c2dcd7a8d0b16
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 22 15:49:16 2009 -0700
Add new binaries to .gitignore
commit 00d5610caff61559eb24c24beaa56629d6bb03be
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 22 15:49:00 2009 -0700
Speed up dbg port bit frobbing
commit c7555eb16876aa8ff9fe7f648d325a1b8fb54d23
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 22 15:48:28 2009 -0700
Use sdcc from path
commit ada6dea04b94be016598566c4c13e6105aaec353
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 22 15:48:14 2009 -0700
Clean up task list formatting
commit 0a1b2297ee9f5bbb918bd72f26088a3e0b84839a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 22 15:47:57 2009 -0700
Control radio monitoring with the M command
commit 837c620f07b63efc171be3ac14c78bc99adf7592
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 22 14:25:43 2009 -0700
Shrink USB output buffers, work around USB packet errors
commit d87e9c25947d7cc2eba8894a524977f2c55a089a
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 21 02:07:24 2009 -0700
Clean up telemetry now that all packets are the same
commit 1b333def5052d2ed47fdeaef23a897fe326f6340
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 21 02:07:08 2009 -0700
Add longer debug delays to reset/debug_mode entry
commit d1887ded41a5bfec8e10e9fd736fa9444b9b6222
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 21 01:17:03 2009 -0700
Fix up fancy dbg stuff. Add teleterra initial bits.
The dbg stuff needed a bit of help to actually walk the tables; it appears
that complex expressions confuse sdcc.
This also adds primitive teleterra bits, but no UI, etc.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 43c8f7012102cdb591ace899420c10e4a78385ad
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 20 23:33:41 2009 -0700
Add radio support. Build separate executables for TeleMetrum and the TI dongle
Ok, way too big a patch, but things were in rough shape.
This patch adds support for the radio, both transmit and receive.
Then, because I could no longer run the TeleMetrum code on the TI
dongle, I ended up building a separate image for the TI board, which
involved creating a mechanism for having multiple command sets and splitting
code for different functions into different files.
commit 5be13b76a2e29b84cd6d1eec065e3354b0dafce5
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 18 23:19:24 2009 -0700
Start using pdata area for less-frequently used data
commit 3e18b5a0d4c7d84df98b6ed0b7783de1d42d45bf
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 18 23:19:05 2009 -0700
Slow down panic presentation
commit c4e983daa4579896b227fdcb2be43fad75e94307
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 18 23:17:45 2009 -0700
Parse GPS data locally. Add 'g' command to display recent GPS results.
This parses the GPS GGA message and stores it in a global variable,
protected by a mutex.
commit ed6f67dc47d750d5ff8bea63ae7cbb560689b9b6
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 18 23:16:01 2009 -0700
Add task names and 'T' command to show task status.
The T command shows the current wchan and PC for each task in the system.
commit 3d5a5fc4db5f681e848202c4ee4099d2879677d6
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 18 19:32:18 2009 -0700
Fix GPL version at 2
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 022f83ca6fd589005d8eb3e25e633950fef69fa7
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 17 23:38:14 2009 -0700
Add gps, debug dongle support and pressure alt tables
GPS also pulled in serial support. The altitude tables take raw 11-bit
pressure sample numbers and convert them to standard pressure altitude
values.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 31fce622b1bab7e3f421069d7f6d4d9bdcd825de
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 17 10:32:45 2009 -0700
Enable FEC in radio packets
commit 293a357911090a2f37bdd6f7ea96942079ffdf2e
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 17 10:29:42 2009 -0700
Add CRC to radio packets
commit 20834caf01ddf481e8362b0d2627ef383a82e09d
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 17 10:23:10 2009 -0700
Add data whitening
commit 94e5343a72121a81ab19bf5025e6b6fc9847eb4f
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 17 10:19:25 2009 -0700
Add packet status byte defines
commit 04bc51c170c6f22bb5cc16867ce9a307818a7a00
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 17 10:11:31 2009 -0700
Add separate xmit/recv programs to radio demo
commit fafe55c3405964e0defdf25b6c00236f9aaefbc5
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 17 10:11:11 2009 -0700
Get env var for debug method selection
commit 26095fc0511ee0d5213f038986032f7c59964cf0
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 17 10:10:47 2009 -0700
Run-time selection between cp2103 and cc1111
commit 543bedde83cbce5145668e72965e02d892187b59
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 16 20:38:14 2009 -0700
Send data
commit 5e2393eb6b1a6d7b180bd63d5165ee7b7ff5f9e0
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 15 14:25:26 2009 -0700
Move a bunch of variables from __data to __xdata
commit 4d1091d9bd121f05f5fe0a9c9d2bc0da8c562b9a
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 14 21:25:15 2009 -0700
Slow down panic code, disable interrupts
commit 545478dd02eaeff6a65d318e722b1e4fce5e01b4
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 14 21:24:25 2009 -0700
Keep reporting flight state while it changes
commit 9605045164882b4ca3d1317ac860b02513a51f30
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 14 21:23:55 2009 -0700
use red LED to indicate system startup
commit dc844ee7e49a3b6145b3165252a592ed070d600f
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 14 21:23:13 2009 -0700
Use ao_ee_flush_internal while holding mutex
commit 5e45d1c89b00e74d5b2730345843f43aab516af2
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 14 21:22:56 2009 -0700
Leave beeping and lights to the flight code
commit 902c342289c1d13a4d55b9224acb6d67578b7a60
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 14 21:22:31 2009 -0700
Make mutex functions reentrant
commit acc4fc635edb70ec1ba2dff9f7ac0c8542c72c47
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 14 19:08:01 2009 -0700
Add in existing flight pieces: flight/report/log
These pieces come from the old telemetrum firmware.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ac99982b10fd5772218660137ee21db9b90cd885
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 14 14:21:56 2009 -0700
Add eeprom driver and command loop
This involved adding dma control and a mutex implementation.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fbd8f4aff5058f4d371596b04715b7cb6d38e729
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 14 11:04:09 2009 -0700
Switch from --model-large to --model-small
This shrinks the application quite a bit, and should make it faster as well.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fb63262699d3a6fbf347d24efda8b01f75b7d0d3
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 14 10:02:19 2009 -0700
Add comments, clean up white space, etc.
Various clean ups now that the basic code appears to work.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7e4abf3a40c39d0ce4f466281bef9a464df85dd4
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 13 21:58:07 2009 -0700
Switch USB to double-buffered
commit b56a44e48552bc32dbba9ff21770c370219a684a
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 13 21:51:59 2009 -0700
Fix USB input/output by reloading packet limits.
The USB controller is reset during the connection process, which clears the
packet limits set in the controller at initialization time. Reload those
values when the configuration is set.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cdaf3fc5802acf2ddc7972a15649ab0e1b31b873
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 13 20:39:46 2009 -0700
USB working up through reading strings
commit c5c1e3fb1c253d387be02c127253ac2a55d577b4
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 13 13:51:08 2009 -0700
Add USB support.
This offers a single CDC ACM device over USB.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f3f25a1cec7d2a034aa544569cfd23bea1a996c5
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 12 23:53:55 2009 -0700
Add beep/led support.
Support our P2_0 connected buzzer, and formalize LED output support.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e14f07bfdb8824fc7ed6df1129c66ee39ffd6d54
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 12 23:17:16 2009 -0700
Add A/D sampler
Sample A/D at the timer tick, placing data in a ring
of samples.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 823f4f92de0c1f8dd7a644a8e56ffe9822bee6e2
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 12 22:52:47 2009 -0700
Add 100Hz timer
Use Timer 1 to generate a 100Hz timer interrupt
commit 650a77e209dbb54c8d8fd9824cee430985564973
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 12 21:58:49 2009 -0700
Update README
commit 870e98334018a66de8a6e4a659d2dc5dee1cbecf
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 12 21:52:56 2009 -0700
GPL Version 2 only
commit 11c526bdcbf4012e18fbfdc29ca8832870ca38f0
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 12 21:47:32 2009 -0700
Add load command to s51
commit 55402ba3e87fd699c51079843309f1f0d1534724
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 12 21:33:55 2009 -0700
Make test more complicated
commit 3d3f849c9af9028f667cef4afedc0798d39a9efc
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 12 21:33:46 2009 -0700
SP points at last pushed byte
commit f72c4cbc8fd9412dd1cce0fc446e7bbd2edc2d34
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 12 20:27:03 2009 -0700
Add .gitignore
commit 1903a86bf2cc6b685ccc475e62eabe49a4ec5b43
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 12 20:25:39 2009 -0700
Initial AltOS import
commit 5221dc63cf3a059a32aca2bfa7828c215be814a1
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 12 12:38:58 2009 -0700
Add ccdump
commit ee110425fb814780476d1d3d8a257af126f41763
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 6 17:09:23 2009 -0700
Bump buffer pointer as data is written to cc-usb
commit 2d9b8a83a2d9f495199033e43f519d26f27938fe
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 6 11:31:49 2009 -0700
Add support for a serial-connected custom debug dongle
This uses the cc1111 board as a custom debug dongle with faster
methods for communicating with the debug target.
commit 24edd56155ed0fa02fdd8f66fdc7aa5a1021bf7d
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 1 17:50:47 2009 -0700
Reset cc1111 on s51 exit
commit 5fcfe854d29e1862d9a6adcbef3ef5119eb52fa3
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 1 00:06:45 2009 -0700
Add timer-based beep test
commit 91607bebdd167ac632aca4b66e22cb0cabdf0d20
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 26 22:41:47 2009 -0700
Add readline support to s51
commit 66ee94ed10e3d79b24f45a5c63e58456d4d30343
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 25 11:37:48 2009 -0700
Deal with MSB-outputing DMA engine
commit d3732fd405af03c3752a84c4b78da7ef5ebd3744
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 25 11:14:03 2009 -0700
Flip ADC bytes around
commit 50cc8e97e76d9b60c622962e1c74cf422dfb2c0f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 25 11:01:30 2009 -0700
Add spacing for serial adc data
commit 5577ca3762bfc000b0bc3782c73a8f95996a28a6
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 25 10:58:57 2009 -0700
Inc only one on dest addr
commit 378227d869a3e8787c532c8c4e1563b44002c4b5
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 25 10:55:17 2009 -0700
Dump remaining inputs
commit f54a41e37d6897db2e24fbc82880076b78a0ae41
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 25 10:50:36 2009 -0700
Remove poll for ti demo button
commit 2b93a70fdd9e47e8195855451aa19ecad5d8b068
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 25 10:50:14 2009 -0700
Add adc to serial conversion
commit d9fd548db15232e3a8823815962b252c7a5e7cba
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 25 10:04:50 2009 -0700
Add ADC via DMA example
commit 61faf2b773300988fe27cfde5bc045be9950a1b0
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 25 09:45:14 2009 -0700
Add DMA example
commit 7b3fdf5b42c9be9bebc1ceb7a52ff0f5a2a28fcd
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 25 01:05:36 2009 -0700
Back to 0dBm
commit 31d59b88baa2cd96dc6263d1c5877283f2cd8c36
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 25 01:03:08 2009 -0700
Make radio test compile again
commit 9ce713fdd19bf1a51370dacba3670504356c5c11
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 25 01:02:07 2009 -0700
Wait for xtal to stabilize
commit ffd43886dc902f3bb7407294018e3d62cac39480
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 25 00:55:11 2009 -0700
Check serial input
commit 029963cc94fbb47560118b5de73c537e2c14ed7c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 25 00:50:02 2009 -0700
Eliminate array walking
commit 019456a17d36f8f9f9b72cfbc980492175086d32
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 25 00:41:49 2009 -0700
Add a per-char delay
commit cfaf187e96ba98eb8dd934409a10bc70273fe68a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 25 00:36:35 2009 -0700
Use UTX1IF to wait for serial TX complete
commit 006124529b243c7657a94312d2c868a82878d8bb
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 25 00:29:29 2009 -0700
Send more interesting text
commit 5049acd3d1ae42304513f667f55a2ddffa4c685a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 25 00:24:56 2009 -0700
More random serial bit frobbing
commit 50bdc2407c674a4770912d3a626f36820a7f1527
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 25 00:13:15 2009 -0700
Flip serial TX code around a bit
commit 7b7617e376afe0df1d505375b76198358330370c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 25 00:09:47 2009 -0700
Try serial polarity high/high
commit 18edacdb1e6e429cc29a164e22ef2a566096b9d9
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 25 00:06:32 2009 -0700
Make serial test simpler
commit 62744c186792739c3bf5798c80ff87c69fbe2b65
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 25 00:03:45 2009 -0700
Flip start/stop bits around
commit 9e96107d5d1a9681b07c36bb5860c748bfe10ec0
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 24 23:57:12 2009 -0700
Stop high
commit c41ceb9a488b2209d1d3c09967d1473ce608030f
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 24 23:24:01 2009 -0700
Change radio to -30dBm
commit c35de083ca3d4f362063b056a0fd74ffe629d168
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 24 23:11:48 2009 -0700
Add serial test program
commit 8ecbd8734f0fb5588b2a8eb20720cfc6f43dfb47
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 24 22:37:38 2009 -0700
Wait for xtal to stabilize after changing to 24MHz
commit e120269fc0f8e14ddf1755337b1d092173e16da2
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 24 22:21:31 2009 -0700
Actually return byte read from SPI
commit de1ac6f99a1526fa840a52cfc10fa3edc0589bed
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 24 22:12:51 2009 -0700
Clear UxCSR_TX_BYTE after transmitting a byte
commit 3ed3ff63e46767a256d30c5da5c52ae20089a91d
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 24 20:04:58 2009 -0700
Led the LED turn on
commit 91b3a6ae74184692f45702587c4d678b2799ad8c
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 24 19:55:04 2009 -0700
actually write and compare SPI test bits
commit 7de3a43887485c3c6cf52960376ccde33fb33985
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 24 19:54:02 2009 -0700
Add USART-based SPI test code
commit ef0eef68280e9b6ca5e3bb71062e23054340e1ed
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 24 17:22:36 2009 -0700
Change spi test string
commit 8131389ee5018c05b721146a98367150cf500fdf
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 24 17:15:09 2009 -0700
Oops, not merging in the bit read for SPI test
commit 3429016d1359ec650993d2fb0596184e3f717871
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 24 17:04:45 2009 -0700
Adjust clock/data phase for spi test
commit fedd18b28ea54e1dabcd2f9e8cab3ae4ee0fd070
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 24 16:35:13 2009 -0700
MISO needs to be an input
commit f0c233f25a208a636833312b1766825815735304
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 24 15:41:55 2009 -0700
Add bit-banging spi eeprom test program
commit 6eeee64cf16ccc9218dbdde5426f25bda5e3407f
Author: Bdale Garbee <bdale@gag.com>
Date: Wed Mar 18 02:58:33 2009 -0600
working beep at around 4khz
commit 4726317de811c20e8d6754762437b5c9cbb3a48c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 18 01:54:34 2009 -0700
Add simple test program to light up the transmitter at 434.550MHz
This starts a transmit sequence, but doesn't send any data so the
transmitter just locks on.
commit a0a27600ee2bf237e74eb83767a8d2e7c91df24f
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 15 18:14:21 2009 -0700
Correctly comment which bit the beep program uses
commit 25b77d236c01258abfc03114c2fc9ea2d69ca6e7
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 15 18:11:53 2009 -0700
Add telemetrum beeper example
commit 164b4e4749ad64ebbe26e84fd7b4fa1aa733dbe4
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 15 18:11:20 2009 -0700
sdcc gets the lib path correct based on the model
commit 04a316133af93b79bfbebb91f05eec1015ec2abc
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 15 18:10:43 2009 -0700
Bump debug speed back up
commit 9fd63972758d6d5572f7bcaadec9b1c0e974a2e8
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 7 21:05:40 2009 -0800
Only flip changing bits in async mode
commit c8fd04e154bcfd65ae1200980bd8163caabd7fe4
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 7 21:05:06 2009 -0800
The debug port only works if reset is higher than clock. weird
commit ade11f88754b4ab0386ebf86afc5257e59238f62
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 7 21:04:38 2009 -0800
Make manual bit flipping sync after every transaction
commit e63b5271bb54afc36e4b9891e51e053ff6011092
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 7 14:49:22 2009 -0800
Add ccmanual
commit 77d754afc2d14aaa4413c13ebe3777ef385f62a9
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 7 14:48:49 2009 -0800
Sync after manual bit reading
commit 5a338c8a7394d003355f96a8777b6fe83bb8493c
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 7 14:48:35 2009 -0800
Flip debug pins around to match telemetrum
commit cc0495b7028f4b1189a00707d828a68534d1dea2
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 6 22:52:35 2009 -0800
Wait for a while when switching the RESET_N line
The cc1111 manual suggests placing a 2.7kΩ resister and 1nF capacitor on the
RESET_N line to filter out noise. This increases the time necessary to reset
the chip to several microseconds which is longer than the interval between
two USB packets. Flush the USB packet queue and sleep for a while after
changing the value on the RESET_N line to make sure the chip sees the state
change.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 41289e6d8f1767547a33fea349866e928e44910f
Author: Bdale Garbee <bdale@gag.com>
Date: Mon Mar 2 07:46:20 2009 -0700
minor s51.1 formatting fixes
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fdee231ed097a4348aee78fbd4aa92826b80de03
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 1 23:12:31 2009 -0800
Add s51 manual.
This documents (briefly) the s51 hex debugging interface program, including
some simple commands to test the operation of the system interactively.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f7d91bd23b8214e09deae0aafb516331e934c49b
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 1 18:43:03 2009 -0800
Sometimes the link breaks and the GET_PC command returns garbage
commit 3cc8d11eb8d5d0b42141dd84a58d461287f59e3a
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jan 25 08:38:48 2009 -0800
Support 'set' command
The 'set' command modifies target memory and registers
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 60940b4be23962db79b8e914ec943d0636dd68ad
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 5 21:45:21 2009 -0800
Expose ccdbg_set_clock API
This allows applications to change the debug port clock
rate on the fly.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit eb09e61b0682eb2aeac8e1a34d58b897ba6db8e7
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 5 21:44:44 2009 -0800
Use custom sdcc libraries (this needs to be configured...)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1ccfe0887c794397131ab1c986c25f66eea86a6c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 5 21:43:44 2009 -0800
Have S51 ignore SIGINT while running under sdcdb.
This prevents keyboard interrupts from accidentally stopping
s51.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7c03937b36aac82b08f4ea0c6da33a994fe15ec7
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 30 22:40:13 2008 -0800
Add simple and timer sample programs
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6c2a65c743a4ffae96ed27dbc38c1bf9242ed1df
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 30 22:35:53 2008 -0800
Save/restore registers to host during memory operations. Cache ROM data.
Because the debug port uses instructions for most operations, the debug code
will clobber registers used by the running program. Save and restore these
to avoid corrupting application data.
If the ROM file is known, use that to return data instead of fetching it
from the target to improve performance.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ea366058aa467a8a7caf17e7014758f3741ea7f7
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 29 12:35:11 2008 -0800
Fix flashing less than a full page of data. Verify page at a time.
The 8051 flashing code requires special help with counts with non-zero low
byte. Also, instead of verifying the entire flash contents at the end,
verify each page as it goes.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e0697186a2f9b6139636ff5d5c162879c85caf9c
Author: Keith Packard <keithp@keithp.com>
Date: Sun Dec 28 00:11:13 2008 -0800
Use SFR access funcs. Support 'dump' command. Add -m (monitor) flag.
Not all SFRs are visible in the unified address space, so the SFR-specific
accessors are required.
The dump command is the same as the various 'd*'
commands, but also supports dumping program memory.
The new -m (monitor) flag watches the command stream between s51 and sdcdb.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 23aca1fcbc169184e32d4ec19f28dd4fd4cfda36
Author: Keith Packard <keithp@keithp.com>
Date: Sun Dec 28 00:09:30 2008 -0800
Save/restore regs when reading/writing memory. Add SFR access.
The DPL and ACC registers are used by the memory access code,
so they need to be saved and restored. Stuff them up high in ram for now;
this should probably be fixed to pull them back to the host instead.
Special SFR access is required as not all SFRs are visible in the unified
address space.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1405838160b69e2cda456e21502a1d03b3aa7548
Author: Keith Packard <keithp@keithp.com>
Date: Sat Dec 27 11:25:58 2008 -0800
s51: get start address from ihx file. re-enable breakpoints after reset.
Use the start of the ihx file when asked to run from 0x0, this lets
sdcdb run programs from ram.
The reset command clears all hw breakpoints, so reset them afterwards.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1264c3676e95427bba5d01e05c303d036a7f9eca
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 26 23:05:04 2008 -0800
Switch to libusb-1.0 and use async interface.
The async libusb interface offers substantial performance benefits by not
making each command wait for the reply. This makes talking over this
interface almost reasonable.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d2d9cfd74fd66836c913c02276e09136d83b35dc
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 26 17:58:48 2008 -0800
s51: add breakpoints and the ability to block awaiting a breakpoint.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4c4093c3fdd309123fdd068c0e1ff4947104492d
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 22 19:11:56 2008 -0800
Add more commands to s51 assembly-language debugger
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 55eba4fa08b022197106245d36a70f575a070b0a
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 22 19:10:27 2008 -0800
Make read_memory debug output use ccdbg_debug.
This makes it default to not being presented, which makes s51 much happier
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e75918f3667a5c8ad294bec4acef6fe81682edf6
Author: Keith Packard <keithp@keithp.com>
Date: Sun Dec 21 23:33:35 2008 -0800
Add preliminary version of s51, a UI clone of the 8051 emulator.
sdcdb provides source-level debugging using the 8051 emulator, s51. By
emulating that emulator a the UI level, we should be able to get source
debugging right on our target platform.
This is just the preliminary structure for the program with most commands
not yet implemented.
commit f7d49868aeae80d515b12a7e339628f1296754a6
Author: Keith Packard <keithp@keithp.com>
Date: Sat Dec 20 23:30:06 2008 -0800
Cleanup work; separating out the cp interface to be more abstract.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 30f23f23a6db3d12fdc9c088cf6ab47c5e5077fb
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 19 21:13:04 2008 -0800
Clean up autotools stuff.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9025eb792861930e6af918d2727c4f5d97a69936
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 19 21:11:45 2008 -0800
Autotools.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ab909db28307cfbf7ee8d692506bb79d7ffd627a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 19 19:08:13 2008 -0800
Ignore .ihx files
commit cc8db276bc4f2fd7eb00168a5c0689a8457a5c6f
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 19 19:07:37 2008 -0800
Move blink example to subdir
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 82e2d7ebed6682062dc400478c736bd6c91195c9
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 19 19:04:26 2008 -0800
Clean up makefiles, move ihx files to .ihx
commit 52fb5f795adfd7f62e5b6dbe65877d14361cfdae
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 19 14:39:57 2008 -0800
ignore more stuff
commit 4ecfc33f16aa36b315519e6f279da65374b67aba
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 19 14:37:53 2008 -0800
Add cc1111 isr stub example
commit d32e6658c3e489b62ba3cf6d22e3ab177b9b8a3a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 19 14:37:29 2008 -0800
Add blink-tiny flash and ram versions
commit b4d1127ef007843c643b778b3b2f6b915b1d5d9a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 19 14:19:29 2008 -0800
Flash multiple pages. Eliminate off-by-one error in hex_image length.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 55995515b9d4fc1e193039eab697c5d03db417c2
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 19 11:04:16 2008 -0800
Add flash writing code.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0bc52385b8f86f9ca1c450ad106e6d8afe3bc153
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 18 12:37:32 2008 -0800
faster
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3779cc8b32cac3640f42bd0400d4199ddae965a1
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 18 12:17:41 2008 -0800
cq
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dc03adc179669d41e3551d74b3c5a60db41ff217
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 18 12:07:06 2008 -0800
Add ability to load Intel HEX files. Add sample sdcc LED blinker.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 807e2adacb025af77bb53c03209e9c8e0d7a5f95
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 18 00:18:50 2008 -0800
Add ability to read/write arbitrary memory. Write LED blinker program.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8c879bf51c14a5928135d59211facd72f6a32808
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 17 23:15:47 2008 -0800
Move manual bit-banging debug code to separate file
Signed-off-by: Keith Packard <keithp@keithp.com>
commit aec3bbce84a5ceb92060a4b3889379f2af2404ac
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 17 23:15:19 2008 -0800
reduce clock to 50us
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fa168f963f8b00144d12aa2770e9c0917cfae123
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 17 23:12:59 2008 -0800
Fill out ccdbg-command to support all debug commands.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5df84df7cd6a31527dcfd11030f00ef9d8abf170
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 17 22:24:59 2008 -0800
Clean up bitbanging layer. Add debug printfs.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 584e28bac8af38de433767e017977ed1adddeb36
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 17 12:32:15 2008 -0800
Clean up sample debug files
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e64b4dbf15e9ee1cb0de002985de7575e83d46e9
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 8 17:25:28 2008 -0800
Add support for input-only lines (-)
commit 4f38974a9941cddaba27c17c5a46f923db386c94
Author: Keith Packard <keithp@keithp.com>
Date: Sat Dec 6 16:32:27 2008 -0800
Add another example
commit 3709ec3205cfb152b6568f3ea505c67fe7504c2a
Author: Keith Packard <keithp@keithp.com>
Date: Sat Dec 6 16:32:12 2008 -0800
Add libusb support and lots more examples
commit 39801e6e9fb9388072ee414a447f74095a6ac960
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 28 22:57:07 2008 -0800
Random hacking
commit 01cb2799875e086ee6096627c058ee235bbc33d5
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 27 17:07:15 2008 -0800
Add prototypes, add stub mainline, add .gitignore
commit 0ffe4ef870b0e564789a1990aeab5b6651868e5b
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 27 12:33:40 2008 -0800
cc1111 debug port access through cp2103 serial chip
|