diff --git a/circuit/mkrouter-v06/eagle.epf b/circuit/mkrouter-v06/eagle.epf index 5ebc5abea2e695850d93446d47b4a3290d694092..47067fa240a539049ffa9fe57d0eb6b24e3ae1ee 100644 --- a/circuit/mkrouter-v06/eagle.epf +++ b/circuit/mkrouter-v06/eagle.epf @@ -70,7 +70,7 @@ Package="RASPBERRYPI-3BPLUS" Type="Schematic Editor" Number=1 File="mkrouter-v06.sch" -View="106.449 173.056 223.388 284.496" +View="18.324 124.475 115.773 217.342" WireWidths=" 0.0762 0.1016 0.127 0.15 0.2 0.2032 0.254 0.3048 0.4064 0.508 0.6096 0.8128 1.016 1.27 2.54 0.1524" PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0" PadDrills=" 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.65 0.7 0.75 0.8 0.85 0.9 1 0.6" @@ -109,14 +109,14 @@ ArcDirection=0 AddLevel=2 PadsSameType=0 Layer=91 -Views=" 1: 106.449 173.056 223.388 284.496" +Views=" 1: 18.324 124.475 115.773 217.342" Sheet="1" [Win_3] Type="Board Editor" Number=2 File="mkrouter-v06.brd" -View="44.9929 78.7078 53.8498 91.2986" +View="70.3133 23.0011 136.121 116.552" WireWidths=" 0.0762 0.1016 0.127 0.15 0.4064 0.508 0.6096 2.54 0.2 0.254 0.2032 0.3048 1.27 1.016 0.8128 0.1524" PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0" PadDrills=" 0.2 0.25 0.35 0.4 0.45 0.5 0.55 0.65 0.7 0.75 0.8 0.85 0.9 1 0.6 0.3" @@ -161,7 +161,7 @@ Type="Control Panel" Number=0 [Desktop] -Screen="1920 1080" +Screen="3840 1080" Window="Win_1" Window="Win_2" Window="Win_3" diff --git a/embedded/mkrouter-v06/.vs/mkrouter-v06/v14/.atsuo b/embedded/mkrouter-v06/.vs/mkrouter-v06/v14/.atsuo index 2493d226405116c878087141465236d67614cd02..09c65133fbeb3c2923338beba7747191df069a9e 100644 Binary files a/embedded/mkrouter-v06/.vs/mkrouter-v06/v14/.atsuo and b/embedded/mkrouter-v06/.vs/mkrouter-v06/v14/.atsuo differ diff --git a/embedded/mkrouter-v06/mkrouter-v06/hardware.h b/embedded/mkrouter-v06/mkrouter-v06/hardware.h index 23f217561cbc62eadaad60e6b9705036ff3b78ff..7697df38491de245dafb74916cfb4410f0f07f0f 100644 --- a/embedded/mkrouter-v06/mkrouter-v06/hardware.h +++ b/embedded/mkrouter-v06/mkrouter-v06/hardware.h @@ -30,7 +30,10 @@ #define HARDWARE_ON_PERIPHERAL_C 0x2 #define HARDWARE_ON_PERIPHERAL_D 0x3 -#define BAUD_SYSTEM 63018 +// use BAUD_SYSTEM 63018 for FTDI-Limited 115200 baudrate // ~ 4.2us bit period +// use BAUD_SYSTEM 22000 for 2MBaud // +// use BAUD_SYSTEM 800 for 0.75MBaud // ~ 0.32us bit period +#define BAUD_SYSTEM 22000 /* USB PINS diff --git a/embedded/mkrouter-v06/mkrouter-v06/main.c b/embedded/mkrouter-v06/mkrouter-v06/main.c index b3404024a7a7a0e93f65bb9a134999dbb42ff057..197ba1ec8aa0d52b33d7583c27330dadd5d4389b 100644 --- a/embedded/mkrouter-v06/mkrouter-v06/main.c +++ b/embedded/mkrouter-v06/mkrouter-v06/main.c @@ -230,6 +230,8 @@ int main(void) if(pCdc->IsConfigured(pCdc) != 0){ main_b_cdc_enable = true; } + + uart_sendchar_buffered(&up0, 85); // if config is config, and port is opened if(main_b_cdc_enable){ @@ -237,7 +239,7 @@ int main(void) // loops on this while(1){ sam_ba_monitor_run(); - + apaport_scan(&apap0, 2); apaport_scan(&apap1, 2); apaport_scan(&apap2, 2); @@ -273,7 +275,13 @@ int main(void) //uart_sendchars_buffered(&up0, &testUart, 3); // apaport loops } - + } else { + apaport_scan(&apap0, 2); + apaport_scan(&apap1, 2); + apaport_scan(&apap2, 2); + apaport_scan(&apap3, 2); + apaport_scan(&apap4, 2); + apaport_scan(&apap5, 2); } } }