From 495d688106bf870084468e4a7bc57a29a1f46e2f Mon Sep 17 00:00:00 2001 From: Adam Preble Date: Sat, 30 May 2009 14:07:24 -0400 Subject: [PATCH] Changed outputDriverTime to 8 bits. Also changed Pulse function param. --- include/pinproc.h | 6 +++--- src/PRHardware.cpp | 1 - src/pinproc.cpp | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/pinproc.h b/include/pinproc.h index c99f215..340675c 100644 --- a/include/pinproc.h +++ b/include/pinproc.h @@ -145,7 +145,7 @@ typedef struct PRDriverGroupConfig { typedef struct PRDriverState { uint16_t driverNum; - uint32_t outputDriveTime; + uint8_t outputDriveTime; bool_t polarity; bool_t state; bool_t waitForFirstTimeSlot; @@ -179,7 +179,7 @@ PR_EXPORT PRResult PRDriverDisable(PRHandle handle, uint16_t driverNum); * Pulses the given driver for a number of milliseconds. * This function is provided for convenience. See PRDriverStatePulse() for a full description. */ -PR_EXPORT PRResult PRDriverPulse(PRHandle handle, uint16_t driverNum, int milliseconds); +PR_EXPORT PRResult PRDriverPulse(PRHandle handle, uint16_t driverNum, uint8_t milliseconds); /** * Assigns a repeating schedule to the given driver. * This function is provided for convenience. See PRDriverStateSchedule() for a full description. @@ -203,7 +203,7 @@ PR_EXPORT void PRDriverStateDisable(PRDriverState *driverState); * @param milliseconds Number of milliseconds to pulse the driver for. * @note The driver state structure must be applied using PRDriverUpdateState() or linked to a switch rule using PRSwitchUpdateRule() to have any effect. */ -PR_EXPORT void PRDriverStatePulse(PRDriverState *driverState, int milliseconds); +PR_EXPORT void PRDriverStatePulse(PRDriverState *driverState, uint8_t milliseconds); /** * Changes the given #PRDriverState to reflect a scheduled state. * Assigns a repeating schedule to the given driver. diff --git a/src/PRHardware.cpp b/src/PRHardware.cpp index 886441d..3a7fe27 100644 --- a/src/PRHardware.cpp +++ b/src/PRHardware.cpp @@ -143,7 +143,6 @@ int32_t CreateWatchdogConfigBurst ( uint32_t * burst, bool_t watchdogExpired, int32_t CreateSwitchUpdateConfigBurst ( uint32_t * burst, PRSwitchConfig *switchConfig) { uint32_t addr; - uint32_t i; addr = 0; burst[0] = CreateBurstCommand (P_ROC_BUS_SWITCH_CTRL_SELECT, addr, 1 ); diff --git a/src/pinproc.cpp b/src/pinproc.cpp index 8ed6d80..8245a47 100644 --- a/src/pinproc.cpp +++ b/src/pinproc.cpp @@ -124,7 +124,7 @@ PR_EXPORT PRResult PRDriverDisable(PRHandle handle, uint16_t driverNum) PRDriverStateDisable(&driver); return handleAsDevice->DriverUpdateState(&driver); } -PR_EXPORT PRResult PRDriverPulse(PRHandle handle, uint16_t driverNum, int milliseconds) +PR_EXPORT PRResult PRDriverPulse(PRHandle handle, uint16_t driverNum, uint8_t milliseconds) { PRDriverState driver; handleAsDevice->DriverGetState(driverNum, &driver); @@ -160,7 +160,7 @@ PR_EXPORT void PRDriverStateDisable(PRDriverState *driver) driver->patterOffTime = 0; driver->patterEnable = false; } -PR_EXPORT void PRDriverStatePulse(PRDriverState *driver, int milliseconds) +PR_EXPORT void PRDriverStatePulse(PRDriverState *driver, uint8_t milliseconds) { driver->state = 1; driver->timeslots = 0;