From f8bfe01eca0f071226aed50a60008178cce09c5d Mon Sep 17 00:00:00 2001 From: Minderring <1701213518@sz.edu.pku.cn> Date: Fri, 18 Jul 2025 11:25:24 +0800 Subject: [PATCH] Add MSP_OSD and other drivers for micoair boards --- boards/micoair/h743-aio/default.px4board | 30 ++++++++++++++-- .../extras/micoair_h743-aio_bootloader.bin | Bin 41024 -> 41040 bytes boards/micoair/h743-aio/firmware.prototype | 2 +- .../micoair/h743-aio/init/rc.board_defaults | 1 + .../h743-aio/nuttx-config/scripts/script.ld | 2 +- boards/micoair/h743-aio/src/board_config.h | 2 -- boards/micoair/h743-aio/src/hw_config.h | 6 ++-- boards/micoair/h743-v2/default.px4board | 33 +++++++++++++++--- .../extras/micoair_h743-v2_bootloader.bin | Bin 41028 -> 41044 bytes boards/micoair/h743-v2/firmware.prototype | 2 +- boards/micoair/h743-v2/init/rc.board_defaults | 1 + .../h743-v2/nuttx-config/scripts/script.ld | 2 +- boards/micoair/h743-v2/src/board_config.h | 2 -- boards/micoair/h743-v2/src/hw_config.h | 6 ++-- boards/micoair/h743/default.px4board | 30 ++++++++++++++-- .../h743/extras/micoair_h743_bootloader.bin | Bin 41020 -> 41036 bytes boards/micoair/h743/firmware.prototype | 2 +- boards/micoair/h743/init/rc.board_defaults | 1 + .../h743/nuttx-config/scripts/script.ld | 2 +- boards/micoair/h743/src/board_config.h | 2 -- boards/micoair/h743/src/hw_config.h | 6 ++-- 21 files changed, 101 insertions(+), 31 deletions(-) mode change 100644 => 100755 boards/micoair/h743/extras/micoair_h743_bootloader.bin diff --git a/boards/micoair/h743-aio/default.px4board b/boards/micoair/h743-aio/default.px4board index 5e68a6dbc5..0fd31b83fc 100644 --- a/boards/micoair/h743-aio/default.px4board +++ b/boards/micoair/h743-aio/default.px4board @@ -7,29 +7,53 @@ CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS1" CONFIG_BOARD_SERIAL_TEL3="/dev/ttyS3" CONFIG_BOARD_SERIAL_TEL4="/dev/ttyS6" CONFIG_BOARD_SERIAL_RC="/dev/ttyS4" +CONFIG_BOARD_PARAM_FILE="/fs/microsd/params" CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_DRIVERS_BAROMETER_DPS310=y +CONFIG_DRIVERS_BATT_SMBUS=y +CONFIG_DRIVERS_CAMERA_CAPTURE=y +CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_CDCACM_AUTOSTART=y CONFIG_COMMON_DIFFERENTIAL_PRESSURE=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE_ASP5033=y -CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE_AUAV=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE_ETS=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE_MS4515=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y +CONFIG_DRIVERS_GNSS_SEPTENTRIO=y CONFIG_DRIVERS_GPS=y +CONFIG_COMMON_HYGROMETERS=y CONFIG_DRIVERS_IMU_BOSCH_BMI088=y CONFIG_DRIVERS_IMU_BOSCH_BMI270=y +CONFIG_COMMON_INS=y CONFIG_COMMON_MAGNETOMETER=y +CONFIG_COMMON_OPTICAL_FLOW=y +CONFIG_DRIVERS_OSD_MSP_OSD=y +CONFIG_DRIVERS_POWER_MONITOR_INA220=y +CONFIG_DRIVERS_POWER_MONITOR_INA226=y +CONFIG_DRIVERS_POWER_MONITOR_INA228=y +CONFIG_DRIVERS_POWER_MONITOR_INA238=y +CONFIG_DRIVERS_POWER_MONITOR_PM_SELECTOR_AUTERION=y +CONFIG_DRIVERS_POWER_MONITOR_VOXLPM=y CONFIG_DRIVERS_PPS_CAPTURE=y CONFIG_DRIVERS_PWM_OUT=y CONFIG_COMMON_RC=y CONFIG_DRIVERS_RC_INPUT=y +CONFIG_DRIVERS_ROBOCLAW=y +CONFIG_COMMON_RPM=y +CONFIG_DRIVERS_SMART_BATTERY_BATMON=y CONFIG_DRIVERS_TAP_ESC=y CONFIG_COMMON_TELEMETRY=y CONFIG_DRIVERS_TONE_ALARM=y CONFIG_DRIVERS_UAVCAN=y CONFIG_BOARD_UAVCAN_INTERFACES=1 +CONFIG_COMMON_UWB=y +CONFIG_COMMON_WIND_SENSOR=y +CONFIG_MODULES_AIRSHIP_ATT_CONTROL=y +CONFIG_MODULES_AIRSPEED_SELECTOR=y +CONFIG_MODULES_ATTITUDE_ESTIMATOR_Q=y CONFIG_MODULES_BATTERY_STATUS=y +CONFIG_MODULES_CAMERA_FEEDBACK=y CONFIG_MODULES_COMMANDER=y CONFIG_MODULES_CONTROL_ALLOCATOR=y CONFIG_MODULES_DATAMAN=y @@ -39,9 +63,9 @@ CONFIG_MODULES_EVENTS=y CONFIG_MODULES_FLIGHT_MODE_MANAGER=y CONFIG_MODULES_FW_ATT_CONTROL=y CONFIG_MODULES_FW_AUTOTUNE_ATTITUDE_CONTROL=y -CONFIG_MODULES_FW_MODE_MANAGER=y -CONFIG_MODULES_FW_LATERAL_LONGITUDINAL_CONTROL=y +CONFIG_MODULES_FW_POS_CONTROL=y CONFIG_MODULES_FW_RATE_CONTROL=y +CONFIG_MODULES_GIMBAL=y CONFIG_MODULES_GYRO_CALIBRATION=y CONFIG_MODULES_GYRO_FFT=y CONFIG_MODULES_LAND_DETECTOR=y diff --git a/boards/micoair/h743-aio/extras/micoair_h743-aio_bootloader.bin b/boards/micoair/h743-aio/extras/micoair_h743-aio_bootloader.bin index 362848ab8018ed036f62c28c1c6323ba077d69fe..09c5d9fc31c8df9c13854d95043e55bb876486df 100755 GIT binary patch delta 1547 zcmYjReN0nV6u`N-{Vp26kVlGyWz50^xDy}Vo-vz`~atm%a%x) z|KOr=KzJXdA~UbLN@rO-hNS}-N|+qNrP6E;wBssifmVWa8Nw@gz3gE6kSxP4{Hbh#N0qDc4UW;2Q~9sW zG=ffGxNZb_zhY^{4meLavSNq9bg>Hj`HMg zhaNU6yY}scf|lSp<+s<1QlU+e8aj+{pAvlM41_zCn!}s;qKh%T*EjZN-B5K!F;G8= z0rh4qIBIYKHPi<}PF9v70Mr}IABq7HsNGCY#xaIX<@GDZeJZS+^enreaj(REDyRhN zyhkFlE&%oV1)n-BUyd3~b!(>DnnS)ZULa(D_AnJGOBJ~-%$bs?> z4p&A=K3(jI5;>_w3PnOrvTYRXBIHDDfw$A`4ud?++aAkDA}ZKMNK4G>0qTsnfby6% z$7OGuJ3VYwDVOVQcN@d^&gCr94{8So@>k>IIJInm3aGO0mEJhXNoLp+GkK?#6d)VQ zV(YycgHnbkPH=*grZamqAtI0$ClxeK^fWrM@}&_hTO>yL&(E|hqWAwWnWu5HeoZ~f2DC3)EoF>iAQ1eAs{ z2DPo8$7h?f7oLm)(HZoq)E*!CSi9IPIkfS}5a7ZW&FjQFQDxu*=KB(d-iw}pU+oh`ZWbNo_^753wXmf1Byb~0tX3DP&g=kP-|M9GIV zLB5_4kuzAUPUpu*oB>KsGgbv-onkB@$@+@gP=cI)gx3@CKVt~!(3I~$#1CAMlB1NX z@mF_bfxE?K1BS;O^*my+%BcmuJFeAR2DNNeRL|DgIst5@Lw1H6X$k^1Z&({6%F9oo zG`7`U^sj2)SlyO1>6a`!n#<|NhPP6(h5D0mjr%gybPeTES-%ePxoMJy*HRfx&eKqd zFG*UGm#wNLHBHJweJuWG zLRsZTJ&2RjB#r+&-rKqneuJ;J&b6FLuzov0?u=xln_Wao&LqI1m0^+9+=f%yEbNt; z-&PCP;nuby7{CKKNe)x~VViAon delta 1583 zcmYjReM}Tb6rb7KJNNVsPW(a?+`R?5RiG#5$5}MOfdg{dlNeiU&`_y}RfN(SlWGIB ze-s;y;$Q(4Y2!yowE}K21#(3tHvPw>r%lAFEon8Nwsy79x#Q?fXAjf5$$PW!z2Cg| z+xKSnhs)gM%Us7{1N>U8H+W3kaI^ZeIgN(^Tcf;i4c-(b!y;T8)eg6*3!_y7UwsS+ zxW*BCaoSxIti$(a?_qjFoEO%qXX1V_##>n2=;5kuUF!qsHXcFk5e2fm$L0fl7W{?S zY8_+ zBIYYl3*J06#e9Iho@TNS|Fd-|+=myJ?wI+2*}E8#0k+;_0`e+z|7uY$m3}k{3hJ_5 zP7~azmcRcVH0lMGs}FW(Oo0|vsy%LoZ>zpf&p}wEZa=Vz&$tvcdAuVZRNg5o%m&)2 zAkc0GeZxW~(7L-ppNr8Fx`5_q{_Y?Ufp(JViTFVb>(^JOk9jp%JmE>{(Xp38UJVoj zE#`%Yr3Yx=^?0>Gxj!ISD|4fihCc5IZ~(C~H#@<)z}Ceh^MKSTBHyr$)y`)4lrf%Ce0ztahgN<4H#U|MtCJpx&%s5351q!nN5Wm4>T zFVob#07<4POv@CCgtP@klvYm2>7e2{>CW;)F&Pok!n`S4326={<^gST$cSXNnnHF@ zlRL_vq)|@t9CMrfe_TvRH4W$u1Ieqh&%0fHDM;{&0dk8PQE~U?&JeLj%IpqWJ+}N5 zq@XyKc2^KeF?k`<80Ms@Y{g*_fy59gq9HPw28Obp)h&X_SB5|z$OMH)8bsq}Hr+~` z)UYrqzq^=C!8Qm6p&dvtkB}@j8QlhUDDinh7a=aZw_)~63;y$S5uE(o<`q|$5n0f* z0lfh|xVIsG!MOksT|Tcy9igEn{YbOAP~nl##rc6m$!#jKwv2^<_7gT7O`0osIMiHL z>oyO-Q82aEZM<#Ft1YW{*Y(9ByymDKUd0thld7);;PO#_g%%B5zF0Iql<8RmTwRo0 zVeMJh87BSXd;)(*L6n@OVRBGX>8J|~Rme~s3}uXc?gB4KP{*G9e|H8n)Mz-H!v0b2ys~&-lz)9j&lnDUZC55ZXN8VCCLnsl%jv94Ml6@~g3tO%5A>@L zV13~EUxy~Nvy5K?op@$r0tYEx(wLAzLO|JiM`XKWXbq#DseM@^B5^4tH^L4%Nt-vt zBE_L@7Jn92bKIx{ak53y@sIGK#*Oege%Lr?WqX*7+zIT{Bat?C3@K?3gVZd)$l7x@ zq_7JZI3zq3g?62Z@yXDO_`^86sR9;awJ8Jk<3F2H;R-drd76Qzzh6C~I!?@n(Tmd@ z+e(*}EGltrNlz~U>bjPl+*HdGS`FDxlRkeGe7#kMIrwSoJnM(-@U3LAb?g`TDUSc# F`7b>1oWuYC diff --git a/boards/micoair/h743-aio/firmware.prototype b/boards/micoair/h743-aio/firmware.prototype index c487b88912..cd0a6ec500 100644 --- a/boards/micoair/h743-aio/firmware.prototype +++ b/boards/micoair/h743-aio/firmware.prototype @@ -7,7 +7,7 @@ "summary": "MicoAir743AIO", "version": "0.1", "image_size": 0, - "image_maxsize": 1835008, + "image_maxsize": 1966080, "git_identity": "", "board_revision": 0 } diff --git a/boards/micoair/h743-aio/init/rc.board_defaults b/boards/micoair/h743-aio/init/rc.board_defaults index 5e3cd5bd60..23d1e77fd3 100644 --- a/boards/micoair/h743-aio/init/rc.board_defaults +++ b/boards/micoair/h743-aio/init/rc.board_defaults @@ -19,6 +19,7 @@ param set-default MC_ROLLRATE_K 0.35 param set-default MC_YAWRATE_K 1.2 param set-default MC_YAWRATE_MAX 360 param set-default MAV_TYPE 2 +param set-default MSP_OSD_CONFIG 102 param set-default CA_AIRFRAME 0 param set-default CA_ROTOR_COUNT 4 param set-default CBRK_SUPPLY_CHK 894281 diff --git a/boards/micoair/h743-aio/nuttx-config/scripts/script.ld b/boards/micoair/h743-aio/nuttx-config/scripts/script.ld index 1dc1a0ef97..85f4990724 100644 --- a/boards/micoair/h743-aio/nuttx-config/scripts/script.ld +++ b/boards/micoair/h743-aio/nuttx-config/scripts/script.ld @@ -110,7 +110,7 @@ MEMORY { ITCM_RAM (rwx) : ORIGIN = 0x00000000, LENGTH = 64K - FLASH (rx) : ORIGIN = 0x08020000, LENGTH = 1792K + FLASH (rx) : ORIGIN = 0x08020000, LENGTH = 1920K DTCM1_RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 64K DTCM2_RAM (rwx) : ORIGIN = 0x20010000, LENGTH = 64K diff --git a/boards/micoair/h743-aio/src/board_config.h b/boards/micoair/h743-aio/src/board_config.h index 9db51a7db7..dcc045b96f 100644 --- a/boards/micoair/h743-aio/src/board_config.h +++ b/boards/micoair/h743-aio/src/board_config.h @@ -53,7 +53,6 @@ * Definitions ****************************************************************************************************/ -// #define FLASH_BASED_PARAMS /* LEDs are driven with push open drain to support Anode to 5V or 3.3V */ @@ -147,7 +146,6 @@ #define BOARD_ENABLE_CONSOLE_BUFFER -#define FLASH_BASED_PARAMS #define BOARD_NUM_IO_TIMERS 4 diff --git a/boards/micoair/h743-aio/src/hw_config.h b/boards/micoair/h743-aio/src/hw_config.h index b02994a1ea..c63c1e6588 100644 --- a/boards/micoair/h743-aio/src/hw_config.h +++ b/boards/micoair/h743-aio/src/hw_config.h @@ -97,9 +97,9 @@ #define INTERFACE_USART_CONFIG "/dev/ttyS0,115200" #define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1176 -#define BOARD_FLASH_SECTORS (14) -#define BOARD_FLASH_SIZE (16 * 128 * 1024) -#define APP_RESERVATION_SIZE (1 * 128 * 1024) +#define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) +#define BOARD_FLASH_SECTORS (15) +#define BOARD_FLASH_SIZE (_FLASH_KBYTES * 1024) #define OSC_FREQ 8 diff --git a/boards/micoair/h743-v2/default.px4board b/boards/micoair/h743-v2/default.px4board index 821021a753..88ec1b6121 100644 --- a/boards/micoair/h743-v2/default.px4board +++ b/boards/micoair/h743-v2/default.px4board @@ -8,29 +8,47 @@ CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS3" CONFIG_BOARD_SERIAL_TEL3="/dev/ttyS4" CONFIG_BOARD_SERIAL_TEL4="/dev/ttyS7" CONFIG_BOARD_SERIAL_RC="/dev/ttyS5" +CONFIG_BOARD_PARAM_FILE="/fs/microsd/params" CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_DRIVERS_BAROMETER_GOERTEK_SPL06=y +CONFIG_DRIVERS_CAMERA_CAPTURE=y +CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_CDCACM_AUTOSTART=y CONFIG_COMMON_DIFFERENTIAL_PRESSURE=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE_ASP5033=y -CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE_AUAV=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE_ETS=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE_MS4515=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y +CONFIG_DRIVERS_GNSS_SEPTENTRIO=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_BOSCH_BMI088=y CONFIG_DRIVERS_IMU_BOSCH_BMI270=y +CONFIG_COMMON_INS=y CONFIG_COMMON_MAGNETOMETER=y +CONFIG_COMMON_OPTICAL_FLOW=y +CONFIG_DRIVERS_OSD_MSP_OSD=y +CONFIG_DRIVERS_POWER_MONITOR_INA220=y +CONFIG_DRIVERS_POWER_MONITOR_INA226=y +CONFIG_DRIVERS_POWER_MONITOR_INA228=y +CONFIG_DRIVERS_POWER_MONITOR_INA238=y +CONFIG_DRIVERS_POWER_MONITOR_PM_SELECTOR_AUTERION=y +CONFIG_DRIVERS_POWER_MONITOR_VOXLPM=y CONFIG_DRIVERS_PPS_CAPTURE=y CONFIG_DRIVERS_PWM_OUT=y CONFIG_COMMON_RC=y CONFIG_DRIVERS_RC_INPUT=y +CONFIG_COMMON_RPM=y +CONFIG_DRIVERS_SMART_BATTERY_BATMON=y CONFIG_DRIVERS_TAP_ESC=y CONFIG_COMMON_TELEMETRY=y CONFIG_DRIVERS_TONE_ALARM=y -CONFIG_DRIVERS_UAVCAN=y -CONFIG_BOARD_UAVCAN_INTERFACES=1 +CONFIG_COMMON_UWB=y +CONFIG_COMMON_WIND_SENSOR=y +CONFIG_MODULES_AIRSHIP_ATT_CONTROL=y +CONFIG_MODULES_AIRSPEED_SELECTOR=y CONFIG_MODULES_BATTERY_STATUS=y +CONFIG_MODULES_CAMERA_FEEDBACK=y CONFIG_MODULES_COMMANDER=y CONFIG_MODULES_CONTROL_ALLOCATOR=y CONFIG_MODULES_DATAMAN=y @@ -40,9 +58,9 @@ CONFIG_MODULES_EVENTS=y CONFIG_MODULES_FLIGHT_MODE_MANAGER=y CONFIG_MODULES_FW_ATT_CONTROL=y CONFIG_MODULES_FW_AUTOTUNE_ATTITUDE_CONTROL=y -CONFIG_MODULES_FW_MODE_MANAGER=y -CONFIG_MODULES_FW_LATERAL_LONGITUDINAL_CONTROL=y +CONFIG_MODULES_FW_POS_CONTROL=y CONFIG_MODULES_FW_RATE_CONTROL=y +CONFIG_MODULES_GIMBAL=y CONFIG_MODULES_GYRO_CALIBRATION=y CONFIG_MODULES_GYRO_FFT=y CONFIG_MODULES_LAND_DETECTOR=y @@ -66,6 +84,8 @@ CONFIG_MODULES_TEMPERATURE_COMPENSATION=y CONFIG_MODULES_UXRCE_DDS_CLIENT=y CONFIG_MODULES_VTOL_ATT_CONTROL=y CONFIG_SYSTEMCMDS_ACTUATOR_TEST=y +CONFIG_SYSTEMCMDS_BL_UPDATE=y +CONFIG_SYSTEMCMDS_BSONDUMP=y CONFIG_SYSTEMCMDS_DMESG=y CONFIG_SYSTEMCMDS_DUMPFILE=y CONFIG_SYSTEMCMDS_FAILURE=y @@ -78,7 +98,10 @@ CONFIG_SYSTEMCMDS_PERF=y CONFIG_SYSTEMCMDS_REBOOT=y CONFIG_SYSTEMCMDS_SD_BENCH=y CONFIG_SYSTEMCMDS_SD_STRESS=y +CONFIG_SYSTEMCMDS_SERIAL_PASSTHRU=y +CONFIG_SYSTEMCMDS_SERIAL_TEST=y CONFIG_SYSTEMCMDS_SYSTEM_TIME=y +CONFIG_SYSTEMCMDS_TESTS=y CONFIG_SYSTEMCMDS_TOP=y CONFIG_SYSTEMCMDS_TOPIC_LISTENER=y CONFIG_SYSTEMCMDS_TUNE_CONTROL=y diff --git a/boards/micoair/h743-v2/extras/micoair_h743-v2_bootloader.bin b/boards/micoair/h743-v2/extras/micoair_h743-v2_bootloader.bin index 678f20842089460e191003ffa6ce0d938f6fb7fc..7038197a01cb11e2a0354b48795025a612b0bbd2 100755 GIT binary patch delta 1610 zcmYk6e{2(F7{}lDde>dYx^;{J8;srcx><08LJ2f(gwn}Tsk6g@4h1q;m|Y02AOs_c zE#Mz08fe~va|7lCNrV|Tjs?aj9lsJZ7^#pjGli+q^4kMfucfoE?-in4@;vYReV)(z z`@Q!e{7&m!yEkrKPf3r5n1bG&CW7wi|lU@@xV6(U$C^aECNKN7B#-S^$+<1-Aj2<1B%2*M^q2!t)DgKO8* zZGe4_*sH_>sG1)~v8||)p8_vS0scIMm(dczO8kd{01u$Ag<^=L?}Y0V!K6c_>+^N& zUcg?{0n66MetiHb;u&Mz-N{N|orFGK@Hl+HfxwQP3hy-qNOn?@AXxIs&0rTKDmCy5e*~>v9jj=NN@Xu3-7=^L^2BE{ zV^0D3+9|g@B%F`4dhdc9b1>{41{T117gSBke%{bSi@E{6n-fE~3}ozT!q0jP%zsD7 zkv=57#Rw})ecLja$p89oACLwEwa_=Sx@y>~ITznPXNJqV@M_#|)5Lsvn%MibZ4|1H zD@Huk8CQzaejkSK8ic}$WKO{6p= z1y_qBJ5nNJ%IIo!=py%zO)A$8s2c}L=f7Fi>9B>%M3##y-(yCs?_JTIR0`7rtxf1% zxeLogvsg&FZA?Hu&zV$qrYL?iDR-ne5tx$7Vw_Yc9FNX>w0$NlJsSmKU2+QGy)zv6=gO#CRGC?P7=&>q?gV4{DBj z%JToQRJv^e>Imk;E_5PTr0<9W&K7dZ*piHPqF;gqjGP4WuLuWAOq7`E+~Ns1Gy^c^ z&kZ;-2Qt!{d8%8&fJ64(MtB@G>@M-0h{MWQq*=}Zw$ONSBx-lP3~W7E36Z_2=}sxV zBlIMC&@5u*3!G9ejc}qZ)GUvtA4gT{Frn%Qb%;<*n!1S1VoEvw4A&L&&t-cwV&)GZ z<_C6&m7SPs@_X6}!QCp#z#`oqtB)2*vOcHGeaAk3)qpx&Bi53R8b*M*deB1jcAOys zvn!(3MNA7Xh*>;V*5bcB?qTn$EdIAbi#UPO3=cJ6Wfk_P^D4UxtG)@-Voje$q>Wj; zsuy8Fe9}%;3(L~bBH~kueWa{Uoj@sOB_@U~;1M=pav`sDn?)uDtlQAdJ^8*H(Po*Z zZ$v2%ZGkh!hvCdSB%%j@s&Q~HT7En3)`~e|KItiuBFi%a`J8{7M{ z!5?Vzr%NloNwIwm9^FGuH=!v{?r$D<1qc*bsY)D4k$YkV#xZGikX&Ll2Fm9}II`Fl zl+#iSKStA9n&D#9-ckX((O^qCoF?f$%hO2Q-Xf?0_@3n4=b>`J1MGw3J;hJIN_4he ZfOY8i_F{d2T>H5sS3_RM{V4Zy>%ZcZt!e-O delta 1535 zcmYjReM}Tb6rb7KJ@@1e55y`cuzP#hs~-0BtYVSMhaFB&Jq_AIqXtpvsj(o%n6!TY zZIjXuTj@Xn6|rfxO>O1q1|t$YKWhIo>8VL+(U$ZhP(Pa0fOE%@o6a7lb(8mI-u!;= z&D-~0=H^B2`-@!QumPS^n+;wgr*){mnila;#Fj)K+>Ey+DsUHWOzei$>f#xyfq(Z1 z5OITR&UZ6!8R21kJM|#bThe^+uzE7>Hz7TR;ewZ|xAvBVmsoiOwL26j%0cS@2&UlA zq%O-SVV>I>D z{MuQjd(82s3D|$c^2)tXR1dA(D_R0wK-2{QwyMI5Zr(KO7!WN?lGK7V-GXV9Z6zir z)X0WcjnJd+*s>qO+4#mwe?u1@c-d#FV}VDlz`hR8DvernYh5Q0c>wGiaC(^vKfs}~ zH-%m7tW4eX%IO4C3)_Cfe=z}`n&OF0^+MHK)1X-` zc+G8ub?Sk-*P)ZJ)GwLvX|R0i#Ccxlo{jo6 zP!6=@ClK>_p#5;(rwuDt!lI?7IMLA(^o;=*kZOvHGAs+Ny*x4v$~_Vq7`3vyix}TI z0UVD)tfdcFv~kAOPWHb&O$hyO-|h$MP;&{a1op-2i^ggUm%~kY^K8$0=hbelJyLtC zHcYZ;wkJ$%)X8)vg%TlOL?pCmA0a0q4)5{8f)JGEBSJdZsk4%h)`;B$wCPa+DQq=H zZQl06#88$-IT;_t>FaJ#0hRY{?}?I(c(nZyi`Tl=i5w`6dGCopIoT5>IL66IZ2dSU zAz+V^QW_;j8XhTl*t8VRzcd1ZARm-su|*OpSQqPXcFW>=)K|``Z5;-~&<14aAtaA= zK(~Pn%DhMHC1hztuOYA<*&(t~*D>xf_v!z*T--PFvCTVjdIe-gGY9pbKN~h=o4l+) zz#Oz|6au*W331j{>Oe7a;R#+~ykV6-9n-Ia@dl6&DZ$jRyTSiw z8o0aKYQ^cFy6a~+7*@q2-yMXu54zZGdsyTc**6IsYvOU6=rjZz#UVYDwUk$$M`oFl zee|y1H&#<&mj6g|pt+o3Y)fp@A4+yp9=ZArh_{(#-QGkMH02kMR~#p8 zil@GI(%i2nuz-&C7{|eLI>AoQ^_(d*hk!FBSgr9uAN(*Y1JD0HGNs*qei?M*jJ6C8 zQv5<&MlOj0N9B;jypw4IOFduvx`tXNS2)Y48rmt_5i)nD`A`T?U zb7W@!_5vZt`oDl3&Ye#XueQ_+!T_+dkYO%}m&$)XjTuD}?U&Q&A0DTnpq1-5Lq|d*L z;uetE8S#PrZaMqN*rcD>Lk}{FM3&+PNM%Ms*j2Y?H%=IDMH(1KnjHpCOnFpHapOp5 z29KW-%e+j#FHRsvB7~r}$TL%D?|9Hl4WzZC&v#H*Zkd~#gTq#eXfV-t37f~FgGbqM z(MZDx_-l$QAgA6ocng3}1ZpMrx6k0+3@ni%4d8)5Tey(*&;8xsg?{*M)lih_3G@OJ>@GXSCPjB@qRaI zs1}N&C@Mk6bra>n2(zwJrUIQ2#mx|5XNjlvvAt9aipk(;3dVI5fnDjSmbVs+&I_z! zx>0OkM_P`uD$tbvav~*DE6!dJLK8*)v^&~{w4JshHlFnv1bgAk?prn$*hQloC+fI@ z8hYAoTQcloxmzB2_2nOGf=f9{rsLMvB!t1@{(JQ3rLm@cxY~?fme%wOCtH`WpXr0F zU%`|mo{cZ5iRp;Wfx}LYGKLpxIZCdb_ZNMzRoXN|W!VfvTTOSKp@|}&;HD4IO(^c_ z%QO;D7&0~8Eh#e3y-c7J4(N3p4a)S|q$AaMBx`Dr_B^W}K;1WeP)r^vEL3~Xwr-g; zt4DEU4>1>}n`@u@Q1lypm+}QoV(oKf!YeC1T{^P!`mcLwID|VwXsgJ7?~-)!r*1!q zlYR)7;=o^RNFzThCnA5#h2nJFm(|j$SD=l!E7kHQio5TE`3DqdMgEQ}=ohrbgFf#; zpK&2Gz|R1DhnJ2!Rn5Tde^gCz6Wsqlwbiq*jymu}62H$QejgzI@{8~j9z-=|_8>k0 z#0Nc!b3tIOCtY%uR?82_L501pcve!SUP2F5R~S9$GM5>}mG!8ie>dMxt2pcC@592d ztHUC{X>5YYGXYiPJt+kRW`g+Kz8jY!r!44|6v~8tW{+X0$3$_9T(zuW=q|MKU9ab~ zWX`g_p3|hCVeJ>1S|vp0b0422aC&oGqxiR6MVV>lp@#ngdkZ8_q)Qh02p8A3ZIYi= zvO&dJnR?U)-*lC#CbV`v@&zEl_9QO`bRyzHkg_6tMvxB zkcJ}v@z^taKkDuQGteDJjQIVR2Ul#D-yqi)>-;h=r*_qYlYZ)tViuBsB5+V-MbYu7 zTOEd>htuS_ePDqP!LCrZgjxvGX@p`Hk+3B#Va?!TX*TNHQoWnEkI=Bm`ls>M)J6HIzCR6Wg6T{ z(xBWzO3Jn=iyW71^zi(JD%Qo%v&-4@wqu~n=RkXjy-X9FX_pV0kb}25;{cKDkhdmw z?IlTTlsJ&&t}(ne49KnE%AZ300}#qKWucEOm(~=~_+J*EwKrvRSKDzkQqzMfi) zwSA$z$c~~@S$fc45dfkM&`V^c)`Bt2M8M1=0qZq5$TEGs4~74mq;Cw&I_}!Qy@tjO zEEcrL$$#kLYIb1Ov50S4cGVon8VUrrCk)%yCaXl&Dv>4kgf8C_S za_MHX$-~Vj@KI9p$1Z%9q*Z3%ousz%JqWumD$DUjQdm`vx03EEC2;$ya&ZHR-*PVa zUAu}kb)7Uaki!%~8^t*Jg~YZ+gn72DwJ9G9H2amsYjE;7h<4l=yF8NmR>eB`ox*pv z`$A|EWtmi*$No(SO-J1S!h9!x$8vnzT8ys|@9p`xnJn9$8DO?!4N^%Nh+@8q9pNiU z+x8@^Cy%zD!|#!Oe=13PC?3*LyJr4e|SobQR9;sDqGHd6p&WC$c zkPA^*illb_aEHX*z{!xQD~?3e6yS8Su_h3!NnOo;F!Q;`_3;4jvHhk93Z?$8H%62}+9?_OzOen53t}Rw(%gE-sSxR50+Jisjq*)Y~He|e*#7Y=} zPa-$#a`6BO**PCu$f}*^u#@=gnxcK|_G-q-{wzM|;4h5OY;hZAaWiukae_cK$Fs~? z2Y-*O*p&l6{<&Qd;4A*Ns{r37%KChKnyjn80CuZv$W$aXAO!hLZ7iH199i43 zaaqD%cNjQSjJQd^;kN#2%LV+55ft~c6o}Uf(BlS@kC_5C%!TohD@t{)sMmxS*45`8YmI@)nc`WFJYI9 zQdut2Y+fhD($T(Zsh=-uARCkBNxcOI4=5i>H?MO}?vxaW6&Z_sSWHAOMSqcx5_{U> zSottYsnz>h(d3}+4IGW6zd;JUH2s}zw3Hd?M4U`UK8%#v-6Z@-IDvm4xFMj8UGU~h= z?mGoV2YEQ3fFX+fc{iGpZdHNKO~k7y3hyPaH*LTR$&senxSiZ3eez6#JpIJ zm~Q}g6Q}~H4rmvUPZ?rXE*q8Av3j(AHCA6N9qsP{oPP7~*P`6=k`3wQ mKZ<4yQ^c`v8tFKp!FlAti73AY_*v3`mj?;zhs672%KrfhN^Wcb delta 4510 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 YKpq^930woeRXXtUAfbJWM7)#yU;TE2o&W#< diff --git a/boards/micoair/h743/firmware.prototype b/boards/micoair/h743/firmware.prototype index 92f7847051..57e1730340 100644 --- a/boards/micoair/h743/firmware.prototype +++ b/boards/micoair/h743/firmware.prototype @@ -7,7 +7,7 @@ "summary": "MicoAir743", "version": "0.1", "image_size": 0, - "image_maxsize": 1835008, + "image_maxsize": 1966080, "git_identity": "", "board_revision": 0 } diff --git a/boards/micoair/h743/init/rc.board_defaults b/boards/micoair/h743/init/rc.board_defaults index 55b69959dc..b75fc32b5f 100644 --- a/boards/micoair/h743/init/rc.board_defaults +++ b/boards/micoair/h743/init/rc.board_defaults @@ -19,6 +19,7 @@ param set-default MC_ROLLRATE_K 0.35 param set-default MC_YAWRATE_K 1.2 param set-default MC_YAWRATE_MAX 360 param set-default MAV_TYPE 2 +param set-default MSP_OSD_CONFIG 102 param set-default CA_AIRFRAME 0 param set-default CA_ROTOR_COUNT 4 param set-default CBRK_SUPPLY_CHK 894281 diff --git a/boards/micoair/h743/nuttx-config/scripts/script.ld b/boards/micoair/h743/nuttx-config/scripts/script.ld index 1dc1a0ef97..85f4990724 100644 --- a/boards/micoair/h743/nuttx-config/scripts/script.ld +++ b/boards/micoair/h743/nuttx-config/scripts/script.ld @@ -110,7 +110,7 @@ MEMORY { ITCM_RAM (rwx) : ORIGIN = 0x00000000, LENGTH = 64K - FLASH (rx) : ORIGIN = 0x08020000, LENGTH = 1792K + FLASH (rx) : ORIGIN = 0x08020000, LENGTH = 1920K DTCM1_RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 64K DTCM2_RAM (rwx) : ORIGIN = 0x20010000, LENGTH = 64K diff --git a/boards/micoair/h743/src/board_config.h b/boards/micoair/h743/src/board_config.h index 48ff3ff203..77004d0742 100644 --- a/boards/micoair/h743/src/board_config.h +++ b/boards/micoair/h743/src/board_config.h @@ -53,7 +53,6 @@ * Definitions ****************************************************************************************************/ -// #define FLASH_BASED_PARAMS /* LEDs are driven with push open drain to support Anode to 5V or 3.3V */ @@ -145,7 +144,6 @@ #define BOARD_ENABLE_CONSOLE_BUFFER -#define FLASH_BASED_PARAMS #define BOARD_NUM_IO_TIMERS 4 diff --git a/boards/micoair/h743/src/hw_config.h b/boards/micoair/h743/src/hw_config.h index a428dd5359..5ed1180829 100644 --- a/boards/micoair/h743/src/hw_config.h +++ b/boards/micoair/h743/src/hw_config.h @@ -97,9 +97,9 @@ #define INTERFACE_USART_CONFIG "/dev/ttyS0,115200" #define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1166 -#define BOARD_FLASH_SECTORS (14) -#define BOARD_FLASH_SIZE (16 * 128 * 1024) -#define APP_RESERVATION_SIZE (1 * 128 * 1024) +#define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) +#define BOARD_FLASH_SECTORS (15) +#define BOARD_FLASH_SIZE (_FLASH_KBYTES * 1024) #define OSC_FREQ 8