safe pre-merge, reducing chibios3 PR
This commit is contained in:
parent
4fe5b75664
commit
60b7a67beb
|
@ -483,7 +483,7 @@ static TriggerState initState CCM_OPTIONAL;
|
||||||
void TriggerShape::initializeTriggerShape(Logging *logger DECLARE_ENGINE_PARAMETER_S) {
|
void TriggerShape::initializeTriggerShape(Logging *logger DECLARE_ENGINE_PARAMETER_S) {
|
||||||
const trigger_config_s *triggerConfig = &engineConfiguration->trigger;
|
const trigger_config_s *triggerConfig = &engineConfiguration->trigger;
|
||||||
#if EFI_PROD_CODE || defined(__DOXYGEN__)
|
#if EFI_PROD_CODE || defined(__DOXYGEN__)
|
||||||
efiAssertVoid(getRemainingStack(chThdSelf()) > 256, "init t");
|
efiAssertVoid(getRemainingStack(chThdGetSelfX()) > 256, "init t");
|
||||||
scheduleMsg(logger, "initializeTriggerShape(%s/%d)", getTrigger_type_e(triggerConfig->type), (int) triggerConfig->type);
|
scheduleMsg(logger, "initializeTriggerShape(%s/%d)", getTrigger_type_e(triggerConfig->type), (int) triggerConfig->type);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -676,7 +676,7 @@ static void onFindIndex(TriggerState *state) {
|
||||||
uint32_t findTriggerZeroEventIndex(TriggerState *state, TriggerShape * shape,
|
uint32_t findTriggerZeroEventIndex(TriggerState *state, TriggerShape * shape,
|
||||||
trigger_config_s const*triggerConfig DECLARE_ENGINE_PARAMETER_S) {
|
trigger_config_s const*triggerConfig DECLARE_ENGINE_PARAMETER_S) {
|
||||||
#if EFI_PROD_CODE || defined(__DOXYGEN__)
|
#if EFI_PROD_CODE || defined(__DOXYGEN__)
|
||||||
efiAssert(getRemainingStack(chThdSelf()) > 128, "findPos", -1);
|
efiAssert(getRemainingStack(chThdGetSelfX()) > 128, "findPos", -1);
|
||||||
#endif
|
#endif
|
||||||
isInitializingTrigger = true;
|
isInitializingTrigger = true;
|
||||||
errorDetection.clear();
|
errorDetection.clear();
|
||||||
|
|
Loading…
Reference in New Issue