diff --git a/doc/Mega2560/MEGA2560.sch b/doc/Mega2560/MEGA2560.sch index c00af00d9..a4e55c8fe 100644 --- a/doc/Mega2560/MEGA2560.sch +++ b/doc/Mega2560/MEGA2560.sch @@ -36,7 +36,11 @@ $Descr A4 11693 8268 encoding utf-8 Sheet 1 1 Title "OpenTX board based on Arduino MEGA2560" +<<<<<<< HEAD +Date "19 may 2015" +======= Date "17 may 2015" +>>>>>>> parent of b464283... M2560 schematic update Rev "0" Comp "Copyright 2015 F. Aguerre" Comment1 "" @@ -196,10 +200,10 @@ F 3 "" H 8800 6900 60 0001 C CNN 1 0 0 -1 $EndComp $Comp -L R R6 +L R R7 U 1 1 54997DEC P 8800 6550 -F 0 "R6" V 8880 6550 50 0000 C CNN +F 0 "R7" V 8880 6550 50 0000 C CNN F 1 "100K" V 8800 6550 50 0000 C CNN F 2 "" H 8800 6550 60 0001 C CNN F 3 "" H 8800 6550 60 0001 C CNN @@ -207,11 +211,11 @@ F 3 "" H 8800 6550 60 0001 C CNN -1 0 0 1 $EndComp $Comp -L R R6 +L R R5 U 1 1 54997CFE P 7800 6000 -F 0 "R6" V 7880 6000 50 0000 C CNN -F 1 "100K" V 7800 6000 50 0000 C CNN +F 0 "R5" V 7880 6000 50 0000 C CNN +F 1 "6.8K" V 7800 6000 50 0000 C CNN F 2 "" H 7800 6000 60 0001 C CNN F 3 "" H 7800 6000 60 0001 C CNN 1 7800 6000 @@ -310,11 +314,11 @@ F 3 "" H 9850 4600 60 0001 C CNN 0 1 -1 0 $EndComp $Comp -L R R6 +L R R5 U 1 1 5499427F P 10100 4850 -F 0 "R6" V 10180 4850 50 0000 C CNN -F 1 "100K" V 10100 4850 50 0000 C CNN +F 0 "R5" V 10180 4850 50 0000 C CNN +F 1 "6.8K" V 10100 4850 50 0000 C CNN F 2 "" H 10100 4850 60 0001 C CNN F 3 "" H 10100 4850 60 0001 C CNN 1 10100 4850 @@ -461,11 +465,11 @@ F 3 "" H 5250 1000 60 0001 C CNN 1 0 0 -1 $EndComp $Comp -L R R3 +L R R2 U 1 1 54993A62 P 5250 2200 -F 0 "R3" V 5330 2200 50 0000 C CNN -F 1 "2.7K" V 5250 2200 50 0000 C CNN +F 0 "R2" V 5330 2200 50 0000 C CNN +F 1 "2.2K" V 5250 2200 50 0000 C CNN F 2 "" H 5250 2200 60 0001 C CNN F 3 "" H 5250 2200 60 0001 C CNN 1 5250 2200 @@ -646,10 +650,10 @@ $EndComp Text Label 9250 1000 0 42 ~ 0 M2560_Ouput $Comp -L R R5 +L R R6 U 1 1 54992F2E P 10250 1250 -F 0 "R5" V 10330 1250 50 0000 C CNN +F 0 "R6" V 10330 1250 50 0000 C CNN F 1 "10K" V 10250 1250 50 0000 C CNN F 2 "" H 10250 1250 60 0001 C CNN F 3 "" H 10250 1250 60 0001 C CNN @@ -837,10 +841,10 @@ F 3 "" H 2350 2100 60 0001 C CNN 1 0 0 -1 $EndComp $Comp -L R R5 +L R R6 U 1 1 549891B4 P 2150 1700 -F 0 "R5" V 2230 1700 50 0000 C CNN +F 0 "R6" V 2230 1700 50 0000 C CNN F 1 "10K" V 2150 1700 50 0000 C CNN F 2 "" H 2150 1700 60 0001 C CNN F 3 "" H 2150 1700 60 0001 C CNN @@ -872,10 +876,10 @@ F 3 "" H 1400 2300 60 0001 C CNN 1 0 0 -1 $EndComp $Comp -L R R5 +L R R6 U 1 1 549891AC P 2050 2800 -F 0 "R5" V 2130 2800 50 0000 C CNN +F 0 "R6" V 2130 2800 50 0000 C CNN F 1 "10K" V 2050 2800 50 0000 C CNN F 2 "" H 2050 2800 60 0001 C CNN F 3 "" H 2050 2800 60 0001 C CNN @@ -998,10 +1002,10 @@ F 3 "" H 9100 5400 60 0001 C CNN 0 1 -1 0 $EndComp $Comp -L R R6 +L R R7 U 1 1 549881D8 P 8850 5600 -F 0 "R6" V 8930 5600 50 0000 C CNN +F 0 "R7" V 8930 5600 50 0000 C CNN F 1 "100K" V 8850 5600 50 0000 C CNN F 2 "" H 8850 5600 60 0001 C CNN F 3 "" H 8850 5600 60 0001 C CNN @@ -41022,10 +41026,10 @@ F 3 "" H 10450 4200 60 0001 C CNN 1 0 0 -1 $EndComp $Comp -L R R? +L R R6 U 1 1 549E8FFF P 10450 3850 -F 0 "R?" V 10530 3850 50 0000 C CNN +F 0 "R6" V 10530 3850 50 0000 C CNN F 1 "10K" V 10450 3850 50 0000 C CNN F 2 "" H 10450 3850 60 0001 C CNN F 3 "" H 10450 3850 60 0001 C CNN @@ -41039,7 +41043,7 @@ port pin (initial state) Text Notes 5450 7300 0 60 ~ 0 Pinout caption : Text Label 5550 2550 2 42 ~ 0 -Gain = 1 + R3/R6 +Gain = 1 + R2/R6 $Bitmap Pos 4600 4650 Scale 1.000000 @@ -41132,7 +41136,11 @@ 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 +<<<<<<< HEAD +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 07 $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 00 $EndBitmap +>>>>>>> parent of b464283... M2560 schematic update EndData $EndBitmap $Comp diff --git a/doc/Mega2560/MEGA2560_Listing.xls b/doc/Mega2560/MEGA2560_Listing.xls index a16da90ed..727b4061e 100644 Binary files a/doc/Mega2560/MEGA2560_Listing.xls and b/doc/Mega2560/MEGA2560_Listing.xls differ diff --git a/doc/Mega2560/MEGA2560_SCH.pdf b/doc/Mega2560/MEGA2560_SCH.pdf index 9a9dc3d02..8aaace455 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.cpp b/radio/src/targets/mega2560/board_mega2560.cpp index 3c4d04cad..51ff27af4 100644 --- a/radio/src/targets/mega2560/board_mega2560.cpp +++ b/radio/src/targets/mega2560/board_mega2560.cpp @@ -48,7 +48,7 @@ inline void boardInit() DDRE = 0b00000010; PORTE = 0b11111100; // 7:N/A, 6:N/A, 5:RENC1_B, 4:RENC1_A, 3:N/A, 2:N/A, 1:TELEM_TX, 0:TELEM_RX DDRF = 0b00000000; PORTF = 0b11111111; // 7-0:Trim switch inputs DDRG = 0b00000000; PORTG = 0b11111111; // 7:N/A, 6:N/A, 5:N/A, 4:N/A, 3:N/A, 2:TCut_SW, 1:Gear_SW, 0: RudDr_SW - DDRH = 0b00011000; PORTH = 0b11110110; // 7:N/A, 6:RFPw, 5:JackPres, 4:HoldPw, 3:Speaker, 2:N/A, 1:N/A, 0:Haptic + DDRH = 0b00011000; PORTH = 0b11110110; // 7:N/A, 6:RF_Activated, 5:DSC_Activated, 4:Hold_Pwower, 3:Speaker, 2:N/A, 1:N/A, 0:Haptic DDRJ = 0b00000000; PORTJ = 0b11111111; // 7:N/A, 6:N/A, 5:N/A, 4:N/A, 3:N/A, 2:N/A, 1:RENC2_push, 0:RENC1_push DDRK = 0b00000000; PORTK = 0b00000000; // Analogic input (no pull-ups) DDRL = 0b00000000; PORTL = 0b11111111; // 7:TRN_SW 6:EleDR_SW, 5:ESC, 4:MENU 3:Keyb_Left, 2:Keyb_Right, 1:Keyb_Up, 0:Keyb_Down @@ -98,7 +98,7 @@ uint8_t pwrCheck() void pwrOff() { - PORTH = 0xEF; // PortH-4 set to 0 + PORTH &= ~0x10; // PortH-4 set to 0 } FORCEINLINE uint8_t keyDown() diff --git a/radio/src/targets/mega2560/board_mega2560.h b/radio/src/targets/mega2560/board_mega2560.h index 1cbb98d1d..fd0e80e49 100644 --- a/radio/src/targets/mega2560/board_mega2560.h +++ b/radio/src/targets/mega2560/board_mega2560.h @@ -79,7 +79,7 @@ #define PAUSE_PPMIN_INTERRUPT() TIMSK3 &= ~(1<