diff --git a/examples/pinproctest/alphanumeric.cpp b/examples/pinproctest/alphanumeric.cpp index fc34bb3..e91b5c7 100644 --- a/examples/pinproctest/alphanumeric.cpp +++ b/examples/pinproctest/alphanumeric.cpp @@ -108,7 +108,7 @@ void display(PRHandle proc, char * string_1, char * string_2) for (i=0; i<16; i++) { // Assert the STB line - PRDriverAuxPrepareOutput(&(auxCommands[cmd_index++]), i, 0, DIS_STB, false); + PRDriverAuxPrepareOutput(&(auxCommands[cmd_index++]), i, 0, DIS_STB, false, 0); char_a = string_1[i]; char_b = string_2[i]; @@ -120,17 +120,17 @@ void display(PRHandle proc, char * string_1, char * string_2) printf("\nchar_a: %x, segs_a: %x", char_a, segs_a); printf("\nchar_b: %x, segs_b: %x", char_b, segs_b); - PRDriverAuxPrepareOutput(&(auxCommands[cmd_index++]), segs_a & 0xff, 0, STB_1, false); - PRDriverAuxPrepareOutput(&(auxCommands[cmd_index++]), (segs_a >> 8) & 0xff, 0, STB_2, false); - PRDriverAuxPrepareOutput(&(auxCommands[cmd_index++]), segs_b & 0xff, 0, STB_3, false); - PRDriverAuxPrepareOutput(&(auxCommands[cmd_index++]), (segs_b >> 8) & 0xff, 0, STB_4, false); + PRDriverAuxPrepareOutput(&(auxCommands[cmd_index++]), segs_a & 0xff, 0, STB_1, false, 0); + PRDriverAuxPrepareOutput(&(auxCommands[cmd_index++]), (segs_a >> 8) & 0xff, 0, STB_2, false, 0); + PRDriverAuxPrepareOutput(&(auxCommands[cmd_index++]), segs_b & 0xff, 0, STB_3, false, 0); + PRDriverAuxPrepareOutput(&(auxCommands[cmd_index++]), (segs_b >> 8) & 0xff, 0, STB_4, false, 0); PRDriverAuxPrepareDelay(&auxCommands[cmd_index++],350); - PRDriverAuxPrepareOutput(&(auxCommands[cmd_index++]), 0, 0, STB_1, false); - PRDriverAuxPrepareOutput(&(auxCommands[cmd_index++]), 0, 0, STB_2, false); - PRDriverAuxPrepareOutput(&(auxCommands[cmd_index++]), 0, 0, STB_3, false); - PRDriverAuxPrepareOutput(&(auxCommands[cmd_index++]), 0, 0, STB_4, false); + PRDriverAuxPrepareOutput(&(auxCommands[cmd_index++]), 0, 0, STB_1, false, 0); + PRDriverAuxPrepareOutput(&(auxCommands[cmd_index++]), 0, 0, STB_2, false, 0); + PRDriverAuxPrepareOutput(&(auxCommands[cmd_index++]), 0, 0, STB_3, false, 0); + PRDriverAuxPrepareOutput(&(auxCommands[cmd_index++]), 0, 0, STB_4, false, 0); PRDriverAuxPrepareDelay(&auxCommands[cmd_index++],40); } @@ -163,8 +163,8 @@ void display(PRHandle proc, char * string_1, char * string_2) void UpdateAlphaDisplay(PRHandle proc, int counter) { - char string_1a[] = "P-ROC CAN DRIVE "; - char string_1b[] = "ALPHANUMERICS "; + char string_1a[] = " P-ROC "; + char string_1b[] = " V1.17 D3 "; display(proc, string_1a, string_1b); } diff --git a/include/pinproc.h b/include/pinproc.h index 01fc544..963edb5 100644 --- a/include/pinproc.h +++ b/include/pinproc.h @@ -268,7 +268,7 @@ PR_EXPORT PRResult PRDriverPulsedPatter(PRHandle handle, uint16_t driverNum, uin * Prepares an Aux Command to drive the Aux bus. * This function is provided for convenience. */ -PR_EXPORT void PRDriverAuxPrepareOutput(PRDriverAuxCommand *auxCommand, uint8_t data, uint8_t extraData, uint8_t enables, bool_t muxEnables); +PR_EXPORT void PRDriverAuxPrepareOutput(PRDriverAuxCommand *auxCommand, uint8_t data, uint8_t extraData, uint8_t enables, bool_t muxEnables, uint16_t delayTime); /** * Prepares an Aux Command to delay the Aux logic. * This function is provided for convenience. diff --git a/src/PRDevice.cpp b/src/PRDevice.cpp index 41b57b2..1562f89 100644 --- a/src/PRDevice.cpp +++ b/src/PRDevice.cpp @@ -32,6 +32,7 @@ #include #include #include +#include PRDevice::PRDevice(PRMachineType machineType) : machineType(machineType) { @@ -531,6 +532,7 @@ PRResult PRDevice::DriverAuxSendCommands(PRDriverAuxCommand * commands, uint8_t for (k=0; kDriverAuxSendCommands(commands, numCommands, startingAddr); } -PR_EXPORT void PRDriverAuxPrepareOutput(PRDriverAuxCommand *auxCommand, uint8_t data, uint8_t extraData, uint8_t enables, bool_t muxEnables) +PR_EXPORT void PRDriverAuxPrepareOutput(PRDriverAuxCommand *auxCommand, uint8_t data, uint8_t extraData, uint8_t enables, bool_t muxEnables, uint16_t delayTime) { auxCommand->active = true; auxCommand->data = data; @@ -223,6 +223,7 @@ PR_EXPORT void PRDriverAuxPrepareOutput(PRDriverAuxCommand *auxCommand, uint8_t auxCommand->enables = enables; auxCommand->muxEnables = muxEnables; auxCommand->command = kPRDriverAuxCmdOutput; + auxCommand->delayTime = delayTime; } PR_EXPORT void PRDriverAuxPrepareDelay(PRDriverAuxCommand *auxCommand, uint16_t delayTime)