Add support for FishDrone_INAV board by Linjieqiang · Pull Request #919 · iNavFlight/inav

Linjieqiang · 2016-12-13T11:43:49Z

Describe

MCU : STM32F405RGT6
Sensor
- Acc : IST-20608
- Gyro : IST-20608
- Baro : MS5611
- Compass : IST-8310
UART
- UART1 for Telemetry
- UART2 for RX receiver
- UART3 for Sonar or others
- UART5 for GPS
OSD : support (MAX7456)
Blackbox : 16MB FLASH & TF
External IIC BUS support (you can connect to other sensor)
Button : enter DFU mode
6 PWM Input support(Also you can use PPM or SBUS)
6 PWM Output support
SWD support
Beeper support
ADC :
- RSSI
- VBAT
- Current

Photo

Release version 1.4

digitalentity · 2016-12-13T11:45:52Z

@Linjieqiang please rebase on development branch.

Linjieqiang · 2016-12-13T11:46:04Z

@digitalentity OK.

Linjieqiang · 2016-12-13T12:06:14Z

@digitalentity Can you merge this in V1.5 nor V1.6?I will go on the code update and the board was tested OK.

digitalentity · 2016-12-13T12:09:03Z

Please rebase on development branch. If this PR will only add a new compass driver - it should be safe to merge into 1.5

Linjieqiang · 2016-12-13T12:10:25Z

@digitalentity OK.I go on my work for this pr.

digitalentity · 2016-12-13T12:39:47Z

@Linjieqiang please consider rebasing against development before making any more changes. I can't merge this PR unless it's done against development branch.

Linjieqiang · 2016-12-13T12:44:42Z

Oh,Sorry.That's my fault.

digitalentity · 2016-12-13T12:46:11Z

I'm trying to save you some time. Changes between development and master are big and with more commits a rebase will become more and more complicated task.

Linjieqiang · 2016-12-13T12:57:01Z

OK.I am trying to rebase it.

…light into FishDrone_INAV # Conflicts: # src/main/drivers/compass_ist8310.c # src/main/drivers/compass_ist8310.h # src/main/io/serial_cli.c # src/main/sensors/compass.h # src/main/sensors/initialisation.c # src/main/target/FishDroneF4NAV/target.h # src/main/target/FishDroneF4NAV/target.mk

Linjieqiang · 2016-12-13T13:42:35Z

@digitalentity Can you review my code again?Is that ok?

digitalentity · 2016-12-13T13:45:22Z

Still merge conflicts in compass.c

Linjieqiang · 2016-12-13T13:51:47Z

But I didn't find out what conflicts in compass.c between two repertories.

digitalentity · 2016-12-13T13:55:35Z

<<<<<<< FishDrone_INAV
        case MAG_IST8310:
#ifdef USE_MAG_IST8310
            if (ist8310Detect(dev)) {
#ifdef MAG_IST8310_ALIGN
                dev->magAlign = MAG_IST8310_ALIGN;
#endif
                magHardware = MAG_IST8310;
            }
#endif
            break;

        case MAG_FAKE:
=======
    case MAG_FAKE:
>>>>>>> development

# Conflicts: # src/main/sensors/compass.c

Linjieqiang · 2016-12-13T14:00:09Z

Oh,I foggot to pull your new code and merge to my code.I will fix it.

martinbudden · 2016-12-13T14:01:52Z

+
+bool ist8310Detect(magDev_t* mag);
+bool ist8310Init(void);
+bool ist8310Read(int16_t *magData);


Init and Read functions do not need to be in the header file, since they are not called directly.

martinbudden · 2016-12-13T14:02:29Z

+#define IST8310_CNTRL2_DRPOL 0x04
+#define IST8310_CNTRL2_DRENA 0x08
+
+bool ist8310Detect(magDev_t* mag)


Can you make the ist8310Detect the last function in the file, to avoid the need for forward declarations.

martinbudden · 2016-12-13T14:02:47Z

+    return true;
+}
+
+bool ist8310Init(void)


This function should be static

OK.I will fix it.Thanks.

martinbudden · 2016-12-13T14:03:02Z

+    return true;
+}
+
+bool ist8310Read(int16_t *magData)


This function should be static.

digitalentity · 2016-12-14T07:09:06Z

+    return true;
+}
+
+bool ist8310Detect(magDev_t* mag)


In INAV sensor detection is usually done with retries. Maybe it's better to comply with the remaining drivers just in case of detection hiccup.

So how do I change?I don't know what your meaning about this.

See how detection is implemented here: https://github.com/iNavFlight/inav/blob/development/src/main/drivers/compass_mag3110.c#L62-L76

digitalentity · 2016-12-14T07:09:44Z

+    }
+
+    // need to modify when confirming the pcb direction
+    magData[X] = -(int16_t)(buf[1] << 8 | buf[0]) * LSB2FSV;


This needs to be done according to datasheet so chip provides valid values according to it's axis, not PCB directions. Chip placement on the PCB in handled using default alignment.

digitalentity · 2016-12-14T07:11:04Z

    MAG_MAG3110 = 4,
    MAG_AK8963 = 5,
-    MAG_FAKE = 6,
+	MAG_IST8310 = 6,


Indentation - 4 spaces

digitalentity · 2016-12-14T07:11:52Z

+
+#define TARGET_BOARD_IDENTIFIER "FDV1"
+
+#define CONFIG_START_FLASH_ADDRESS (0x08080000) //0x08080000 to 0x080A0000 (FLASH_Sector_8)


Not necessary. Config is stored at top of FLASH according to linker script.

digitalentity

Also, please consider adding board documentation to /docs folder

digitalentity · 2016-12-14T07:14:26Z

I suggest we consider merging this into 1.5 but don't provide binaries untill board is released and tested.

Linjieqiang · 2016-12-14T07:47:00Z

@digitalentity Got it.I go to fix it.

…code.

Linjieqiang · 2016-12-14T09:46:30Z

Also, I will add board documentation latter.But this target code was done.

digitalentity · 2016-12-14T15:10:11Z

Superceded by #928

Linjieqiang · 2016-12-14T16:38:25Z

OK,thanks.

digitalentity and others added 2 commits November 28, 2016 20:31

Merge pull request #783 from iNavFlight/development

6bf7a91

Release version 1.4

Add new compass IST-8310 support.

a630c72

digitalentity changed the base branch from master to development December 13, 2016 11:45

digitalentity added this to the 1.6 milestone Dec 13, 2016

Linjieqiang mentioned this pull request Dec 13, 2016

Design a FC for INAV #287

Closed

fix ist8310 init wrong and init target file.

46da00f

Linjieqiang added 3 commits December 13, 2016 20:54

Add new compass IST-8310 support.

acfd13d

fix ist8310 init wrong and init target file.

b444248

fix some code format.

f2e60c3

Linjieqiang added 3 commits December 13, 2016 20:59

fix some mag code to add ist8310

bf16dd2

Add support for onboard OSD and fix compass wrong.

d943f72

Merge remote-tracking branch 'inav/development' into FishDrone_INAV

ac67764

# Conflicts: # src/main/sensors/compass.c

martinbudden reviewed Dec 13, 2016

View reviewed changes

Base on martinbudden advise to fix ist8310 device code format.

53bce51

digitalentity reviewed Dec 14, 2016

View reviewed changes

digitalentity modified the milestones: 1.5 "Happy New Year", 1.6 Dec 14, 2016

digitalentity reviewed Dec 14, 2016

View reviewed changes

Linjieqiang added 3 commits December 14, 2016 15:49

Merge remote-tracking branch 'inav/development' into FishDrone_INAV

f809d26

Fix IST8310 code format.Remove FishDroneINAV board target some unuse …

efa1286

…code.

Add ist8310 compass detect retries.

959c291

digitalentity mentioned this pull request Dec 14, 2016

New taret FISHDRONEF4 #928

Merged

digitalentity closed this Dec 14, 2016

Linjieqiang deleted the FishDrone_INAV branch March 24, 2017 03:16


		#define TARGET_BOARD_IDENTIFIER "FDV1"

		#define CONFIG_START_FLASH_ADDRESS (0x08080000) //0x08080000 to 0x080A0000 (FLASH_Sector_8)

Conversation

Linjieqiang commented Dec 13, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Describe

Photo

Uh oh!

digitalentity commented Dec 13, 2016

Uh oh!

Linjieqiang commented Dec 13, 2016

Uh oh!

Linjieqiang commented Dec 13, 2016

Uh oh!

digitalentity commented Dec 13, 2016

Uh oh!

Linjieqiang commented Dec 13, 2016

Uh oh!

digitalentity commented Dec 13, 2016

Uh oh!

Linjieqiang commented Dec 13, 2016

Uh oh!

digitalentity commented Dec 13, 2016

Uh oh!

Linjieqiang commented Dec 13, 2016

Uh oh!

Linjieqiang commented Dec 13, 2016

Uh oh!

digitalentity commented Dec 13, 2016

Uh oh!

Linjieqiang commented Dec 13, 2016

Uh oh!

digitalentity commented Dec 13, 2016

Uh oh!

Linjieqiang commented Dec 13, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

digitalentity left a comment

Choose a reason for hiding this comment

Uh oh!

digitalentity commented Dec 14, 2016

Uh oh!

Linjieqiang commented Dec 14, 2016

Uh oh!

Linjieqiang commented Dec 14, 2016

Uh oh!

digitalentity commented Dec 14, 2016

Uh oh!

Linjieqiang commented Dec 14, 2016

Uh oh!

Reviewers

Linjieqiang commented Dec 13, 2016 •

edited

Loading