From 77d9afbe14f4f67072b415fe720638464751b81d Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Wed, 29 May 2024 21:24:19 +0200 Subject: [PATCH] Lee controller: fix inconsisten order h/c file * h file had #ifdef CONFIG_CONTROLLER_OOT after Lee; c-file had it before * Add define to force usage of Lee controller --- src/modules/src/controller/controller.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/src/controller/controller.c b/src/modules/src/controller/controller.c index 0ef658a8ab..62aefed00b 100644 --- a/src/modules/src/controller/controller.c +++ b/src/modules/src/controller/controller.c @@ -29,10 +29,10 @@ static ControllerFcns controllerFunctions[] = { {.init = controllerMellingerFirmwareInit, .test = controllerMellingerFirmwareTest, .update = controllerMellingerFirmware, .name = "Mellinger"}, {.init = controllerINDIInit, .test = controllerINDITest, .update = controllerINDI, .name = "INDI"}, {.init = controllerBrescianiniInit, .test = controllerBrescianiniTest, .update = controllerBrescianini, .name = "Brescianini"}, + {.init = controllerLeeFirmwareInit, .test = controllerLeeFirmwareTest, .update = controllerLeeFirmware, .name = "Lee"}, #ifdef CONFIG_CONTROLLER_OOT {.init = controllerOutOfTreeInit, .test = controllerOutOfTreeTest, .update = controllerOutOfTree, .name = "OutOfTree"}, #endif - {.init = controllerLeeFirmwareInit, .test = controllerLeeFirmwareTest, .update = controllerLeeFirmware, .name = "Lee"}, }; @@ -55,6 +55,8 @@ void controllerInit(ControllerType controller) { #define CONTROLLER ControllerTypeMellinger #elif defined(CONFIG_CONTROLLER_BRESCIANINI) #define CONTROLLER ControllerTypeBrescianini + #elif defined(CONFIG_CONTROLLER_LEE) + #define CONTROLLER ControllerTypeLee #else #define CONTROLLER ControllerTypeAutoSelect #endif