diff --git a/flight/pios/inc/pios_dsm_priv.h b/flight/pios/inc/pios_dsm_priv.h index 1cdf88f75..e42045363 100644 --- a/flight/pios/inc/pios_dsm_priv.h +++ b/flight/pios/inc/pios_dsm_priv.h @@ -109,13 +109,6 @@ */ // #define DSM_LOST_FRAME_COUNTER -/* DSM protocol variations */ -enum pios_dsm_proto { - PIOS_DSM_PROTO_DSM2, - PIOS_DSM_PROTO_DSMX10BIT, - PIOS_DSM_PROTO_DSMX11BIT, -}; - /* DSM receiver instance configuration */ struct pios_dsm_cfg { struct stm32_gpio bind; @@ -127,7 +120,6 @@ extern int32_t PIOS_DSM_Init(uint32_t *dsm_id, const struct pios_dsm_cfg *cfg, const struct pios_com_driver *driver, uint32_t lower_id, - enum pios_dsm_proto proto, uint8_t bind); #endif /* PIOS_DSM_PRIV_H */ diff --git a/flight/pios/stm32f10x/pios_dsm.c b/flight/pios/stm32f10x/pios_dsm.c index 2a5ee90d9..b1ba35004 100644 --- a/flight/pios/stm32f10x/pios_dsm.c +++ b/flight/pios/stm32f10x/pios_dsm.c @@ -69,7 +69,6 @@ struct pios_dsm_state { struct pios_dsm_dev { enum pios_dsm_dev_magic magic; const struct pios_dsm_cfg *cfg; - enum pios_dsm_proto proto; struct pios_dsm_state state; }; @@ -269,7 +268,6 @@ int32_t PIOS_DSM_Init(uint32_t *dsm_id, const struct pios_dsm_cfg *cfg, const struct pios_com_driver *driver, uint32_t lower_id, - enum pios_dsm_proto proto, uint8_t bind) { PIOS_DEBUG_Assert(dsm_id); @@ -285,7 +283,6 @@ int32_t PIOS_DSM_Init(uint32_t *dsm_id, /* Bind the configuration to the device instance */ dsm_dev->cfg = cfg; - dsm_dev->proto = proto; /* Bind the receiver if requested */ if (bind) { diff --git a/flight/pios/stm32f4xx/pios_dsm.c b/flight/pios/stm32f4xx/pios_dsm.c index 6b54b9cc8..44b3d022d 100644 --- a/flight/pios/stm32f4xx/pios_dsm.c +++ b/flight/pios/stm32f4xx/pios_dsm.c @@ -72,7 +72,6 @@ struct pios_dsm_state { struct pios_dsm_dev { enum pios_dsm_dev_magic magic; const struct pios_dsm_cfg *cfg; - enum pios_dsm_proto proto; struct pios_dsm_state state; }; @@ -269,7 +268,6 @@ int32_t PIOS_DSM_Init(uint32_t *dsm_id, const struct pios_dsm_cfg *cfg, const struct pios_com_driver *driver, uint32_t lower_id, - enum pios_dsm_proto proto, uint8_t bind) { PIOS_DEBUG_Assert(dsm_id); @@ -285,7 +283,6 @@ int32_t PIOS_DSM_Init(uint32_t *dsm_id, /* Bind the configuration to the device instance */ dsm_dev->cfg = cfg; - dsm_dev->proto = proto; /* Bind the receiver if requested */ if (bind) { diff --git a/flight/targets/boards/coptercontrol/firmware/pios_board.c b/flight/targets/boards/coptercontrol/firmware/pios_board.c index fdbdde5a0..62232d832 100644 --- a/flight/targets/boards/coptercontrol/firmware/pios_board.c +++ b/flight/targets/boards/coptercontrol/firmware/pios_board.c @@ -480,27 +480,9 @@ void PIOS_Board_Init(void) } #endif /* PIOS_INCLUDE_GPS */ break; - case HWSETTINGS_CC_MAINPORT_DSM2: - case HWSETTINGS_CC_MAINPORT_DSMX10BIT: - case HWSETTINGS_CC_MAINPORT_DSMX11BIT: + case HWSETTINGS_CC_MAINPORT_DSM: #if defined(PIOS_INCLUDE_DSM) { - enum pios_dsm_proto proto; - switch (hwsettings_cc_mainport) { - case HWSETTINGS_CC_MAINPORT_DSM2: - proto = PIOS_DSM_PROTO_DSM2; - break; - case HWSETTINGS_CC_MAINPORT_DSMX10BIT: - proto = PIOS_DSM_PROTO_DSMX10BIT; - break; - case HWSETTINGS_CC_MAINPORT_DSMX11BIT: - proto = PIOS_DSM_PROTO_DSMX11BIT; - break; - default: - PIOS_Assert(0); - break; - } - uint32_t pios_usart_dsm_id; if (PIOS_USART_Init(&pios_usart_dsm_id, &pios_usart_dsm_main_cfg)) { PIOS_Assert(0); @@ -511,7 +493,7 @@ void PIOS_Board_Init(void) &pios_dsm_main_cfg, &pios_usart_com_driver, pios_usart_dsm_id, - proto, 0)) { + 0)) { PIOS_Assert(0); } @@ -654,27 +636,9 @@ void PIOS_Board_Init(void) } #endif /* PIOS_INCLUDE_PPM_FLEXI */ break; - case HWSETTINGS_CC_FLEXIPORT_DSM2: - case HWSETTINGS_CC_FLEXIPORT_DSMX10BIT: - case HWSETTINGS_CC_FLEXIPORT_DSMX11BIT: + case HWSETTINGS_CC_FLEXIPORT_DSM: #if defined(PIOS_INCLUDE_DSM) { - enum pios_dsm_proto proto; - switch (hwsettings_cc_flexiport) { - case HWSETTINGS_CC_FLEXIPORT_DSM2: - proto = PIOS_DSM_PROTO_DSM2; - break; - case HWSETTINGS_CC_FLEXIPORT_DSMX10BIT: - proto = PIOS_DSM_PROTO_DSMX10BIT; - break; - case HWSETTINGS_CC_FLEXIPORT_DSMX11BIT: - proto = PIOS_DSM_PROTO_DSMX11BIT; - break; - default: - PIOS_Assert(0); - break; - } - uint32_t pios_usart_dsm_id; if (PIOS_USART_Init(&pios_usart_dsm_id, &pios_usart_dsm_flexi_cfg)) { PIOS_Assert(0); @@ -685,7 +649,7 @@ void PIOS_Board_Init(void) &pios_dsm_flexi_cfg, &pios_usart_com_driver, pios_usart_dsm_id, - proto, hwsettings_DSMxBind)) { + hwsettings_DSMxBind)) { PIOS_Assert(0); } diff --git a/flight/targets/boards/discoveryf4bare/firmware/pios_board.c b/flight/targets/boards/discoveryf4bare/firmware/pios_board.c index 2e8971636..7f8cf2812 100644 --- a/flight/targets/boards/discoveryf4bare/firmware/pios_board.c +++ b/flight/targets/boards/discoveryf4bare/firmware/pios_board.c @@ -276,7 +276,7 @@ static void PIOS_Board_configure_com(const struct pios_usart_cfg *usart_port_cfg } static void PIOS_Board_configure_dsm(const struct pios_usart_cfg *pios_usart_dsm_cfg, const struct pios_dsm_cfg *pios_dsm_cfg, - const struct pios_com_driver *usart_com_driver, enum pios_dsm_proto *proto, + const struct pios_com_driver *usart_com_driver, ManualControlSettingsChannelGroupsOptions channelgroup, uint8_t *bind) { uint32_t pios_usart_dsm_id; @@ -287,7 +287,7 @@ static void PIOS_Board_configure_dsm(const struct pios_usart_cfg *pios_usart_dsm uint32_t pios_dsm_id; if (PIOS_DSM_Init(&pios_dsm_id, pios_dsm_cfg, usart_com_driver, - pios_usart_dsm_id, *proto, *bind)) { + pios_usart_dsm_id, *bind)) { PIOS_Assert(0); } @@ -614,34 +614,14 @@ void PIOS_Board_Init(void) } #endif break; - case HWSETTINGS_RM_MAINPORT_DSM2: - case HWSETTINGS_RM_MAINPORT_DSMX10BIT: - case HWSETTINGS_RM_MAINPORT_DSMX11BIT: - { - enum pios_dsm_proto proto; - switch (hwsettings_mainport) { - case HWSETTINGS_RM_MAINPORT_DSM2: - proto = PIOS_DSM_PROTO_DSM2; - break; - case HWSETTINGS_RM_MAINPORT_DSMX10BIT: - proto = PIOS_DSM_PROTO_DSMX10BIT; - break; - case HWSETTINGS_RM_MAINPORT_DSMX11BIT: - proto = PIOS_DSM_PROTO_DSMX11BIT; - break; - default: - PIOS_Assert(0); - break; - } - + case HWSETTINGS_RM_MAINPORT_DSM: // Force binding to zero on the main port hwsettings_DSMxBind = 0; // TODO: Define the various Channelgroup for Revo dsm inputs and handle here PIOS_Board_configure_dsm(&pios_usart_dsm_main_cfg, &pios_dsm_main_cfg, - &pios_usart_com_driver, &proto, MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMMAINPORT, &hwsettings_DSMxBind); - } - break; + &pios_usart_com_driver, MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMMAINPORT, &hwsettings_DSMxBind); + break; case HWSETTINGS_RM_MAINPORT_DEBUGCONSOLE: #if defined(PIOS_INCLUDE_DEBUG_CONSOLE) { @@ -683,30 +663,11 @@ void PIOS_Board_Init(void) case HWSETTINGS_RM_FLEXIPORT_GPS: PIOS_Board_configure_com(&pios_usart_flexi_cfg, PIOS_COM_GPS_RX_BUF_LEN, -1, &pios_usart_com_driver, &pios_com_gps_id); break; - case HWSETTINGS_RM_FLEXIPORT_DSM2: - case HWSETTINGS_RM_FLEXIPORT_DSMX10BIT: - case HWSETTINGS_RM_FLEXIPORT_DSMX11BIT: - { - enum pios_dsm_proto proto; - switch (hwsettings_flexiport) { - case HWSETTINGS_RM_FLEXIPORT_DSM2: - proto = PIOS_DSM_PROTO_DSM2; - break; - case HWSETTINGS_RM_FLEXIPORT_DSMX10BIT: - proto = PIOS_DSM_PROTO_DSMX10BIT; - break; - case HWSETTINGS_RM_FLEXIPORT_DSMX11BIT: - proto = PIOS_DSM_PROTO_DSMX11BIT; - break; - default: - PIOS_Assert(0); - break; - } + case HWSETTINGS_RM_FLEXIPORT_DSM: // TODO: Define the various Channelgroup for Revo dsm inputs and handle here PIOS_Board_configure_dsm(&pios_usart_dsm_flexi_cfg, &pios_dsm_flexi_cfg, - &pios_usart_com_driver, &proto, MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMFLEXIPORT, &hwsettings_DSMxBind); - } - break; + &pios_usart_com_driver, MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMFLEXIPORT, &hwsettings_DSMxBind); + break; case HWSETTINGS_RM_FLEXIPORT_DEBUGCONSOLE: #if defined(PIOS_INCLUDE_DEBUG_CONSOLE) { diff --git a/flight/targets/boards/osd/firmware/pios_board.c b/flight/targets/boards/osd/firmware/pios_board.c index 9f2abcc69..e125eb151 100644 --- a/flight/targets/boards/osd/firmware/pios_board.c +++ b/flight/targets/boards/osd/firmware/pios_board.c @@ -418,29 +418,10 @@ void PIOS_Board_Init(void) #endif /* PIOS_INCLUDE_I2C */ /* break; - case HWSETTINGS_RV_FLEXIPORT_DSM2: - case HWSETTINGS_RV_FLEXIPORT_DSMX10BIT: - case HWSETTINGS_RV_FLEXIPORT_DSMX11BIT: - { - enum pios_dsm_proto proto; - switch (hwsettings_rv_flexiport) { - case HWSETTINGS_RV_FLEXIPORT_DSM2: - proto = PIOS_DSM_PROTO_DSM2; - break; - case HWSETTINGS_RV_FLEXIPORT_DSMX10BIT: - proto = PIOS_DSM_PROTO_DSMX10BIT; - break; - case HWSETTINGS_RV_FLEXIPORT_DSMX11BIT: - proto = PIOS_DSM_PROTO_DSMX11BIT; - break; - default: - PIOS_Assert(0); - break; - } + case HWSETTINGS_RV_FLEXIPORT_DSM: //TODO: Define the various Channelgroup for Revo dsm inputs and handle here PIOS_Board_configure_dsm(&pios_usart_dsm_flexi_cfg, &pios_dsm_flexi_cfg, - &pios_usart_com_driver, &proto, MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMMAINPORT,&hwsettings_DSMxBind); - } + &pios_usart_com_driver, MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMMAINPORT,&hwsettings_DSMxBind); break; case HWSETTINGS_RV_FLEXIPORT_COMAUX: PIOS_Board_configure_com(&pios_usart_flexi_cfg, PIOS_COM_AUX_RX_BUF_LEN, PIOS_COM_AUX_TX_BUF_LEN, &pios_usart_com_driver, &pios_com_aux_id); diff --git a/flight/targets/boards/revolution/firmware/pios_board.c b/flight/targets/boards/revolution/firmware/pios_board.c index 1f8029992..30cea4eef 100644 --- a/flight/targets/boards/revolution/firmware/pios_board.c +++ b/flight/targets/boards/revolution/firmware/pios_board.c @@ -289,7 +289,7 @@ static void PIOS_Board_configure_com(const struct pios_usart_cfg *usart_port_cfg } static void PIOS_Board_configure_dsm(const struct pios_usart_cfg *pios_usart_dsm_cfg, const struct pios_dsm_cfg *pios_dsm_cfg, - const struct pios_com_driver *usart_com_driver, enum pios_dsm_proto *proto, + const struct pios_com_driver *usart_com_driver, ManualControlSettingsChannelGroupsOptions channelgroup, uint8_t *bind) { uint32_t pios_usart_dsm_id; @@ -300,7 +300,7 @@ static void PIOS_Board_configure_dsm(const struct pios_usart_cfg *pios_usart_dsm uint32_t pios_dsm_id; if (PIOS_DSM_Init(&pios_dsm_id, pios_dsm_cfg, usart_com_driver, - pios_usart_dsm_id, *proto, *bind)) { + pios_usart_dsm_id, *bind)) { PIOS_Assert(0); } @@ -636,33 +636,13 @@ void PIOS_Board_Init(void) } #endif break; - case HWSETTINGS_RM_MAINPORT_DSM2: - case HWSETTINGS_RM_MAINPORT_DSMX10BIT: - case HWSETTINGS_RM_MAINPORT_DSMX11BIT: - { - enum pios_dsm_proto proto; - switch (hwsettings_mainport) { - case HWSETTINGS_RM_MAINPORT_DSM2: - proto = PIOS_DSM_PROTO_DSM2; - break; - case HWSETTINGS_RM_MAINPORT_DSMX10BIT: - proto = PIOS_DSM_PROTO_DSMX10BIT; - break; - case HWSETTINGS_RM_MAINPORT_DSMX11BIT: - proto = PIOS_DSM_PROTO_DSMX11BIT; - break; - default: - PIOS_Assert(0); - break; - } - + case HWSETTINGS_RM_MAINPORT_DSM: // Force binding to zero on the main port hwsettings_DSMxBind = 0; // TODO: Define the various Channelgroup for Revo dsm inputs and handle here PIOS_Board_configure_dsm(&pios_usart_dsm_main_cfg, &pios_dsm_main_cfg, - &pios_usart_com_driver, &proto, MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMMAINPORT, &hwsettings_DSMxBind); - } + &pios_usart_com_driver, MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMMAINPORT, &hwsettings_DSMxBind); break; case HWSETTINGS_RM_MAINPORT_DEBUGCONSOLE: #if defined(PIOS_INCLUDE_DEBUG_CONSOLE) @@ -705,30 +685,11 @@ void PIOS_Board_Init(void) case HWSETTINGS_RM_FLEXIPORT_GPS: PIOS_Board_configure_com(&pios_usart_flexi_cfg, PIOS_COM_GPS_RX_BUF_LEN, PIOS_COM_GPS_TX_BUF_LEN, &pios_usart_com_driver, &pios_com_gps_id); break; - case HWSETTINGS_RM_FLEXIPORT_DSM2: - case HWSETTINGS_RM_FLEXIPORT_DSMX10BIT: - case HWSETTINGS_RM_FLEXIPORT_DSMX11BIT: - { - enum pios_dsm_proto proto; - switch (hwsettings_flexiport) { - case HWSETTINGS_RM_FLEXIPORT_DSM2: - proto = PIOS_DSM_PROTO_DSM2; - break; - case HWSETTINGS_RM_FLEXIPORT_DSMX10BIT: - proto = PIOS_DSM_PROTO_DSMX10BIT; - break; - case HWSETTINGS_RM_FLEXIPORT_DSMX11BIT: - proto = PIOS_DSM_PROTO_DSMX11BIT; - break; - default: - PIOS_Assert(0); - break; - } + case HWSETTINGS_RM_FLEXIPORT_DSM: // TODO: Define the various Channelgroup for Revo dsm inputs and handle here PIOS_Board_configure_dsm(&pios_usart_dsm_flexi_cfg, &pios_dsm_flexi_cfg, - &pios_usart_com_driver, &proto, MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMFLEXIPORT, &hwsettings_DSMxBind); - } - break; + &pios_usart_com_driver, MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMFLEXIPORT, &hwsettings_DSMxBind); + break; case HWSETTINGS_RM_FLEXIPORT_DEBUGCONSOLE: #if defined(PIOS_INCLUDE_DEBUG_CONSOLE) { diff --git a/flight/targets/boards/revoproto/firmware/pios_board.c b/flight/targets/boards/revoproto/firmware/pios_board.c index c7e887d28..67733abc8 100644 --- a/flight/targets/boards/revoproto/firmware/pios_board.c +++ b/flight/targets/boards/revoproto/firmware/pios_board.c @@ -352,7 +352,7 @@ static void PIOS_Board_configure_com(const struct pios_usart_cfg *usart_port_cfg } static void PIOS_Board_configure_dsm(const struct pios_usart_cfg *pios_usart_dsm_cfg, const struct pios_dsm_cfg *pios_dsm_cfg, - const struct pios_com_driver *usart_com_driver, enum pios_dsm_proto *proto, + const struct pios_com_driver *usart_com_driver, ManualControlSettingsChannelGroupsOptions channelgroup, uint8_t *bind) { uint32_t pios_usart_dsm_id; @@ -363,7 +363,7 @@ static void PIOS_Board_configure_dsm(const struct pios_usart_cfg *pios_usart_dsm uint32_t pios_dsm_id; if (PIOS_DSM_Init(&pios_dsm_id, pios_dsm_cfg, usart_com_driver, - pios_usart_dsm_id, *proto, *bind)) { + pios_usart_dsm_id, *bind)) { PIOS_Assert(0); } @@ -680,30 +680,11 @@ void PIOS_Board_Init(void) PIOS_Board_configure_com(&pios_usart_aux_cfg, PIOS_COM_TELEM_RF_RX_BUF_LEN, PIOS_COM_TELEM_RF_TX_BUF_LEN, &pios_usart_com_driver, &pios_com_telem_rf_id); break; - case HWSETTINGS_RV_AUXPORT_DSM2: - case HWSETTINGS_RV_AUXPORT_DSMX10BIT: - case HWSETTINGS_RV_AUXPORT_DSMX11BIT: - { - enum pios_dsm_proto proto; - switch (hwsettings_rv_auxport) { - case HWSETTINGS_RV_AUXPORT_DSM2: - proto = PIOS_DSM_PROTO_DSM2; - break; - case HWSETTINGS_RV_AUXPORT_DSMX10BIT: - proto = PIOS_DSM_PROTO_DSMX10BIT; - break; - case HWSETTINGS_RV_AUXPORT_DSMX11BIT: - proto = PIOS_DSM_PROTO_DSMX11BIT; - break; - default: - PIOS_Assert(0); - break; - } + case HWSETTINGS_RV_AUXPORT_DSM: // TODO: Define the various Channelgroup for Revo dsm inputs and handle here PIOS_Board_configure_dsm(&pios_usart_dsm_aux_cfg, &pios_dsm_aux_cfg, - &pios_usart_com_driver, &proto, MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMMAINPORT, &hwsettings_DSMxBind); - } - break; + &pios_usart_com_driver, MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMMAINPORT, &hwsettings_DSMxBind); + break; case HWSETTINGS_RV_AUXPORT_COMAUX: PIOS_Board_configure_com(&pios_usart_aux_cfg, PIOS_COM_AUX_RX_BUF_LEN, PIOS_COM_AUX_TX_BUF_LEN, &pios_usart_com_driver, &pios_com_aux_id); break; @@ -744,30 +725,11 @@ void PIOS_Board_Init(void) #endif /* PIOS_INCLUDE_SBUS */ break; - case HWSETTINGS_RV_AUXSBUSPORT_DSM2: - case HWSETTINGS_RV_AUXSBUSPORT_DSMX10BIT: - case HWSETTINGS_RV_AUXSBUSPORT_DSMX11BIT: - { - enum pios_dsm_proto proto; - switch (hwsettings_rv_auxsbusport) { - case HWSETTINGS_RV_AUXSBUSPORT_DSM2: - proto = PIOS_DSM_PROTO_DSM2; - break; - case HWSETTINGS_RV_AUXSBUSPORT_DSMX10BIT: - proto = PIOS_DSM_PROTO_DSMX10BIT; - break; - case HWSETTINGS_RV_AUXSBUSPORT_DSMX11BIT: - proto = PIOS_DSM_PROTO_DSMX11BIT; - break; - default: - PIOS_Assert(0); - break; - } + case HWSETTINGS_RV_AUXSBUSPORT_DSM: // TODO: Define the various Channelgroup for Revo dsm inputs and handle here PIOS_Board_configure_dsm(&pios_usart_dsm_auxsbus_cfg, &pios_dsm_auxsbus_cfg, - &pios_usart_com_driver, &proto, MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMMAINPORT, &hwsettings_DSMxBind); - } - break; + &pios_usart_com_driver, MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMMAINPORT, &hwsettings_DSMxBind); + break; case HWSETTINGS_RV_AUXSBUSPORT_COMAUX: PIOS_Board_configure_com(&pios_usart_auxsbus_cfg, PIOS_COM_AUX_RX_BUF_LEN, PIOS_COM_AUX_TX_BUF_LEN, &pios_usart_com_driver, &pios_com_aux_id); break; @@ -797,30 +759,11 @@ void PIOS_Board_Init(void) #endif /* PIOS_INCLUDE_I2C */ break; - case HWSETTINGS_RV_FLEXIPORT_DSM2: - case HWSETTINGS_RV_FLEXIPORT_DSMX10BIT: - case HWSETTINGS_RV_FLEXIPORT_DSMX11BIT: - { - enum pios_dsm_proto proto; - switch (hwsettings_rv_flexiport) { - case HWSETTINGS_RV_FLEXIPORT_DSM2: - proto = PIOS_DSM_PROTO_DSM2; - break; - case HWSETTINGS_RV_FLEXIPORT_DSMX10BIT: - proto = PIOS_DSM_PROTO_DSMX10BIT; - break; - case HWSETTINGS_RV_FLEXIPORT_DSMX11BIT: - proto = PIOS_DSM_PROTO_DSMX11BIT; - break; - default: - PIOS_Assert(0); - break; - } + case HWSETTINGS_RV_FLEXIPORT_DSM: // TODO: Define the various Channelgroup for Revo dsm inputs and handle here PIOS_Board_configure_dsm(&pios_usart_dsm_flexi_cfg, &pios_dsm_flexi_cfg, - &pios_usart_com_driver, &proto, MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMMAINPORT, &hwsettings_DSMxBind); - } - break; + &pios_usart_com_driver, MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMMAINPORT, &hwsettings_DSMxBind); + break; case HWSETTINGS_RV_FLEXIPORT_COMAUX: PIOS_Board_configure_com(&pios_usart_flexi_cfg, PIOS_COM_AUX_RX_BUF_LEN, PIOS_COM_AUX_TX_BUF_LEN, &pios_usart_com_driver, &pios_com_aux_id); break; diff --git a/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts b/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts index 414a5faec..bdd31cfac 100644 --- a/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts +++ b/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts @@ -6179,10 +6179,6 @@ p, li { white-space: pre-wrap; } Calibration and Configuration Options Options de Configuration et Calibration - - Start Configuration Wizard - Démarrer l'Assistant de Configuration - Manual Calibration @@ -6734,15 +6730,6 @@ Applique et Enregistre tous les paramètres sur la SD Live Testing Test en Temps Réel - - Setup "RapidESC" here: usual value is 500 Hz for multirotor airframes. - - Configurer ici "TurboPWM" : 500Hz est une valeur classique pour les multirotors. - - - 500 - 500 - Setup "RapidESC" here: usual value is 490 Hz for multirotor airframes. @@ -9111,7 +9098,7 @@ les données en cache Diagramme de Connexion - + Save File Enregistrer Fichier @@ -10383,18 +10370,18 @@ p, li { white-space: pre-wrap; } - + Configuration OK Configuration OK - + <font color='red'>ERROR: Assign a Yaw channel</font> <font color='red'>ERREUR : Veuillez affecter le canal de Yaw</font> - + <font color='red'>ERROR: Assign all %1 motor channels</font> <font color='red'>ERREUR : Veuillez affecter tous les %1 canaux moteurs</font> @@ -10466,26 +10453,26 @@ Voulez-vous toujours continuer ? ConfigInputWidget - + http://wiki.openpilot.org/x/04Cf Lien Wiki FR http://wiki.openpilot.org/x/aIBqAQ - + Arming Settings are now set to 'Always Disarmed' for your safety. Contexte : Onglet "Paramètres d'Armement" Pour des raisons de sécurité les Paramètres d'Armement ont été modifiés à 'Toujours Désarmé'. - + You will have to reconfigure the arming settings manually when the wizard is finished. After the last step of the wizard you will be taken to the Arming Settings screen. redirigé vers / sur ? Vous devrez reconfigurer manuellement les paramètres d'armement lorsque l'assistant sera terminé. Après la dernière étape de l'assistant, vous serez redirigé vers l'écran des Paramètres d'Armement. - + Next Suivant @@ -10681,7 +10668,7 @@ Bougez le manche %1. Vous avez la possibilité d'appuyer sur Suivant pour ignorer ce canal. - + You will have to reconfigure the arming settings manually when the wizard is finished. Vous devrez reconfigurer les paramètres d'armement manuellement lorsque l'assistant sera terminé. @@ -11017,7 +11004,7 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende. - + @@ -11025,7 +11012,7 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende.Inconnu - + Vehicle type: Type de véhicule : @@ -11152,18 +11139,8 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende. - Spektrum satellite (DSM2) - - - - - Spektrum satellite (DSMX10BIT) - - - - - Spektrum satellite (DSMX11BIT) - + Spektrum Satellite + @@ -11180,14 +11157,6 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende.Rapid ESC (%1 Hz) Contrôleur Rapide (%1 Hz) - - Standard ESC (50 Hz) - Contrôleur Standard (50 Hz) - - - Rapid ESC (500 Hz) - Contrôleur Rapide (500Hz) - Servo type: @@ -11277,7 +11246,7 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende.Échoué ! - + Writing External Mag sensor settings Écriture paramètres Compas Externe @@ -11329,7 +11298,7 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende.Écriture paramètres de stabilisation - + Writing mixer settings Écriture paramètres mixeur @@ -11339,7 +11308,7 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende.Écriture paramètres véhicule - + Writing manual control defaults Écriture contrôles manuels par défaut @@ -15143,7 +15112,7 @@ Please try again. AirSpeedPage - + OpenPilot Airspeed Sensor Selection Sélection Capteur Vitesse Air OpenPilot diff --git a/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp b/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp index 469beaa40..92930a345 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp @@ -162,9 +162,7 @@ void ConnectionDiagram::setupGraphicsScene() case VehicleConfigurationSource::INPUT_SBUS: elementsToShow << QString("%1sbus").arg(prefix); break; - case VehicleConfigurationSource::INPUT_DSMX10: - case VehicleConfigurationSource::INPUT_DSMX11: - case VehicleConfigurationSource::INPUT_DSM2: + case VehicleConfigurationSource::INPUT_DSM: elementsToShow << QString("%1satellite").arg(prefix); break; default: diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/airspeedpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/airspeedpage.cpp index c73989b3e..f4843db01 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/airspeedpage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/airspeedpage.cpp @@ -40,9 +40,7 @@ void AirSpeedPage::initializePage(VehicleConfigurationSource *settings) // Enable all setItemDisabled(-1, false); if (settings->getInputType() == VehicleConfigurationSource::INPUT_SBUS || - settings->getInputType() == VehicleConfigurationSource::INPUT_DSM2 || - settings->getInputType() == VehicleConfigurationSource::INPUT_DSMX10 || - settings->getInputType() == VehicleConfigurationSource::INPUT_DSMX11) { + settings->getInputType() == VehicleConfigurationSource::INPUT_DSM) { // Disable non estimated sensors if ports are taken by receivers setItemDisabled(VehicleConfigurationSource::AIRSPEED_EAGLETREE, true); setItemDisabled(VehicleConfigurationSource::AIRSPEED_MS4525, true); diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/inputpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/inputpage.cpp index 4789f740f..dd18f176b 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/inputpage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/inputpage.cpp @@ -54,7 +54,7 @@ bool InputPage::validatePage() } else if (ui->sbusButton->isChecked()) { getWizard()->setInputType(SetupWizard::INPUT_SBUS); } else if (ui->spectrumButton->isChecked()) { - getWizard()->setInputType(SetupWizard::INPUT_DSM2); + getWizard()->setInputType(SetupWizard::INPUT_DSM); } else { getWizard()->setInputType(SetupWizard::INPUT_PWM); } @@ -85,9 +85,9 @@ bool InputPage::restartNeeded(VehicleConfigurationSource::INPUT_TYPE selectedTyp case VehicleConfigurationSource::INPUT_SBUS: return data.CC_MainPort != HwSettings::CC_MAINPORT_SBUS; - case VehicleConfigurationSource::INPUT_DSM2: + case VehicleConfigurationSource::INPUT_DSM: // TODO: Handle all of the DSM types ?? Which is most common? - return data.CC_MainPort != HwSettings::CC_MAINPORT_DSM2; + return data.CC_MainPort != HwSettings::CC_MAINPORT_DSM; default: return true; } @@ -106,9 +106,9 @@ bool InputPage::restartNeeded(VehicleConfigurationSource::INPUT_TYPE selectedTyp case VehicleConfigurationSource::INPUT_SBUS: return data.RM_MainPort != HwSettings::CC_MAINPORT_SBUS; - case VehicleConfigurationSource::INPUT_DSM2: + case VehicleConfigurationSource::INPUT_DSM: // TODO: Handle all of the DSM types ?? Which is most common? - return data.RM_MainPort != HwSettings::CC_MAINPORT_DSM2; + return data.RM_MainPort != HwSettings::CC_MAINPORT_DSM; default: return true; } diff --git a/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp b/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp index 26b9188e4..db6f73b2e 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp @@ -353,14 +353,8 @@ QString SetupWizard::getSummaryText() case INPUT_SBUS: summary.append(tr("Futaba S.Bus")); break; - case INPUT_DSM2: - summary.append(tr("Spektrum satellite (DSM2)")); - break; - case INPUT_DSMX10: - summary.append(tr("Spektrum satellite (DSMX10BIT)")); - break; - case INPUT_DSMX11: - summary.append(tr("Spektrum satellite (DSMX11BIT)")); + case INPUT_DSM: + summary.append(tr("Spektrum Satellite")); break; default: summary.append(tr("Unknown")); diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp index 9ef0f16ff..2fa67b262 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp @@ -157,14 +157,8 @@ void VehicleConfigurationHelper::applyHardwareConfiguration() data.CC_MainPort = HwSettings::CC_MAINPORT_SBUS; data.CC_FlexiPort = HwSettings::CC_FLEXIPORT_TELEMETRY; break; - case VehicleConfigurationSource::INPUT_DSMX10: - data.CC_FlexiPort = HwSettings::CC_FLEXIPORT_DSMX10BIT; - break; - case VehicleConfigurationSource::INPUT_DSMX11: - data.CC_FlexiPort = HwSettings::CC_FLEXIPORT_DSMX11BIT; - break; - case VehicleConfigurationSource::INPUT_DSM2: - data.CC_FlexiPort = HwSettings::CC_FLEXIPORT_DSM2; + case VehicleConfigurationSource::INPUT_DSM: + data.CC_FlexiPort = HwSettings::CC_FLEXIPORT_DSM; break; default: break; @@ -193,14 +187,8 @@ void VehicleConfigurationHelper::applyHardwareConfiguration() data.RM_MainPort = HwSettings::RM_MAINPORT_SBUS; data.RM_FlexiPort = HwSettings::RM_FLEXIPORT_TELEMETRY; break; - case VehicleConfigurationSource::INPUT_DSMX10: - data.RM_FlexiPort = HwSettings::RM_FLEXIPORT_DSMX10BIT; - break; - case VehicleConfigurationSource::INPUT_DSMX11: - data.RM_FlexiPort = HwSettings::RM_FLEXIPORT_DSMX11BIT; - break; - case VehicleConfigurationSource::INPUT_DSM2: - data.RM_FlexiPort = HwSettings::RM_FLEXIPORT_DSM2; + case VehicleConfigurationSource::INPUT_DSM: + data.RM_FlexiPort = HwSettings::RM_FLEXIPORT_DSM; break; default: break; @@ -741,9 +729,7 @@ void VehicleConfigurationHelper::applyManualControlDefaults() case VehicleConfigurationSource::INPUT_SBUS: channelType = ManualControlSettings::CHANNELGROUPS_SBUS; break; - case VehicleConfigurationSource::INPUT_DSMX10: - case VehicleConfigurationSource::INPUT_DSMX11: - case VehicleConfigurationSource::INPUT_DSM2: + case VehicleConfigurationSource::INPUT_DSM: channelType = ManualControlSettings::CHANNELGROUPS_DSMFLEXIPORT; break; default: diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h index 1f4ecd027..a74a697f4 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h @@ -64,7 +64,7 @@ public: FIXED_WING_DUAL_AILERON, FIXED_WING_AILERON, FIXED_WING_ELEVON, FIXED_WING_VTAIL, HELI_CCPM }; enum ESC_TYPE { ESC_RAPID, ESC_STANDARD, ESC_UNKNOWN }; enum SERVO_TYPE { SERVO_ANALOG, SERVO_DIGITAL, SERVO_UNKNOWN }; - enum INPUT_TYPE { INPUT_PWM, INPUT_PPM, INPUT_SBUS, INPUT_DSMX10, INPUT_DSMX11, INPUT_DSM2, INPUT_UNKNOWN }; + enum INPUT_TYPE { INPUT_PWM, INPUT_PPM, INPUT_SBUS, INPUT_DSM, INPUT_UNKNOWN }; enum AIRSPEED_TYPE { AIRSPEED_ESTIMATE, AIRSPEED_EAGLETREE, AIRSPEED_MS4525, AIRSPEED_DISABLED }; enum GPS_TYPE { GPS_PLATINUM, GPS_UBX, GPS_NMEA, GPS_DISABLED }; enum RADIO_SETTING { RADIO_TELEMETRY, RADIO_DISABLED }; diff --git a/shared/uavobjectdefinition/hwsettings.xml b/shared/uavobjectdefinition/hwsettings.xml index a190a1b47..de95504db 100644 --- a/shared/uavobjectdefinition/hwsettings.xml +++ b/shared/uavobjectdefinition/hwsettings.xml @@ -2,19 +2,19 @@ Selection of optional hardware configurations. - - + + - - - + + + - - + +