private/hsb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update on menu texts from Pho

Browse Source 
tweaked IRQ priorities

git-svn-id: https://svn.vbchaos.nl/svn/hsb/trunk@408 05563f52-14a8-4384-a975-3d1654cca0fa
This commit is contained in:
mmi
2017-12-18 08:26:14 +00:00
parent c6bf5e329f
commit e92304755c
2 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/Platform/src/oli_stm32_h107.c
View File

@@ -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);

75
S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/inc/MenuText.h
View File

@@ -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<EFBFBD>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<EFBFBD>",
"Nouveau PIN refus<EFBFBD>"
"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<EFBFBD>r<EFBFBD>gl. sauvegard<EFBFBD>"
"Preregl. sauvegarde"
}
};
@@ -323,7 +323,7 @@ static const char MenuText_SELECT_PRESET[MENUTEXT_NUMBER_OF_LANGUAGES][MENUTEXT_
"Selected preset:"
},
{
"Pr<EFBFBD>r<EFBFBD>glage n<> :"
"Prereglage n<> :"
}
};
@@ -335,7 +335,7 @@ static const char MenuText_SAFE_CONSTANTS[MENUTEXT_NUMBER_OF_LANGUAGES][MENUTEXT
"Constants saved"
},
{
"Valeurs sauvegard<EFBFBD>es"
"Valeurs sauvegardees"
}
};
@@ -368,7 +368,7 @@ static const char MenuText_VOLTAGE_OUT_HEADER[MENUTEXT_NUMBER_OF_LANGUAGES][MENU
"Set voltage out"
},
{
"R<EFBFBD>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 <EFBFBD> 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<EFBFBD>lection pr<EFBFBD>r<EFBFBD>g",
" 2.D<EFBFBD>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<EFBFBD>lection pr<EFBFBD>r<EFBFBD>glage",
" 1.Pr<EFBFBD>r<EFBFBD>glage n<>1",
" 2.Pr<EFBFBD>r<EFBFBD>glage n<>2",
" 3.Pr<EFBFBD>r<EFBFBD>glage n<>3",
" 4.Pr<EFBFBD>r<EFBFBD>glage n<>4",
" 5.Pr<EFBFBD>r<EFBFBD>glage n<>5",
" 6.Pr<EFBFBD>r<EFBFBD>glage n<>6",
" 7.Pr<EFBFBD>r<EFBFBD>glage n<>7",
" 8.Pr<EFBFBD>r<EFBFBD>glage n<>8",
" 9.Pr<EFBFBD>r<EFBFBD>glage n<>9",
"S<EFBFBD>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<EFBFBD>le des E/S",
" 3.Config. Pr<EFBFBD>r<EFBFBD>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<EFBFBD>le des E/S",
"Controle des E/S",
" 1.Interlock",
" 2.Sol<EFBFBD>no<EFBFBD>des",
" 2.Solenoides",
" 3.Lecture tension",
" 4.R<EFBFBD>glage tension",
" 4.Reglage tension",
" 5.Relai TeslaGun"
}
};
@@ -590,7 +590,7 @@ static const char MenuText_ADMINSOLENOIDMENU[MENUTEXT_NUMBER_OF_LANGUAGES][MENUC
},
{
"Sol<EFBFBD>no<EFBFBD>des",
"Solenoides",
"Basculer : touche 0"
}
};
@@ -630,16 +630,16 @@ static const char MenuText_ADMINPRESETCONFIGSELECTMENU[MENUTEXT_NUMBER_OF_LANGUA
" 9.Preset 9 config",
},
{
"Config. Pr<EFBFBD>r<EFBFBD>gl.",
" 1 Pr<EFBFBD>r<EFBFBD>gl 1 config",
" 2 Pr<EFBFBD>r<EFBFBD>gl 2 config",
" 3 Pr<EFBFBD>r<EFBFBD>gl 3 config",
" 4 Pr<EFBFBD>r<EFBFBD>gl 4 config",
" 5 Pr<EFBFBD>r<EFBFBD>gl 5 config",
" 6 Pr<EFBFBD>r<EFBFBD>gl 6 config",
" 7 Pr<EFBFBD>r<EFBFBD>gl 7 config",
" 8 Pr<EFBFBD>r<EFBFBD>gl 8 config",
" 9 Pr<EFBFBD>r<EFBFBD>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_ */