auto-sync

This commit is contained in:
rusEfi 2015-02-24 23:11:07 -06:00
parent d95a3d007e
commit c35dc0b4a9
8 changed files with 18 additions and 14 deletions

View File

@ -121,11 +121,11 @@ int getRevolutionCounter(void);
void scheduleOutput(OutputSignal *signal, efitimeus_t nowUs, float delayUs, float durationUs) {
#if EFI_GPIO
if (durationUs < 0) {
firmwareError("duration cannot be negative: %d", durationUs);
warning(OBD_PCM_Processor_Fault, "duration cannot be negative: %d", durationUs);
return;
}
if (cisnan(durationUs)) {
firmwareError("NaN in scheduleOutput", durationUs);
warning(OBD_PCM_Processor_Fault, "NaN in scheduleOutput", durationUs);
return;
}

View File

@ -106,7 +106,7 @@ static bool float2bool(float v) {
float LECalculator::pop(le_action_e action) {
if (stack.size() == 0) {
firmwareError("empty stack for %d", action);
warning(OBD_PCM_Processor_Fault, "empty stack for %d", action);
return NAN;
}
return stack.pop();

View File

@ -81,7 +81,7 @@ float getLEValue(Engine *engine, calc_stack_t *s, le_action_e action) {
case LE_METHOD_VBATT:
return getVBatt(engine->engineConfiguration);
default:
firmwareError("FSIO unexpected %d", action);
warning(OBD_PCM_Processor_Fault, "FSIO unexpected %d", action);
return NAN;
}
}
@ -358,6 +358,10 @@ static pin_output_mode_e defa = OM_DEFAULT;
void initFsioImpl(Logging *sharedLogger, Engine *engine) {
logger = sharedLogger;
for (int i = 0; i < LE_COMMAND_COUNT; i++) {
fsioLogics[i] = NULL;
}
#if EFI_FUEL_PUMP
fuelPumpLogic = sysPool.parseExpression(FUEL_PUMP_LOGIC);

View File

@ -43,7 +43,7 @@ void Table2D<SIZE>::preCalc(float *bin, float *values) {
float x1 = bin[i];
float x2 = bin[i + 1];
if (x1 == x2) {
firmwareError("preCalc: Same x1 and x2 in interpolate: %f/%f", x1, x2);
warning(OBD_PCM_Processor_Fault, "preCalc: Same x1 and x2 in interpolate: %f/%f", x1, x2);
return;
}

View File

@ -62,7 +62,7 @@ float getEngineLoadT(DECLARE_ENGINE_PARAMETER_F) {
return getRealMaf(PASS_ENGINE_PARAMETER_F);
}
default:
firmwareError("Unexpected engine load parameter: %d", engineConfiguration->algorithm);
warning(OBD_PCM_Processor_Fault, "Unexpected engine load parameter: %d", engineConfiguration->algorithm);
return -1;
}
}
@ -202,7 +202,7 @@ void FuelSchedule::addFuelEvents(OutputSignalList *sourceList, injection_mode_e
}
break;
default:
firmwareError("Unexpected injection mode %d", mode);
warning(OBD_PCM_Processor_Fault, "Unexpected injection mode %d", mode);
}
}
@ -266,7 +266,7 @@ void findTriggerPosition(event_trigger_position_s *position, angle_t angleOffset
int index = TRIGGER_SHAPE(triggerIndexByAngle[(int)angleOffset]);
angle_t eventAngle = TRIGGER_SHAPE(eventAngles[index]);
if (angleOffset < eventAngle) {
firmwareError("angle constraint violation in registerActuatorEventExt(): %f/%f", angleOffset, eventAngle);
warning(OBD_PCM_Processor_Fault, "angle constraint violation in registerActuatorEventExt(): %f/%f", angleOffset, eventAngle);
return;
}
@ -307,9 +307,9 @@ int getCylinderId(firing_order_e firingOrder, int index) {
return order_1_8_4_3_6_5_7_2[index];
default:
firmwareError("getCylinderId not supported for %d", firingOrder);
warning(OBD_PCM_Processor_Fault, "getCylinderId not supported for %d", firingOrder);
}
return -1;
return 1;
}
static NamedOutputPin * getIgnitionPinForIndex(int i DECLARE_ENGINE_PARAMETER_S
@ -329,7 +329,7 @@ static NamedOutputPin * getIgnitionPinForIndex(int i DECLARE_ENGINE_PARAMETER_S
break;
default:
firmwareError("unsupported ignitionMode %d in initializeIgnitionActions()", engineConfiguration->ignitionMode);
warning(OBD_PCM_Processor_Fault, "unsupported ignitionMode %d in initializeIgnitionActions()", engineConfiguration->ignitionMode);
return &enginePins.coils[0];
}
}

View File

@ -185,7 +185,7 @@ static void pwmpcb_fast(PWMDriver *pwmp) {
int getInternalAdcValue(adc_channel_e hwChannel) {
if (hwChannel == EFI_ADC_NONE) {
firmwareError("should not be asking for NONE");
warning(OBD_PCM_Processor_Fault, "ADC: should not be asking for NONE");
return -1;
}

View File

@ -23,7 +23,7 @@ public class CommandQueue {
private String latestConfirmation;
private static final CommandQueue instance = new CommandQueue();
private final BlockingQueue<MethodInvocation> pendingCommands = new LinkedBlockingQueue<MethodInvocation>();
private final BlockingQueue<MethodInvocation> pendingCommands = new LinkedBlockingQueue<>();
private final List<CommandQueueListener> commandListeners = new ArrayList<>();
private final Runnable runnable = new Runnable() {

View File

@ -16,7 +16,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
*/
public class MessagesCentral {
private static final MessagesCentral INSTANCE = new MessagesCentral();
private final List<MessageListener> listeners = new CopyOnWriteArrayList<MessageListener>();
private final List<MessageListener> listeners = new CopyOnWriteArrayList<>();
private MessagesCentral() {
PortHolder.getInstance().listener = new PortHolderListener() {