Rev 555 | Rev 583 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 555 | Rev 568 | ||
|---|---|---|---|
| Line 82... | Line 82... | ||
| 82 | 82 | ||
| 83 | + |
83 | + |
| 84 | // clear ADC enable & ADC Start Conversion & ADC Interrupt Enable bit |
84 | // clear ADC enable & ADC Start Conversion & ADC Interrupt Enable bit |
| 85 | #define ADC_Disable() (ADCSRA &= ~((1<<ADEN)|(1<<ADSC)|(1<<ADIE))) |
85 | #define ADC_Disable() (ADCSRA &= ~((1<<ADEN)|(1<<ADSC)|(1<<ADIE))) |
| 86 | // set ADC enable & ADC Start Conversion & ADC Interrupt Enable bit |
86 | // set ADC enable & ADC Start Conversion & ADC Interrupt Enable bit |
| 87 | Index: main.c |
87 | Index: makefile |
| 88 | =================================================================== |
88 | =================================================================== |
| 89 | --- main.c (revision 1255) |
89 | --- makefile (revision 1255) |
| 90 | +++ main.c (working copy) |
90 | +++ makefile (working copy) |
| - | 91 | @@ -50,63 +50,8 @@ |
|
| 91 | @@ -175,7 +175,7 @@ |
92 | # Output format. (can be srec, ihex, binary) |
| 92 | sei(); |
93 | FORMAT = ihex |
| - | 94 | ||
| 93 | 95 | -# Target file name (without extension). |
|
| - | 96 | +TARGET = Flight-Ctrl_MEGA644p_VibrationTest |
|
| - | 97 | ||
| - | 98 | -ifeq ($(VERSION_PATCH), 0) |
|
| - | 99 | -TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)a_SVN$(REV) |
|
| - | 100 | -endif |
|
| - | 101 | -ifeq ($(VERSION_PATCH), 1) |
|
| - | 102 | -TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)b_SVN$(REV) |
|
| - | 103 | -endif |
|
| - | 104 | -ifeq ($(VERSION_PATCH), 2) |
|
| - | 105 | -TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)c_SVN$(REV) |
|
| - | 106 | -endif |
|
| - | 107 | -ifeq ($(VERSION_PATCH), 3) |
|
| - | 108 | -TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)d_SVN$(REV) |
|
| - | 109 | -endif |
|
| - | 110 | -ifeq ($(VERSION_PATCH), 4) |
|
| - | 111 | -TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)e_SVN$(REV) |
|
| - | 112 | -endif |
|
| - | 113 | -ifeq ($(VERSION_PATCH), 5) |
|
| - | 114 | -TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)f_SVN$(REV) |
|
| - | 115 | -endif |
|
| - | 116 | -ifeq ($(VERSION_PATCH), 6) |
|
| - | 117 | -TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)g_SVN$(REV) |
|
| - | 118 | -endif |
|
| - | 119 | -ifeq ($(VERSION_PATCH), 7) |
|
| - | 120 | -TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)h_SVN$(REV) |
|
| - | 121 | -endif |
|
| - | 122 | -ifeq ($(VERSION_PATCH), 8) |
|
| - | 123 | -TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)i_SVN$(REV) |
|
| - | 124 | -endif |
|
| - | 125 | -ifeq ($(VERSION_PATCH), 9) |
|
| - | 126 | -TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)j_SVN$(REV) |
|
| 94 | printf("\n\r==================================="); |
127 | -endif |
| - | 128 | -ifeq ($(VERSION_PATCH), 10) |
|
| - | 129 | -TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)k_SVN$(REV) |
|
| 95 | - printf("\n\rFlightControl"); |
130 | -endif |
| 96 | + printf("\n\rFlightControl FRED"); |
131 | -ifeq ($(VERSION_PATCH), 11) |
| - | 132 | -TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)l_SVN$(REV) |
|
| - | 133 | -endif |
|
| - | 134 | -ifeq ($(VERSION_PATCH), 12) |
|
| - | 135 | -TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)m_SVN$(REV) |
|
| - | 136 | -endif |
|
| - | 137 | -ifeq ($(VERSION_PATCH), 13) |
|
| - | 138 | -TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)n_SVN$(REV) |
|
| 97 | printf("\n\rHardware: %d.%d", BoardRelease/10, BoardRelease%10); |
139 | -endif |
| - | 140 | -ifeq ($(VERSION_PATCH), 14) |
|
| - | 141 | -TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)o_SVN$(REV) |
|
| - | 142 | -endif |
|
| - | 143 | -ifeq ($(VERSION_PATCH), 15) |
|
| - | 144 | -TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)p_SVN$(REV) |
|
| - | 145 | -endif |
|
| - | 146 | -ifeq ($(VERSION_PATCH), 16) |
|
| - | 147 | -TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)q_SVN$(REV) |
|
| 98 | if(CPUType == ATMEGA644P) |
148 | -endif |
| - | 149 | -ifeq ($(VERSION_PATCH), 17) |
|
| - | 150 | -TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)r_SVN$(REV) |
|
| - | 151 | -endif |
|
| - | 152 | - |
|
| - | 153 | # Optimization level, can be [0, 1, 2, 3, s]. 0 turns off optimization. |
|
| - | 154 | # (Note: 3 is not always the best optimization level. See avr-libc FAQ.) |
|
| 99 | printf("\r\n CPU: Atmega644p"); |
155 | OPT = 2 |
| 100 | Index: menu.c |
156 | Index: menu.c |
| 101 | =================================================================== |
157 | =================================================================== |
| 102 | --- menu.c (revision 1255) |
158 | --- menu.c (revision 1255) |
| 103 | +++ menu.c (working copy) |
159 | +++ menu.c (working copy) |
| 104 | @@ -139,7 +139,7 @@ |
160 | @@ -139,7 +139,7 @@ |
| 105 | switch(MenuItem) |
161 | switch(MenuItem) |
| 106 | { |
162 | { |
| 107 | case 0:// Version Info Menu Item |
163 | case 0:// Version Info Menu Item |
| 108 | - LCD_printfxy(0,0,"+ MikroKopter +"); |
164 | - LCD_printfxy(0,0,"+ MikroKopter +"); |
| 109 | + LCD_printfxy(0,0,"+ MikroKopter F"); |
165 | + LCD_printfxy(0,0,"MK ==VIBR TEST=="); |
| 110 | LCD_printfxy(0,1,"HW:V%d.%d SW:%d.%d%c",BoardRelease/10,BoardRelease%10,VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH+'a'); |
166 | LCD_printfxy(0,1,"HW:V%d.%d SW:%d.%d%c",BoardRelease/10,BoardRelease%10,VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH+'a'); |
| 111 | LCD_printfxy(0,2,"Setting: %d %s", GetActiveParamSet(), Mixer.Name); |
167 | LCD_printfxy(0,2,"Setting: %d %s", GetActiveParamSet(), Mixer.Name); |
| 112 | if(I2CTimeout < 6) |
168 | if(I2CTimeout < 6) |
| 113 | Index: timer0.c |
169 | Index: timer0.c |
| Line 167... | Line 223... | ||
| 167 | + case 'f': // VibrationTest |
223 | + case 'f': // VibrationTest |
| 168 | + { |
224 | + { |
| 169 | + requestedVibData = pRxData[1]; |
225 | + requestedVibData = pRxData[1]; |
| 170 | + if (requestedVibData == 0) |
226 | + if (requestedVibData == 0) |
| 171 | + { |
227 | + { |
| 172 | +// int i; |
228 | + int i; |
| 173 | + while(!txd_complete); // wait for previous frame to be sent |
229 | + while(!txd_complete); // wait for previous frame to be sent |
| 174 | + //printf("VibTest Start...\r"); |
230 | + //printf("VibTest Start...\r"); |
| 175 | + StartVibTest(pRxData[0] /*channel*/); |
231 | + StartVibTest(pRxData[0] /*channel*/); |
| 176 | + while (VibTestCount); |
232 | + while (VibTestCount); |
| 177 | + //printf("VibTest Done!\r"); |
233 | + //printf("VibTest Done!\r"); |