Skip to content

Commit

Permalink
Fix wrong edges in even teeth decoder and remove superfluous old logi…
Browse files Browse the repository at this point in the history 
…c. This includes Sim's new offset, but not Preston's.
  • Loading branch information
@fredcooke
fredcooke committed Aug 18, 2013
1 parent 5697a1f commit af5541a
Show file tree
Hide file tree
Showing 2 changed files with 116 additions and 116 deletions.
230 changes: 115 additions & 115 deletions src/main/decoders/code/EvenTeeth-Xand1.c
View file
Expand Up @@ -38,7 +38,11 @@
*/


void decoderInitPreliminary(){} // This decoder works with the defaults
void decoderInitPreliminary(){
// Set PT0 and PT1 to only capture on rising
TCTL4 = 0x05; // 0000 0101 Capture rising edges only on PT0&1
}

void perDecoderReset(){} // Nothing special to reset for this code


Expand All @@ -53,65 +57,63 @@ void PrimaryRPMISR(){

// Prevent main from clearing values before sync is obtained!
Clocks.timeoutADCreadingClock = 0;
// TODO integrate this into all decoders, and integrate with the fuel pump stuff too, this can be a flag that says "we've received an RPM signal of SOME sort recently"

if(!(PTITCurrentState & 0x01)){
KeyUserDebugs.primaryTeethSeen++;

LongTime timeStamp;
/* Install the low word */
timeStamp.timeShorts[1] = edgeTimeStamp;
/* Find out what our timer value means and put it in the high word */
if(TFLGOF && !(edgeTimeStamp & 0x8000)){ /* see 10.3.5 paragraph 4 of 68hc11 ref manual for details */
timeStamp.timeShorts[0] = timerExtensionClock + 1;
}else{
timeStamp.timeShorts[0] = timerExtensionClock;
}
unsigned long thisEventTimeStamp = timeStamp.timeLong;

unsigned long thisInterEventPeriod = 0;
unsigned short thisTicksPerDegree = 0;
if(KeyUserDebugs.decoderFlags & LAST_TIMESTAMP_VALID){
thisInterEventPeriod = thisEventTimeStamp - lastPrimaryEventTimeStamp;
thisTicksPerDegree = (unsigned short)((ticks_per_degree_multiplier * thisInterEventPeriod) / eventAngles[1]); // with current scale range for 60/12000rpm is largest ticks per degree = 3472, smallest = 17 with largish error
}
KeyUserDebugs.primaryTeethSeen++;

if(KeyUserDebugs.decoderFlags & CONFIGURED_SYNC){
KeyUserDebugs.currentEvent++;
if(KeyUserDebugs.currentEvent == numberOfRealEvents){
resetToNonRunningState(COUNT_OF_EVENTS_IMPOSSIBLY_HIGH_NOISE);
LongTime timeStamp;
/* Install the low word */
timeStamp.timeShorts[1] = edgeTimeStamp;
/* Find out what our timer value means and put it in the high word */
if(TFLGOF && !(edgeTimeStamp & 0x8000)){ /* see 10.3.5 paragraph 4 of 68hc11 ref manual for details */
timeStamp.timeShorts[0] = timerExtensionClock + 1;
}else{
timeStamp.timeShorts[0] = timerExtensionClock;
}
unsigned long thisEventTimeStamp = timeStamp.timeLong;

unsigned long thisInterEventPeriod = 0;
unsigned short thisTicksPerDegree = 0;
if(KeyUserDebugs.decoderFlags & LAST_TIMESTAMP_VALID){
thisInterEventPeriod = thisEventTimeStamp - lastPrimaryEventTimeStamp;
thisTicksPerDegree = (unsigned short)((ticks_per_degree_multiplier * thisInterEventPeriod) / eventAngles[1]); // with current scale range for 60/12000rpm is largest ticks per degree = 3472, smallest = 17 with largish error
}

if(KeyUserDebugs.decoderFlags & CONFIGURED_SYNC){
KeyUserDebugs.currentEvent++;
if(KeyUserDebugs.currentEvent == numberOfRealEvents){
resetToNonRunningState(COUNT_OF_EVENTS_IMPOSSIBLY_HIGH_NOISE);
return;
}// Can never be greater than without a code error or genuine noise issue, so give it a miss as we can not guarantee where we are now.

if(KeyUserDebugs.decoderFlags & LAST_PERIOD_VALID){
unsigned short ratioBetweenThisAndLast = (unsigned short)(((unsigned long)lastPrimaryTicksPerDegree * 1000) / thisTicksPerDegree);
KeyUserDebugs.inputEventTimeTolerance = ratioBetweenThisAndLast;
if(ratioBetweenThisAndLast > fixedConfigs2.decoderSettings.decelerationInputEventTimeTolerance){
resetToNonRunningState(PRIMARY_EVENT_ARRIVED_TOO_LATE);
return;
}else if(ratioBetweenThisAndLast < fixedConfigs2.decoderSettings.accelerationInputEventTimeTolerance){
resetToNonRunningState(PRIMARY_EVENT_ARRIVED_TOO_EARLY);
return;
}// Can never be greater than without a code error or genuine noise issue, so give it a miss as we can not guarantee where we are now.

if(KeyUserDebugs.decoderFlags & LAST_PERIOD_VALID){
unsigned short ratioBetweenThisAndLast = (unsigned short)(((unsigned long)lastPrimaryTicksPerDegree * 1000) / thisTicksPerDegree);
KeyUserDebugs.inputEventTimeTolerance = ratioBetweenThisAndLast;
if(ratioBetweenThisAndLast > fixedConfigs2.decoderSettings.decelerationInputEventTimeTolerance){
resetToNonRunningState(PRIMARY_EVENT_ARRIVED_TOO_LATE);
return;
}else if(ratioBetweenThisAndLast < fixedConfigs2.decoderSettings.accelerationInputEventTimeTolerance){
resetToNonRunningState(PRIMARY_EVENT_ARRIVED_TOO_EARLY);
return;
}else{
if(PTITCurrentState & 0x01){
// TODO Calculate RPM from last primaryLeadingEdgeTimeStamp
}else{
if(PTITCurrentState & 0x01){
// TODO Calculate RPM from last primaryLeadingEdgeTimeStamp
}else{
// TODO Calculate RPM from last primaryTrailingEdgeTimeStamp
}
// TODO Calculate RPM from last primaryTrailingEdgeTimeStamp
}
}/*else*/ if(KeyUserDebugs.decoderFlags & LAST_TIMESTAMP_VALID){ // TODO temp for testing just do rpm this way, fill above out later.
*ticksPerDegreeRecord = thisTicksPerDegree;
sampleEachADC(ADCBuffers);
Counters.syncedADCreadings++;
}
}/*else*/ if(KeyUserDebugs.decoderFlags & LAST_TIMESTAMP_VALID){ // TODO temp for testing just do rpm this way, fill above out later.
*ticksPerDegreeRecord = thisTicksPerDegree;
sampleEachADC(ADCBuffers);
Counters.syncedADCreadings++;

// Set flag to say calc required
coreStatusA |= CALC_FUEL_IGN;
// Set flag to say calc required
coreStatusA |= CALC_FUEL_IGN;

// Reset the clock for reading timeout
Clocks.timeoutADCreadingClock = 0;
}
// Reset the clock for reading timeout
Clocks.timeoutADCreadingClock = 0;
}

// for now, sample always and see what we get result wise...
// for now, sample always and see what we get result wise...
// if((currentEvent % 6) == 0){
// sampleEachADC(ADCBuffers);
// Counters.syncedADCreadings++;
Expand All @@ -123,20 +125,20 @@ void PrimaryRPMISR(){
// Clocks.timeoutADCreadingClock = 0;
// }

SCHEDULE_ECT_OUTPUTS();
}
SCHEDULE_ECT_OUTPUTS();
}

OUTPUT_COARSE_BBS();
OUTPUT_COARSE_BBS();

// do these always at first, and use them with a single 30 degree angle for the first cut
if(KeyUserDebugs.decoderFlags & LAST_TIMESTAMP_VALID){
lastPrimaryTicksPerDegree = thisTicksPerDegree;
KeyUserDebugs.decoderFlags |= LAST_PERIOD_VALID;
}
// Always
lastPrimaryEventTimeStamp = thisEventTimeStamp;
KeyUserDebugs.decoderFlags |= LAST_TIMESTAMP_VALID;
// do these always at first, and use them with a single 30 degree angle for the first cut
if(KeyUserDebugs.decoderFlags & LAST_TIMESTAMP_VALID){
lastPrimaryTicksPerDegree = thisTicksPerDegree;
KeyUserDebugs.decoderFlags |= LAST_PERIOD_VALID;
}
// Always
lastPrimaryEventTimeStamp = thisEventTimeStamp;
KeyUserDebugs.decoderFlags |= LAST_TIMESTAMP_VALID;

DEBUG_TURN_PIN_OFF(DECODER_BENCHMARKS, NBIT0, PORTB);
}

Expand All @@ -148,63 +150,61 @@ void SecondaryRPMISR(){

/* Save all relevant available data here */
unsigned short edgeTimeStamp = TC1; /* Save the timestamp */
unsigned char PTITCurrentState = PTIT; /* Save the values on port T regardless of the state of DDRT */

if(!(PTITCurrentState & 0x02)){ // TODO Remove this once the configuration can be adjusted to only fire on one edge!
// Only count one edge, the other is irrelevant, and this comment will be two once the above todo is completed.
KeyUserDebugs.secondaryTeethSeen++;

LongTime timeStamp;
/* Install the low word */
timeStamp.timeShorts[1] = edgeTimeStamp;
/* Find out what our timer value means and put it in the high word */
if(TFLGOF && !(edgeTimeStamp & 0x8000)){ /* see 10.3.5 paragraph 4 of 68hc11 ref manual for details */
timeStamp.timeShorts[0] = timerExtensionClock + 1;
}else{
timeStamp.timeShorts[0] = timerExtensionClock;
}
unsigned long thisEventTimeStamp = timeStamp.timeLong;

unsigned long thisInterEventPeriod = 0;
if(KeyUserDebugs.decoderFlags & LAST_TIMESTAMP_VALID){
thisInterEventPeriod = thisEventTimeStamp - lastSecondaryEventTimeStamp;
}
// unsigned char PTITCurrentState = PTIT; /* Save the values on port T regardless of the state of DDRT */

KeyUserDebugs.secondaryTeethSeen++;

LongTime timeStamp;
/* Install the low word */
timeStamp.timeShorts[1] = edgeTimeStamp;
/* Find out what our timer value means and put it in the high word */
if(TFLGOF && !(edgeTimeStamp & 0x8000)){ /* see 10.3.5 paragraph 4 of 68hc11 ref manual for details */
timeStamp.timeShorts[0] = timerExtensionClock + 1;
}else{
timeStamp.timeShorts[0] = timerExtensionClock;
}
unsigned long thisEventTimeStamp = timeStamp.timeLong;

// This sets currentEvent to 255 such that when the primary ISR runs it is rolled over to zero!
if(KeyUserDebugs.decoderFlags & CONFIGURED_SYNC){
// If sync not confirmed, register sync point. Must be before the count checks, otherwise loss of sync would result in sync being redeclared.
if(!(KeyUserDebugs.decoderFlags & OK_TO_SCHEDULE)){
SET_SYNC_LEVEL_TO(CONFIGURED_SYNC);
}
unsigned long thisInterEventPeriod = 0;
if(KeyUserDebugs.decoderFlags & LAST_TIMESTAMP_VALID){
thisInterEventPeriod = thisEventTimeStamp - lastSecondaryEventTimeStamp;
}

/* If the count is less than 23, then we know that the electrical pulse that triggered
* this ISR execution was almost certainly in error and it is NOT valid to stay in sync.
*
* If the count is greater than 24, then we know that an electrical noise pulse triggered
* the other interrupt in between and was missed by the time period checks (unlikely, but
* possible) and that, therefore, there could have been a noise pulse on this input too,
* and therefore we don't really know where we are.
*
* In the case where the count is exactly 24 we can only rely on the time period checks in
* the other ISR, which should be sufficient unless poorly setup by a user with too wide
* of a tolerance level.
*
* There is zero point adding relative timing checks to this ISR because by nature, the
* other N teeth have already checked out good timing wise and therefore the average also
* does. Thus if we did check, for it to ever fail it would need to be tighter, and in
* reality it must be more loose due to the larger possible variation over the much much
* larger time frame.
*/
if(KeyUserDebugs.currentEvent < (numberOfRealEvents - 1)){
resetToNonRunningState(COUNT_OF_EVENTS_IMPOSSIBLY_LOW_NOISE);
}else if(KeyUserDebugs.currentEvent > (numberOfRealEvents -1)){
resetToNonRunningState(COUNT_OF_EVENTS_IMPOSSIBLY_HIGH_NOISE);
} // ELSE do nothing, and be happy :-)
}else{ // If sync not found, register first sync point, as this is our reference point.
// This sets currentEvent to 255 such that when the primary ISR runs it is rolled over to zero!
if(KeyUserDebugs.decoderFlags & CONFIGURED_SYNC){
// If sync not confirmed, register sync point. Must be before the count checks, otherwise loss of sync would result in sync being redeclared.
if(!(KeyUserDebugs.decoderFlags & OK_TO_SCHEDULE)){
SET_SYNC_LEVEL_TO(CONFIGURED_SYNC);
}

KeyUserDebugs.currentEvent = 0xFF; // TODO reset always, and catch noise induced errors below, this behaviour (now some lines above) may be bad/not fussy enough, or could be good, depending upon determinate nature of the inter event timing between primary and secondary, or not, perhaps move "lose sync or correct sync" as a configuration variable
/* If the count is less than 23, then we know that the electrical pulse that triggered
* this ISR execution was almost certainly in error and it is NOT valid to stay in sync.
*
* If the count is greater than 24, then we know that an electrical noise pulse triggered
* the other interrupt in between and was missed by the time period checks (unlikely, but
* possible) and that, therefore, there could have been a noise pulse on this input too,
* and therefore we don't really know where we are.
*
* In the case where the count is exactly 24 we can only rely on the time period checks in
* the other ISR, which should be sufficient unless poorly setup by a user with too wide
* of a tolerance level.
*
* There is zero point adding relative timing checks to this ISR because by nature, the
* other N teeth have already checked out good timing wise and therefore the average also
* does. Thus if we did check, for it to ever fail it would need to be tighter, and in
* reality it must be more loose due to the larger possible variation over the much much
* larger time frame.
*/
if(KeyUserDebugs.currentEvent < (numberOfRealEvents - 1)){
resetToNonRunningState(COUNT_OF_EVENTS_IMPOSSIBLY_LOW_NOISE);
}else if(KeyUserDebugs.currentEvent > (numberOfRealEvents -1)){
resetToNonRunningState(COUNT_OF_EVENTS_IMPOSSIBLY_HIGH_NOISE);
} // ELSE do nothing, and be happy :-)
}else{ // If sync not found, register first sync point, as this is our reference point.
SET_SYNC_LEVEL_TO(CONFIGURED_SYNC);
}

KeyUserDebugs.currentEvent = 0xFF; // TODO reset always, and catch noise induced errors below, this behaviour (now some lines above) may be bad/not fussy enough, or could be good, depending upon determinate nature of the inter event timing between primary and secondary, or not, perhaps move "lose sync or correct sync" as a configuration variable

DEBUG_TURN_PIN_OFF(DECODER_BENCHMARKS, NBIT1, PORTB);
}
2 changes: 1 addition & 1 deletion src/main/initialisers/FixedConfig1.c
View file
Expand Up @@ -133,7 +133,7 @@ const volatile fixedConfig1 fixedConfigs1 FIXEDCONF1 = {
anglesOfTDC: {ANGLE(0), ANGLE(180), ANGLE(360), ANGLE(540)}, // 1,2,3,4: Firing order: 1-3-4-2 set up in loom
outputEventPinNumbers: {0,1,2,3}, // COP/CNP ignition only
schedulingConfigurationBits: {0,0,0,0}, // All ignition
decoderEngineOffset: ANGLE(482.00), // Volvo B21A with DSM/Miata CAS + 24and1 disk
decoderEngineOffset: ANGLE(566.00), // Volvo B21A with DSM/Miata CAS + 24and1 disk
numberOfConfiguredOutputEvents: 4, // COP setup
numberOfInjectionsPerEngineCycle: 1 // Ditto

Expand Down

0 comments on commit af5541a

Please sign in to comment.