

amptest
This repository has no backups
This repository's network speed is throttled to 100KB/sec
Upgrade your account to fix these warnings, or use backups.vc for automated backups
Diff Revisions 2 vs 3 for /trunk/mode.cpp
@@ -54,7 +54,24 @@ | |||
54 | 54 | 8192, 7680, 7168, 6656, 6144, 5632, 5120, 4608, 4096, 3584, 3072, 2560, 2048, 1536, 1024, 512 | |
55 | 55 | }; | |
56 | 56 | ||
57 | - | ||
57 | + | const unsigned int meandr_tab[TAB_SIZE] = { // 16bit_256 | |
58 | + | 65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535, | |
59 | + | 65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535, | |
60 | + | 65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535, | |
61 | + | 65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535, | |
62 | + | 65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535, | |
63 | + | 65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535, | |
64 | + | 65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535, | |
65 | + | 65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535, | |
66 | + | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
67 | + | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
68 | + | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
69 | + | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
70 | + | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
71 | + | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
72 | + | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
73 | + | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 | |
74 | + | }; | |
58 | 75 | ||
59 | 76 | ||
60 | 77 | ||
@@ -75,9 +92,14 @@ | |||
75 | 92 | } | |
76 | 93 | ||
77 | 94 | ||
95 | + | ||
78 | 96 | const char* _szConstantModeName = "const"; | |
79 | 97 | const char* _szSineModeName = "sine"; | |
80 | - | const char* _szTriangleModeName = "tri"; | |
98 | + | const char* _szTriangleModeName = "line"; | |
99 | + | const char* _szMeandrModeName = "pulse"; | |
100 | + | ||
101 | + | ||
102 | + | ||
81 | 103 | ||
82 | 104 | ||
83 | 105 | void setMode(const char* szMode) | |
@@ -92,6 +114,8 @@ | |||
92 | 114 | mode = eConstant; | |
93 | 115 | else if (strstr(szMode, _szTriangleModeName) != NULL) | |
94 | 116 | mode = eTriangle; | |
117 | + | else if (strstr(szMode, _szMeandrModeName) != NULL) | |
118 | + | mode = eMeandr; | |
95 | 119 | ||
96 | 120 | setMode(mode); | |
97 | 121 | } | |
@@ -105,6 +129,7 @@ | |||
105 | 129 | case eConstant: return _szConstantModeName; break; | |
106 | 130 | case eSine: return _szSineModeName; break; | |
107 | 131 | case eTriangle: return _szTriangleModeName; break; | |
132 | + | case eMeandr: return _szMeandrModeName; break; | |
108 | 133 | } | |
109 | 134 | return "unknown"; | |
110 | 135 | } | |
@@ -134,6 +159,7 @@ | |||
134 | 159 | case eConstant: val = MAX_DAC_VALUE * m_amp; break; | |
135 | 160 | case eSine: val = sine_tab[tab_step] * m_amp; break; | |
136 | 161 | case eTriangle: val = triangle_tab[tab_step] * m_amp; break; | |
162 | + | case eMeandr: val = meandr_tab[tab_step] * m_amp; break; | |
137 | 163 | } | |
138 | 164 | ||
139 | 165 |