Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 05:15:25 +03:00
Code Issues Wiki Activity

Resolve confict

Browse source
This commit is contained in:
jflyper 2017-06-23 19:14:07 +09:00
parent 42fa95c2d0
commit 10605e00b9
2 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/drivers/resource.c
View file

@ -62,6 +62,7 @@ const char * const ownerNames[OWNER_TOTAL_COUNT] = {
"TRANSPONDER", "TRANSPONDER",
"VTX", "VTX",
"COMPASS_CS", "COMPASS_CS",
"SPI_PREINIT",
"RX_BIND_PLUG", "RX_BIND_PLUG",
}; };

1
src/main/drivers/resource.h
View file

@ -62,6 +62,7 @@ typedef enum {
OWNER_TRANSPONDER, OWNER_TRANSPONDER,
OWNER_VTX, OWNER_VTX,
OWNER_COMPASS_CS, OWNER_COMPASS_CS,
OWNER_SPI_PREINIT,
OWNER_RX_BIND_PLUG, OWNER_RX_BIND_PLUG,
OWNER_TOTAL_COUNT OWNER_TOTAL_COUNT
} resourceOwner_e; } resourceOwner_e;