-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Add 'RRIOT_F722' target #10714
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: maintenance-9.x
Are you sure you want to change the base?
Add 'RRIOT_F722' target #10714
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,6 +13,7 @@ | |
| "editor.insertSpaces": true, | ||
| "editor.detectIndentation": false, | ||
| "editor.expandTabs": true, | ||
| "C_Cpp.clang_format_fallbackStyle": "{ BasedOnStyle: Google, IndentWidth: 4, BreakBeforeBraces: Mozilla }" | ||
| "C_Cpp.clang_format_fallbackStyle": "{ BasedOnStyle: Google, IndentWidth: 4, BreakBeforeBraces: Mozilla }", | ||
| "idf.pythonInstallPath": "/opt/homebrew/opt/[email protected]/Frameworks/Python.framework/Versions/3.12/bin/python3" | ||
|
|
||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| target_stm32f722xe(RRIOT_F722) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * This file is part of INAV. | ||
| * | ||
| * INAV is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * INAV is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with INAV. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
|
|
||
| #include <stdint.h> | ||
|
|
||
| #include "platform.h" | ||
| #include "drivers/io.h" | ||
| #include "drivers/timer.h" | ||
| #include "drivers/pwm_mapping.h" | ||
| #include "drivers/bus.h" | ||
| #include "drivers/pinio.h" | ||
|
|
||
| timerHardware_t timerHardware[] = { | ||
|
|
||
| /*DEF_TIM(TIM1, CH2, PA9, TIM_USE_OUTPUT_AUTO, 0, 0 ), // MOTOR1 = correct | ||
| DEF_TIM(TIM1, CH1, PA8, TIM_USE_OUTPUT_AUTO, 0, 0 ), // MOTOR2 = correct | ||
| DEF_TIM(TIM8, CH4, PC9, TIM_USE_OUTPUT_AUTO, 0, 0 ), // MOTOR3 = or CH3/CH4 | ||
| DEF_TIM(TIM8, CH3, PC8, TIM_USE_OUTPUT_AUTO, 0, 0 ), // MOTOR4 = or TIM3/TIM8 | ||
| DEF_TIM(TIM3, CH2, PB5, TIM_USE_OUTPUT_AUTO, 0, 0 ), // MOTOR5 = correct | ||
| DEF_TIM(TIM3, CH1, PB4, TIM_USE_OUTPUT_AUTO, 0, 0 ), // MOTOR6 = correct*/ | ||
|
|
||
| //DEF_TIM(TIM1, CH3, PA10, TIM_USE_CAMERA_CONTROL, 0, 0), | ||
|
|
||
| DEF_TIM(TIM8, CH3, PC8, TIM_USE_OUTPUT_AUTO, 0, 0 ), // S1_OUT – D(2, 4, 7) | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The motor order is wrong. The first timer defined ends up as motor 1, second as motor 2, etc... According to betaflight's configuration it should be: |
||
| DEF_TIM(TIM8, CH4, PC9, TIM_USE_OUTPUT_AUTO, 0, 0 ), // S2_OUT – D(2, 7, 7) | ||
| DEF_TIM(TIM1, CH1, PA8, TIM_USE_OUTPUT_AUTO, 0, 1 ), // S3_OUT – D(2, 1, 6) | ||
| DEF_TIM(TIM1, CH2, PA9, TIM_USE_OUTPUT_AUTO, 0, 1 ), // S4_OUT – D(2, 2, 6) | ||
|
|
||
| }; | ||
|
|
||
| const int timerHardwareCount = sizeof(timerHardware) / sizeof(timerHardware[0]); | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| /* | ||
| * This file is part of INAV. | ||
| * | ||
| * INAV is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * INAV is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with INAV. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #define USE_TARGET_CONFIG | ||
|
|
||
| #define TARGET_BOARD_IDENTIFIER "RIOT" | ||
|
|
||
| #define USBD_PRODUCT_STRING "RRIOT_F722" | ||
|
|
||
| // ******** Board LEDs ********************** | ||
| #define LED0 PC14 | ||
|
|
||
| // ******* Beeper *********** | ||
| #define BEEPER PC13 | ||
| #define BEEPER_INVERTED | ||
|
|
||
| // *********** IMU (Accelerometer and Gyroscope) *********** | ||
| #define BMI270_CS_PIN PA4 | ||
| #define BMI270_SPI_BUS BUS_SPI1 | ||
|
|
||
| #define USE_IMU_BMI270 | ||
| #define IMU_BMI270_ALIGN CW0_DEG | ||
| #define BMI270_SPI_BUS BUS_SPI1 | ||
|
|
||
| #define USE_I2C | ||
| #define USE_I2C_DEVICE_1 | ||
|
|
||
| #define I2C1_SCL PB8 | ||
| #define I2C1_SDA PB9 | ||
| #define DEFAULT_I2C_BUS BUS_I2C1 | ||
|
|
||
| #define BMI270_CS_PIN_1 PA4 | ||
| #define BMI270_EXTI_PIN_1 PB1 | ||
|
|
||
| // *************** Baro ************************** | ||
| #define USE_BARO | ||
| #define BARO_I2C_BUS BUS_I2C1 | ||
| #define USE_BARO_BMP388 | ||
|
|
||
| //*********** Magnetometer / Compass ************* | ||
| #define USE_MAG | ||
| #define MAG_I2C_BUS BUS_I2C1 | ||
| #define USE_MAG_ALL | ||
|
|
||
| // ******* SERIAL ******** | ||
| #define USE_VCP | ||
|
|
||
| #define USE_UART1 | ||
| #define UART1_RX_PIN PB7 | ||
| #define UART1_TX_PIN PB6 | ||
|
|
||
| #define USE_UART2 | ||
| #define UART2_RX_PIN PA3 | ||
| #define UART2_TX_PIN PA2 | ||
|
|
||
| #define USE_UART3 | ||
| #define UART3_RX_PIN PB11 | ||
| #define UART3_TX_PIN PB10 | ||
|
|
||
| #define USE_UART4 | ||
| #define UART4_RX_PIN PA1 | ||
| #define UART4_TX_PIN PA0 | ||
|
|
||
| #define USE_UART5 | ||
| #define UART5_RX_PIN PD2 | ||
| #define UART5_TX_PIN PC12 | ||
|
|
||
| #define USE_UART6 | ||
| #define UART6_RX_PIN PC7 | ||
| #define UART6_TX_PIN PC6 | ||
|
|
||
| #define SERIAL_PORT_COUNT 6 | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should be 7. VCP is included. |
||
|
|
||
| // ******* SPI ******** | ||
| #define USE_SPI | ||
|
|
||
| #define USE_SPI_DEVICE_1 | ||
| #define SPI1_SCK_PIN PA5 | ||
| #define SPI1_MISO_PIN PA6 | ||
| #define SPI1_MOSI_PIN PA7 | ||
|
|
||
| #define USE_SPI_DEVICE_2 | ||
| #define SPI2_SCK_PIN PB13 | ||
| #define SPI2_MISO_PIN PB14 | ||
| #define SPI2_MOSI_PIN PB15 | ||
|
|
||
| #define USE_SPI_DEVICE_3 | ||
| #define SPI3_SCK_PIN PC10 | ||
| #define SPI3_MISO_PIN PC11 | ||
| #define SPI3_MOSI_PIN PB2 | ||
|
|
||
| // ******* ADC ******** | ||
| #define USE_ADC | ||
| //#define ADC_INSTANCE ADC1 | ||
| #define ADC1_DMA_STREAM DMA2_Stream0 | ||
| //#define ADC_CHANNEL_1_PIN PC0 | ||
| #define ADC_CHANNEL_1_PIN PC0 | ||
| #define ADC_CHANNEL_2_PIN PC4 | ||
|
|
||
| #define VBAT_ADC_CHANNEL ADC_CHN_1 | ||
| #define CURRENT_METER_ADC_CHANNEL ADC_CHN_2 | ||
|
|
||
| // ******* OSD ******** | ||
| #define USE_MAX7456 | ||
| #define MAX7456_SPI_BUS BUS_SPI2 | ||
| #define MAX7456_CS_PIN PB12 | ||
|
|
||
| //******* FLASH ******** | ||
| #define USE_FLASHFS | ||
| #define USE_FLASH_W25Q128FV | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should be #define USE_FLASH_M25P16
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Double checking, looks like we haven't used this flash chip in inav yet. You probably set it as recommended. I will have a look if I can enabled it with that driver, or if it needs its own driver. |
||
| #define FLASH_CS_PIN PA15 | ||
| #define FLASH_SPI_BUS BUS_SPI3 | ||
| //#define CAMERA_CONTROL_PIN PA10 | ||
|
|
||
| #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT | ||
|
|
||
| //************ LEDSTRIP ***************** | ||
| #define USE_LED_STRIP | ||
| #define WS2811_PIN PB3 | ||
|
|
||
| // ******* FEATURES ******** | ||
| #define DEFAULT_FEATURES (FEATURE_OSD | FEATURE_TELEMETRY | FEATURE_CURRENT_METER | FEATURE_VBAT) | ||
|
|
||
| #define TARGET_IO_PORTA 0xffff | ||
| #define TARGET_IO_PORTB 0xffff | ||
| #define TARGET_IO_PORTC 0xffff | ||
| #define TARGET_IO_PORTD (BIT(2)) | ||
|
|
||
| #define MAX_PWM_OUTPUT_PORTS 6 | ||
| #define TARGET_MOTOR_COUNT 6 | ||
|
|
||
| // ESC-related features | ||
| #define USE_DSHOT | ||
| #define USE_ESC_SENSOR | ||
| #define USE_SERIAL_4WAY_BLHELI_INTERFACE | ||
|
|
||
| #define PINIO1_BOX 40 | ||
|
|
||
|
|
||
|
|
||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you revert the changes to settings.json?