diff --git a/doc/Mega2560/MEGA2560.sch b/doc/Mega2560/MEGA2560.sch index 50c314ae6..9489598fd 100644 --- a/doc/Mega2560/MEGA2560.sch +++ b/doc/Mega2560/MEGA2560.sch @@ -36,7 +36,7 @@ $Descr A4 11693 8268 encoding utf-8 Sheet 1 1 Title "OpenTX board based on Arduino MEGA2560" -Date "29 may 2015" +Date "4 jun 2015" Rev "0" Comp "Copyright 2015 F. Aguerre" Comment1 "" @@ -397,7 +397,7 @@ L R R1 U 1 1 54993D2B P 7150 2750 F 0 "R1" V 7230 2750 50 0000 C CNN -F 1 "200R" V 7150 2750 50 0000 C CNN +F 1 "200" V 7150 2750 50 0000 C CNN F 2 "" H 7150 2750 60 0001 C CNN F 3 "" H 7150 2750 60 0001 C CNN 1 7150 2750 @@ -731,7 +731,7 @@ L R R8 U 1 1 5498A213 P 7950 3600 F 0 "R8" V 8030 3600 50 0000 C CNN -F 1 "56" V 7950 3600 50 0000 C CNN +F 1 "100" V 7950 3600 50 0000 C CNN F 2 "" H 7950 3600 60 0001 C CNN F 3 "" H 7950 3600 60 0001 C CNN 1 7950 3600 @@ -892,7 +892,7 @@ L R R1 U 1 1 54988260 P 7600 2900 F 0 "R1" V 7680 2900 50 0000 C CNN -F 1 "200R" V 7600 2900 50 0000 C CNN +F 1 "200" V 7600 2900 50 0000 C CNN F 2 "" H 7600 2900 60 0001 C CNN F 3 "" H 7600 2900 60 0001 C CNN 1 7600 2900 @@ -903,7 +903,7 @@ L R R1 U 1 1 5498825E P 7600 2650 F 0 "R1" V 7680 2650 50 0000 C CNN -F 1 "200R" V 7600 2650 50 0000 C CNN +F 1 "200" V 7600 2650 50 0000 C CNN F 2 "" H 7600 2650 60 0001 C CNN F 3 "" H 7600 2650 60 0001 C CNN 1 7600 2650 @@ -914,7 +914,7 @@ L R R4 U 1 1 549881F1 P 6750 2350 F 0 "R4" V 6830 2350 50 0000 C CNN -F 1 "5K1" V 6750 2350 50 0000 C CNN +F 1 "5.1K" V 6750 2350 50 0000 C CNN F 2 "" H 6750 2350 60 0001 C CNN F 3 "" H 6750 2350 60 0001 C CNN 1 6750 2350 @@ -925,7 +925,7 @@ L R R4 U 1 1 549881F0 P 6900 2350 F 0 "R4" V 6980 2350 50 0000 C CNN -F 1 "5K1" V 6900 2350 50 0000 C CNN +F 1 "5.1K" V 6900 2350 50 0000 C CNN F 2 "" H 6900 2350 60 0001 C CNN F 3 "" H 6900 2350 60 0001 C CNN 1 6900 2350 @@ -41110,7 +41110,7 @@ CA 3B B1 B4 D6 FB 76 3A 4D 11 32 4D 1E A1 3D 78 1C 8B 1E 14 74 10 57 46 8C 97 FB 33 B3 93 2C A5 90 EC 7D 2B A5 BC 7A F5 EA E1 E1 5E 44 C8 BD 2E 90 84 08 60 87 C2 BB D7 FD 40 85 4A 52 6F 3D D0 6D 9E 6E 41 36 CA 77 04 97 99 83 92 6E D1 7C 20 6D 2C 33 D2 7F 5B 16 F2 83 51 39 A0 3F CF F3 A7 9F 7E FA CB 5F FE F5 EB D7 AF 45 64 59 96 6D DB F6 23 3E B3 52 CA B3 1B C5 00 F7 -08 C0 CC FE 1F 15 4F 30 6D 3D C2 80 DE 00 00 00 00 49 45 4E 44 AE 42 60 82 00 $EndBitmap +08 C0 CC FE 1F 15 4F 30 6D 3D C2 80 DE 00 00 00 00 49 45 4E 44 AE 42 60 82 01 $EndBitmap EndData $EndBitmap $Comp @@ -41756,11 +41756,11 @@ LCD direct backlight (5V, max. 40 mA) Text Label 9450 3600 0 42 ~ 0 LCD_Light $Comp -L R R? +L R R4 U 1 1 5568D86B P 10100 3600 -F 0 "R?" V 10180 3600 50 0000 C CNN -F 1 "5K1" V 10100 3600 50 0000 C CNN +F 0 "R4" V 10180 3600 50 0000 C CNN +F 1 "5.1K" V 10100 3600 50 0000 C CNN F 2 "" H 10100 3600 60 0001 C CNN F 3 "" H 10100 3600 60 0001 C CNN 1 10100 3600 diff --git a/doc/Mega2560/MEGA2560_SCH.pdf b/doc/Mega2560/MEGA2560_SCH.pdf index 281f7e991..e8bcaeca4 100644 Binary files a/doc/Mega2560/MEGA2560_SCH.pdf and b/doc/Mega2560/MEGA2560_SCH.pdf differ diff --git a/radio/src/targets/mega2560/board_mega2560.h b/radio/src/targets/mega2560/board_mega2560.h index 91031838e..b71e9c6ff 100644 --- a/radio/src/targets/mega2560/board_mega2560.h +++ b/radio/src/targets/mega2560/board_mega2560.h @@ -181,8 +181,8 @@ void pwrOff(); // Haptic driver #define hapticOff() // TODO hapticOn() cleaner ... -#define HAPTIC_ON() PORTH &= ~(1 << OUT_H_HAPTIC) -#define HAPTIC_OFF() PORTH |= (1 << OUT_H_HAPTIC) +#define HAPTIC_ON() PORTH |= (1 << OUT_H_HAPTIC) +#define HAPTIC_OFF() PORTH &= ~(1 << OUT_H_HAPTIC) // Buzzer driver #define buzzerOn() PORTB |= (1 << OUT_B_BUZZER)