Resolve confict

2017-06-23 19:14:07 +09:00 · 2017-06-23 19:14:07 +09:00 · 10605e00b9
parent 42fa95c2d0
commit 10605e00b9
2 changed files with 2 additions and 0 deletions
--- a/src/main/drivers/resource.c
+++ b/src/main/drivers/resource.c
@ -62,6 +62,7 @@ const char * const ownerNames[OWNER_TOTAL_COUNT] = {
    "TRANSPONDER",
    "VTX",
    "COMPASS_CS",
+    "SPI_PREINIT",
    "RX_BIND_PLUG",
 };

--- a/src/main/drivers/resource.h
+++ b/src/main/drivers/resource.h
@ -62,6 +62,7 @@ typedef enum {
    OWNER_TRANSPONDER,
    OWNER_VTX,
    OWNER_COMPASS_CS,
+    OWNER_SPI_PREINIT,
    OWNER_RX_BIND_PLUG,
    OWNER_TOTAL_COUNT
 } resourceOwner_e;