From e92304755cae28eca9108c55932fdc1f4c26df0f Mon Sep 17 00:00:00 2001 From: mmi Date: Mon, 18 Dec 2017 08:26:14 +0000 Subject: [PATCH] Update on menu texts from Pho tweaked IRQ priorities git-svn-id: https://svn.vbchaos.nl/svn/hsb/trunk@408 05563f52-14a8-4384-a975-3d1654cca0fa --- .../0 - Code/Platform/src/oli_stm32_h107.c | 10 +-- .../0 - Code/hsb-mrts/inc/MenuText.h | 75 ++++++++++--------- 2 files changed, 43 insertions(+), 42 deletions(-) diff --git a/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/Platform/src/oli_stm32_h107.c b/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/Platform/src/oli_stm32_h107.c index 6806228..ed6f9f9 100644 --- a/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/Platform/src/oli_stm32_h107.c +++ b/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/Platform/src/oli_stm32_h107.c @@ -554,7 +554,7 @@ static ErrorStatus initPeriphery(void) /* --------------------------------------------------------------------*/ /* RTC */ /* --------------------------------------------------------------------*/ - IRQ_setInterruptProperties(RTC_IRQn, 13, 0, ENABLE); + IRQ_setInterruptProperties(RTC_IRQn, 11, 0, ENABLE); RTC_construct(rtc); @@ -587,7 +587,7 @@ static ErrorStatus initPeriphery(void) /* --------------------------------------------------------------------*/ /* SPI1 */ /* --------------------------------------------------------------------*/ - IRQ_setInterruptProperties(SPI1_IRQn, 11, 0, ENABLE); + IRQ_setInterruptProperties(SPI1_IRQn, 12, 0, ENABLE); spi1->initialized = false; spi1->SPI_TypeDef = SPI1; MAX5715_getSpiParameters(spiDACParam); @@ -597,7 +597,7 @@ static ErrorStatus initPeriphery(void) /* --------------------------------------------------------------------*/ /* SPI3 */ /* --------------------------------------------------------------------*/ - IRQ_setInterruptProperties(SPI3_IRQn, 12, 0, ENABLE); + IRQ_setInterruptProperties(SPI3_IRQn, 12, 1, ENABLE); spi3->initialized = false; spi3->SPI_TypeDef = SPI3; // Get the SPI parameters from the NHD0420 driver. They are more critical than the parameters from the EEPROM @@ -651,8 +651,8 @@ static ErrorStatus initPeriphery(void) // Bicolour red GPIO_construct(ledBicolourRed, OUTPUT, ledBicolourRed->gpio); - IRQ_setInterruptProperties(EXTI0_IRQn, 12, 0, ENABLE); - IRQ_setInterruptProperties(EXTI1_IRQn, 12, 0, ENABLE); + IRQ_setInterruptProperties(EXTI0_IRQn, 13, 0, ENABLE); + IRQ_setInterruptProperties(EXTI1_IRQn, 13, 0, ENABLE); // InterlockNO _interlockNOEXTI = configureEXTI(EXTI_Line0, EXTI_Mode_Interrupt, EXTI_Trigger_Rising_Falling, DISABLE); GPIO_construct(&_interlockNO, INPUT, _interlockNO.gpio); diff --git a/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/inc/MenuText.h b/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/inc/MenuText.h index e9af1e5..f81c1b9 100644 --- a/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/inc/MenuText.h +++ b/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/inc/MenuText.h @@ -109,7 +109,7 @@ static const char MenuText_ERROR_POWER_LOSS[MENUTEXT_NUMBER_OF_LANGUAGES][MENUTE "POWERLOSS DETECTED" }, { - //FRENCH TBW + "PERTE DE PUISSANCE" } }; @@ -215,7 +215,7 @@ static const char MenuText_PAUSE[MENUTEXT_NUMBER_OF_LANGUAGES][5][MENUTEXT_POPUP "Pause : touche x", "!!PAUSE!!", "Continuer: ENTREE", - "Réinit : touche X" + "Reinit : touche X" } }; @@ -300,8 +300,8 @@ static const char MenuText_CONFIRM_NEW_PIN[MENUTEXT_NUMBER_OF_LANGUAGES][2][MENU "New PIN denied" }, { - "Nouveau PIN accepté", - "Nouveau PIN refusé" + "Nouveau PIN accepte", + "Nouveau PIN refuse" } }; @@ -312,7 +312,7 @@ static const char MenuText_SAFE_PRESET[MENUTEXT_NUMBER_OF_LANGUAGES][MENUTEXT_PO "Preset saved" }, { - "Prérégl. sauvegardé" + "Preregl. sauvegarde" } }; @@ -323,7 +323,7 @@ static const char MenuText_SELECT_PRESET[MENUTEXT_NUMBER_OF_LANGUAGES][MENUTEXT_ "Selected preset:" }, { - "Préréglage n° :" + "Prereglage n° :" } }; @@ -335,7 +335,7 @@ static const char MenuText_SAFE_CONSTANTS[MENUTEXT_NUMBER_OF_LANGUAGES][MENUTEXT "Constants saved" }, { - "Valeurs sauvegardées" + "Valeurs sauvegardees" } }; @@ -368,7 +368,7 @@ static const char MenuText_VOLTAGE_OUT_HEADER[MENUTEXT_NUMBER_OF_LANGUAGES][MENU "Set voltage out" }, { - "Réglage tension" + "Reglage tension" } }; @@ -402,7 +402,7 @@ static const char MenuText_VOLTAGE_OUT_CLEANUP[MENUTEXT_NUMBER_OF_LANGUAGES][2][ "Press X to continue" }, { - "Ttes les lignes à 0V", + "Ttes les lignes a 0V", "Continuer : touche X" } }; @@ -468,8 +468,8 @@ static const char MenuText_REPAIRMENU[MENUTEXT_NUMBER_OF_LANGUAGES][MENUCORE_MAX }, { "Traitement tubes", - " 1.Sélection prérég", - " 2.Démarrer" + " 1.Selection prereg", + " 2.Demarrer" } }; @@ -490,16 +490,16 @@ static const char MenuText_PRESETMENU[MENUTEXT_NUMBER_OF_LANGUAGES][MENUCORE_MAX " 9.Preset 9", }, { - "Sélection préréglage", - " 1.Préréglage n°1", - " 2.Préréglage n°2", - " 3.Préréglage n°3", - " 4.Préréglage n°4", - " 5.Préréglage n°5", - " 6.Préréglage n°6", - " 7.Préréglage n°7", - " 8.Préréglage n°8", - " 9.Préréglage n°9", + "Sélection prereg", + " 1.Prereglage n°1", + " 2.Prereglage n°2", + " 3.Prereglage n°3", + " 4.Prereglage n°4", + " 5.Prereglage n°5", + " 6.Prereglage n°6", + " 7.Prereglage n°7", + " 8.Prereglage n°8", + " 9.Prereglage n°9", } }; @@ -524,8 +524,8 @@ static const char MenuText_ADMINMENU[MENUTEXT_NUMBER_OF_LANGUAGES][MENUCORE_MAX_ { "Mode Administrateur", " 1.Modifier PIN", - " 2.Contrôle des E/S", - " 3.Config. Prérégl.", + " 2.Controle des E/S", + " 3.Config. Preregl.", " 4.Valeurs du PID", " 5.Info & Version" } @@ -556,11 +556,11 @@ static const char MenuText_ADMINIOMAINMENU[MENUTEXT_NUMBER_OF_LANGUAGES][MENUCOR " 5.Teslagun relais", }, { - "Contrôle des E/S", + "Controle des E/S", " 1.Interlock", - " 2.Solénoïdes", + " 2.Solenoides", " 3.Lecture tension", - " 4.Réglage tension", + " 4.Reglage tension", " 5.Relai TeslaGun" } }; @@ -590,7 +590,7 @@ static const char MenuText_ADMINSOLENOIDMENU[MENUTEXT_NUMBER_OF_LANGUAGES][MENUC }, { - "Solénoïdes", + "Solenoides", "Basculer : touche 0" } }; @@ -630,16 +630,16 @@ static const char MenuText_ADMINPRESETCONFIGSELECTMENU[MENUTEXT_NUMBER_OF_LANGUA " 9.Preset 9 config", }, { - "Config. Prérégl.", - " 1 Prérégl 1 config", - " 2 Prérégl 2 config", - " 3 Prérégl 3 config", - " 4 Prérégl 4 config", - " 5 Prérégl 5 config", - " 6 Prérégl 6 config", - " 7 Prérégl 7 config", - " 8 Prérégl 8 config", - " 9 Prérégl 9 config", + "Config. Preregl.", + " 1 Preregl 1 config", + " 2 Preregl 2 config", + " 3 Preregl 3 config", + " 4 Preregl 4 config", + " 5 Preregl 5 config", + " 6 Preregl 6 config", + " 7 Preregl 7 config", + " 8 Preregl 8 config", + " 9 Preregl 9 config", } }; @@ -686,3 +686,4 @@ static const char MenuText_CALIBRATIONMENU[MENUTEXT_NUMBER_OF_LANGUAGES][MENUCOR #endif /* MENUTEXT_H_ */ +