Skip to content
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

Add BrainFPV (+history -branding) #36

Merged
merged 134 commits into from
Nov 26, 2015
Merged

Conversation

fujin
Copy link
Collaborator

@fujin fujin commented Nov 25, 2015

I have extracted the entire Brain history, minus any branding-specific changes, during the time that Brain was maintained out of tree and TauLabs was operational (up to the fork point, next.. some time, along Endo.)

Any branding changes can be re-made (I have them on another branch) by BrainFPV LLC for branding-specific/marketing release, would be my thought. I'm certainly happy to help.

TODO

  • Gather all branding related changes (gcs, android gcs, java uavobjects stuff.) onto another branch
  • Fix indentation for .ui files
  • Fix indentation for .xml files

@mlyle mlyle mentioned this pull request Nov 25, 2015
4 tasks
@fujin fujin changed the title Add brain (+history) Add BrainFPV (+history -branding) Nov 25, 2015
@@ -1,4 +1,17 @@
# Tau Labs
# Tau Labs - Brain FPV Flight Controller
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope :-P
Also, I don't know if we should really keep all the brain stuff below since we don't detail other targets.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to merge this if we've got a new readme.md from #4 ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will drop this out. Just an artefact of the rebase.

@tracernz
Copy link
Member

There are a few indentation issues, and unrelated things that seem to have slipped in but on the whole this looks good once those are addressed. I haven't reviewed any of the brain specific code in detail since it isn't new code and has prior test.

@tracernz
Copy link
Member

It's a pain that Github won't show all the diff so you have to drill through individual commits to add comments. :-(

@dustin
Copy link
Member

dustin commented Nov 25, 2015

I'm generally dissatisfied with github's code review. It's slightly better than it used to be, but I use good stuff every day. :/

@mlyle
Copy link
Member

mlyle commented Nov 25, 2015

jenkins, test this please

@mlyle
Copy link
Member

mlyle commented Nov 26, 2015

pios_board.c: In function 'PIOS_Board_Init':
pios_board.c:472:2: warning: implicit declaration of function 'EventDispatcherInitialize' [-Wimplicit-function-declaration]
  EventDispatcherInitialize();
  ^
 CC          flight/targets/brain/fw/pios_usb_board_data.c
 CC          flight/Libraries/alarms.c
 CC          flight/UAVTalk/uavtalk.c
make[1]: *** No rule to make target `/var/lib/jenkins/jobs/dron/workspace@3/Nodes/master/flight/UAVObjects/eventdispatcher.c', needed by `/var/lib/jenkins/jobs/dron/workspace@3/Nodes/master/build/fw_brain/eventdispatcher.o'.  Stop.

needs eventdispatcher.c removed from Makefile

@fujin
Copy link
Collaborator Author

fujin commented Nov 26, 2015

@mlyle got it thx, looking

@fujin
Copy link
Collaborator Author

fujin commented Nov 26, 2015

@mlyle fixed in 6637c41, sorry about that. slipped in :)

@mlyle
Copy link
Member

mlyle commented Nov 26, 2015

Was conflict from another PR since, so, not even your fault :)

BrainFPV and others added 14 commits November 26, 2015 14:50
* This commit re-adds a few missing files that were automatically
  resolved toward the upstream side in the rebase.
* Add missing taskinfo fields (onscreendisplay)
* Tabify taskinfo.xml
* Enable BrainFPV modules
* Add OSD board capabilities to other targets.Only the BrainFPV
  supports OSD, so these are all false.
@fujin
Copy link
Collaborator Author

fujin commented Nov 26, 2015

fixed the sparkybgc conflict.. (38fa18f)

@@ -0,0 +1,633 @@
/*******************************************************************************
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is currently used by the OSD. Compared to the other printf in, it has floating point support. However, there are some weird bugs that can lead to a crash, so we should find a better solution at some point. c.f.

BrainFPV/TauLabs@acf781f

@mluessi
Copy link
Member

mluessi commented Nov 26, 2015

This looks good to me. Thanks for the hard work @fujin. Does this mean d-ronin is open to have closed hw boards in-tree? Having in-tree support for Brain (and future boards) would definitely be a good reason for BrainFPV to adopt d-ronin as official firmware.

@mlyle
Copy link
Member

mlyle commented Nov 26, 2015

:) Yes we want to merge brain as soon as you give the OK.

It would be really nice if you could give us some kind of cut-down schematic --- just what you're comfortable with --- to make it easier to maintain. I know it's not essential but some people (me) have an easier time keeping track of I/O's/assignments when looking at a picture.

@mluessi
Copy link
Member

mluessi commented Nov 26, 2015

@mlyle yes, I'm fine with merging. I will click the button then :).

I can add the schematic that shows everything except the OSD part, it will make it easier to develop for the board.

mluessi added a commit that referenced this pull request Nov 26, 2015
Add BrainFPV (+history -branding)
@mluessi mluessi merged commit d323889 into d-ronin:next Nov 26, 2015
@jihlein
Copy link
Collaborator

jihlein commented Nov 26, 2015

Brain not built as part of make package, at least for Windows build environment.

@mlyle
Copy link
Member

mlyle commented Nov 26, 2015

@jihlein thanks for the report. package and branding is going to pretty much completely change in the next few days so it may not be worth any effort.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants