84,19 → 84,75 |
// clear ADC enable & ADC Start Conversion & ADC Interrupt Enable bit |
#define ADC_Disable() (ADCSRA &= ~((1<<ADEN)|(1<<ADSC)|(1<<ADIE))) |
// set ADC enable & ADC Start Conversion & ADC Interrupt Enable bit |
Index: main.c |
Index: makefile |
=================================================================== |
--- main.c (revision 1255) |
+++ main.c (working copy) |
@@ -175,7 +175,7 @@ |
sei(); |
--- makefile (revision 1255) |
+++ makefile (working copy) |
@@ -50,63 +50,8 @@ |
# Output format. (can be srec, ihex, binary) |
FORMAT = ihex |
|
printf("\n\r==================================="); |
- printf("\n\rFlightControl"); |
+ printf("\n\rFlightControl FRED"); |
printf("\n\rHardware: %d.%d", BoardRelease/10, BoardRelease%10); |
if(CPUType == ATMEGA644P) |
printf("\r\n CPU: Atmega644p"); |
-# Target file name (without extension). |
+TARGET = Flight-Ctrl_MEGA644p_VibrationTest |
|
-ifeq ($(VERSION_PATCH), 0) |
-TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)a_SVN$(REV) |
-endif |
-ifeq ($(VERSION_PATCH), 1) |
-TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)b_SVN$(REV) |
-endif |
-ifeq ($(VERSION_PATCH), 2) |
-TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)c_SVN$(REV) |
-endif |
-ifeq ($(VERSION_PATCH), 3) |
-TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)d_SVN$(REV) |
-endif |
-ifeq ($(VERSION_PATCH), 4) |
-TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)e_SVN$(REV) |
-endif |
-ifeq ($(VERSION_PATCH), 5) |
-TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)f_SVN$(REV) |
-endif |
-ifeq ($(VERSION_PATCH), 6) |
-TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)g_SVN$(REV) |
-endif |
-ifeq ($(VERSION_PATCH), 7) |
-TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)h_SVN$(REV) |
-endif |
-ifeq ($(VERSION_PATCH), 8) |
-TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)i_SVN$(REV) |
-endif |
-ifeq ($(VERSION_PATCH), 9) |
-TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)j_SVN$(REV) |
-endif |
-ifeq ($(VERSION_PATCH), 10) |
-TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)k_SVN$(REV) |
-endif |
-ifeq ($(VERSION_PATCH), 11) |
-TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)l_SVN$(REV) |
-endif |
-ifeq ($(VERSION_PATCH), 12) |
-TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)m_SVN$(REV) |
-endif |
-ifeq ($(VERSION_PATCH), 13) |
-TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)n_SVN$(REV) |
-endif |
-ifeq ($(VERSION_PATCH), 14) |
-TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)o_SVN$(REV) |
-endif |
-ifeq ($(VERSION_PATCH), 15) |
-TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)p_SVN$(REV) |
-endif |
-ifeq ($(VERSION_PATCH), 16) |
-TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)q_SVN$(REV) |
-endif |
-ifeq ($(VERSION_PATCH), 17) |
-TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)r_SVN$(REV) |
-endif |
- |
# Optimization level, can be [0, 1, 2, 3, s]. 0 turns off optimization. |
# (Note: 3 is not always the best optimization level. See avr-libc FAQ.) |
OPT = 2 |
Index: menu.c |
=================================================================== |
--- menu.c (revision 1255) |
106,7 → 162,7 |
{ |
case 0:// Version Info Menu Item |
- LCD_printfxy(0,0,"+ MikroKopter +"); |
+ LCD_printfxy(0,0,"+ MikroKopter F"); |
+ LCD_printfxy(0,0,"MK ==VIBR TEST=="); |
LCD_printfxy(0,1,"HW:V%d.%d SW:%d.%d%c",BoardRelease/10,BoardRelease%10,VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH+'a'); |
LCD_printfxy(0,2,"Setting: %d %s", GetActiveParamSet(), Mixer.Name); |
if(I2CTimeout < 6) |
169,7 → 225,7 |
+ requestedVibData = pRxData[1]; |
+ if (requestedVibData == 0) |
+ { |
+// int i; |
+ int i; |
+ while(!txd_complete); // wait for previous frame to be sent |
+ //printf("VibTest Start...\r"); |
+ StartVibTest(pRxData[0] /*channel*/); |