mirror of
https://github.com/preble/libpinproc
synced 2026-02-24 18:25:23 +01:00
pinproctest: more cleanup
This commit is contained in:
committed by
Gerry Stellenberg
parent
5ad464b167
commit
705a2d25e6
@@ -47,7 +47,7 @@ void ConfigureAccelerometerMotion(PRHandle proc)
|
|||||||
}
|
}
|
||||||
|
|
||||||
PRReadData(proc, P3_ROC_BUS_ACCELEROMETER_SELECT, 0x10D, 1, readData);
|
PRReadData(proc, P3_ROC_BUS_ACCELEROMETER_SELECT, 0x10D, 1, readData);
|
||||||
printf("\nAccel chip id: %x\n", readData[0]);
|
printf("Accel chip id: %x\n", readData[0]);
|
||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
|
|
||||||
// Set FF_MT_COUNT (0x18)
|
// Set FF_MT_COUNT (0x18)
|
||||||
@@ -95,7 +95,7 @@ void ConfigureAccelerometerTransient(PRHandle proc)
|
|||||||
}
|
}
|
||||||
|
|
||||||
PRReadData(proc, P3_ROC_BUS_ACCELEROMETER_SELECT, 0x10D, 1, readData);
|
PRReadData(proc, P3_ROC_BUS_ACCELEROMETER_SELECT, 0x10D, 1, readData);
|
||||||
printf("\nAccel chip id: %x\n", readData[0]);
|
printf("Accel chip id: %x\n", readData[0]);
|
||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
|
|
||||||
// Set to standby so register changes will take.
|
// Set to standby so register changes will take.
|
||||||
@@ -184,17 +184,25 @@ void RunLoop(PRHandle proc)
|
|||||||
PRDriverWatchdogTickle(proc);
|
PRDriverWatchdogTickle(proc);
|
||||||
|
|
||||||
int numEvents = PRGetEvents(proc, events, maxEvents);
|
int numEvents = PRGetEvents(proc, events, maxEvents);
|
||||||
// if (numEvents > 0) printf("\nNum events: %x\n", numEvents);
|
|
||||||
for (int i = 0; i < numEvents; i++)
|
for (int i = 0; i < numEvents; i++)
|
||||||
{
|
{
|
||||||
PREvent *event = &events[i];
|
PREvent *event = &events[i];
|
||||||
const char *stateText = "Unknown";
|
const char *stateText;
|
||||||
switch (event->type)
|
switch (event->type) {
|
||||||
{
|
case kPREventTypeSwitchOpenDebounced:
|
||||||
case kPREventTypeSwitchOpenDebounced: stateText = "open"; break;
|
stateText = "open";
|
||||||
case kPREventTypeSwitchClosedDebounced: stateText = "closed"; break;
|
break;
|
||||||
case kPREventTypeSwitchOpenNondebounced: stateText = "open(ndb)"; break;
|
case kPREventTypeSwitchClosedDebounced:
|
||||||
case kPREventTypeSwitchClosedNondebounced: stateText = "closed(ndb)"; break;
|
stateText = "closed";
|
||||||
|
break;
|
||||||
|
case kPREventTypeSwitchOpenNondebounced:
|
||||||
|
stateText = "open(ndb)";
|
||||||
|
break;
|
||||||
|
case kPREventTypeSwitchClosedNondebounced:
|
||||||
|
stateText = "closed(ndb)";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
stateText = "Unknown";
|
||||||
}
|
}
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
struct _timeb tv;
|
struct _timeb tv;
|
||||||
@@ -209,7 +217,6 @@ void RunLoop(PRHandle proc)
|
|||||||
case kPREventTypeSwitchClosedDebounced:
|
case kPREventTypeSwitchClosedDebounced:
|
||||||
case kPREventTypeSwitchOpenNondebounced:
|
case kPREventTypeSwitchOpenNondebounced:
|
||||||
case kPREventTypeSwitchClosedNondebounced:
|
case kPREventTypeSwitchClosedNondebounced:
|
||||||
{
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
printf("%d.%03d switch %3d: %s\n", (int)(tv.time-startTime), tv.millitm, event->value, stateText);
|
printf("%d.%03d switch %3d: %s\n", (int)(tv.time-startTime), tv.millitm, event->value, stateText);
|
||||||
#else
|
#else
|
||||||
@@ -217,9 +224,7 @@ void RunLoop(PRHandle proc)
|
|||||||
#endif
|
#endif
|
||||||
UpdateSwitchState( event );
|
UpdateSwitchState( event );
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
case kPREventTypeDMDFrameDisplayed:
|
case kPREventTypeDMDFrameDisplayed:
|
||||||
{
|
|
||||||
if (machineType == kPRMachineWPCAlphanumeric) {
|
if (machineType == kPRMachineWPCAlphanumeric) {
|
||||||
//UpdateAlphaDisplay(proc, dotOffset++);
|
//UpdateAlphaDisplay(proc, dotOffset++);
|
||||||
}
|
}
|
||||||
@@ -228,37 +233,26 @@ void RunLoop(PRHandle proc)
|
|||||||
PRDMDDraw(proc,dots);
|
PRDMDDraw(proc,dots);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
case kPREventTypeAccelerometerX:
|
case kPREventTypeAccelerometerX:
|
||||||
{
|
|
||||||
//readData[0] = event->value & 0x3FFF;
|
//readData[0] = event->value & 0x3FFF;
|
||||||
readData[0] = event->value;
|
readData[0] = event->value;
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
case kPREventTypeAccelerometerY:
|
case kPREventTypeAccelerometerY:
|
||||||
{
|
|
||||||
//readData[1] = event->value & 0x3FFF;
|
//readData[1] = event->value & 0x3FFF;
|
||||||
readData[1] = event->value;
|
readData[1] = event->value;
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
case kPREventTypeAccelerometerZ:
|
case kPREventTypeAccelerometerZ:
|
||||||
{
|
|
||||||
//readData[2] = event->value & 0x3FFF;
|
//readData[2] = event->value & 0x3FFF;
|
||||||
readData[2] = event->value;
|
readData[2] = event->value;
|
||||||
printf("\nAccel: X: %x, Y: %x, Z: %x", readData[0], readData[1],readData[2]);
|
printf("Accel: X: %x, Y: %x, Z: %x\n", readData[0], readData[1],readData[2]);
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
case kPREventTypeAccelerometerIRQ:
|
case kPREventTypeAccelerometerIRQ:
|
||||||
{
|
|
||||||
//readData[2] = event->value & 0x3FFF;
|
//readData[2] = event->value & 0x3FFF;
|
||||||
readData[3] = event->value;
|
readData[3] = event->value;
|
||||||
printf("\nAccel IRQ: %x", readData[3]);
|
printf("Accel IRQ: %x\n", readData[3]);
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
default:
|
default:
|
||||||
{
|
printf("Unknown event: %x:%x\n", event->type, event->value);
|
||||||
printf("\nUnknown event: %x:%x", event->type, event->value);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (numEvents > 0) {
|
if (numEvents > 0) {
|
||||||
|
|||||||
Reference in New Issue
Block a user