edited bold-words in dictionary.odt

updated code files

git-svn-id: file:///srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/repositories/svn/Diplomarbeit@132 9fe90eed-be63-e94b-8204-d34ff4c2ff93
This commit is contained in:
Matthias
2009-01-15 11:59:37 +00:00
parent f468e09499
commit b769685b66
26 changed files with 356 additions and 19 deletions
@@ -65,6 +65,7 @@
*/
void LEDPauseFlash(t_led_ids LEDnum, UINT8 counts, INT16 delay_length);
/* ---------------------------------------------------------------------------
* Function: LEDResult
*
@@ -77,6 +78,7 @@ void LEDPauseFlash(t_led_ids LEDnum, UINT8 counts, INT16 delay_length);
*/
void LEDResult (BOOLEAN TestResult);
/* ---------------------------------------------------------------------------
* Function: LEDResultDIO
*
@@ -90,6 +92,7 @@ void LEDResult (BOOLEAN TestResult);
*/
void LEDResultDIO (BOOLEAN TestResult, UINT16 dioNo);
/* ---------------------------------------------------------------------------
* Function: LEDToggleForever
*
@@ -102,6 +105,7 @@ void LEDResultDIO (BOOLEAN TestResult, UINT16 dioNo);
*/
void LEDToggleForever( void);
/* ---------------------------------------------------------------------------
* Function: LEDToggle
*
@@ -114,6 +118,7 @@ void LEDToggleForever( void);
*/
void LEDToggle( UINT16 cnts);
/* ---------------------------------------------------------------------------
* Function: LEDShowStatus
*
@@ -126,6 +131,7 @@ void LEDToggle( UINT16 cnts);
*/
void LEDShowStatus (UINT16 status);
/* ---------------------------------------------------------------------------
* Functions: gLEDToggle / rLEDToggle
*
@@ -140,6 +146,7 @@ void LEDShowStatus (UINT16 status);
void gLEDToggle (UINT16 time);
void rLEDToggle (UINT16 time);
/* ---------------------------------------------------------------------------
* Function: dioToggle
*
@@ -153,6 +160,7 @@ void rLEDToggle (UINT16 time);
*/
void dioToggle (UINT16 LEDnr);
/* ---------------------------------------------------------------------------
* Function: dioToggleNC
*
@@ -166,6 +174,7 @@ void dioToggle (UINT16 LEDnr);
*/
void dioToggleNC (UINT16 LEDnr);
/* ---------------------------------------------------------------------------
* Function: dio2x4
*
@@ -180,6 +189,7 @@ void dioToggleNC (UINT16 LEDnr);
*/
void dio2x4 (UINT32 ToggleTime);
/* ---------------------------------------------------------------------------
* Function: dioClean
*
@@ -192,6 +202,7 @@ void dio2x4 (UINT32 ToggleTime);
*/
void dioClean (void);
/* ---------------------------------------------------------------------------
* Function: dioCapture
*
@@ -204,6 +215,7 @@ void dioClean (void);
*/
UINT8 dioCapture (void);
/* ---------------------------------------------------------------------------
* Function: dioResume
*
@@ -1,5 +1,5 @@
/* ---------------------------------------------------------------------------
* protocolfunctions.c - v0.1 (c) 2008 Micro-key bv
* protocolfunctions.c (c) 2008 Micro-key bv
* ---------------------------------------------------------------------------
* Micro-key bv
* Industrieweg 28, 9804 TG Noordhorn
@@ -54,8 +54,6 @@
* Global variable definitions
* ---------------------------------------------------------------------------
*/
extern BOOLEAN auto_testResult;
extern UINT32 UINT32result;
/* ---------------------------------------------------------------------------
@@ -157,6 +157,18 @@ void slaveRestartFunction (UINT8 requestNr, UINT8 nrOfResults, UINT32 *results);
void UINT32ResultFunction (UINT8 requestNr, UINT8 nrOfResults, UINT32 *results);
/* ---------------------------------------------------------------------------
* Function: receiveRemoteAttachedFunctions
*
* Function to receive and print the name of a attached remote function
*
* Parameters: UINT8 requestNr - number of the request
* UINT8 nrOfResult - Number of Attached Results
* UIN32 *results - Attached Results
*
* Return: void
* ---------------------------------------------------------------------------
*/
void receiveRemoteAttachedFunctions (UINT8 requestNr, UINT8 nrOfResults, UINT32 *results);
#endif /* __PROTOCOLTEST_H__ */
+1 -1
View File
@@ -37,7 +37,7 @@
/* ---------------------------------------------------------------------------
* Description: MAIN File to Application Project
* ---------------------------------------------------------------------------
* Version(s): 0.1, Jul 07, 2008, MMi
* Version(s): 0.1, Jul 08, 2008, MMi
*
* ---------------------------------------------------------------------------
*/
@@ -111,7 +111,7 @@ const char *command_table[NUMBER_OF_COMMANDS] =
"volout"
};
/* Make Sure that at least the first letter of this is in alphabetical order*/
const fpointer command_pointer[NUMBER_OF_COMMANDS] =
{
m_aio,
@@ -38,7 +38,7 @@
* Type definitions.
* ---------------------------------------------------------------------------
*/
typedef void (*fpointer)(void);
typedef void (*fpointer)(void); /* Function pointer for menu */
/* ---------------------------------------------------------------------------
* Variable declarations.
* ---------------------------------------------------------------------------
@@ -10,7 +10,7 @@
* Email: support@microkey.nl
* Web: www.microkey.nl
* ---------------------------------------------------------------------------
* Description:
* Description: All called, menu-specific functions are defined here
* ---------------------------------------------------------------------------
* Version(s): 0.1, Nov 14, 2008, MMi
* Creation.
@@ -118,7 +118,7 @@ void m_run(void)
{
dioClean();
diotasksdelete();
// \MARK Automatic Test not necessary on Olimex Board
// \MARK Automatic Test not necessary on Olimex Board
#if ((PINSET_TESTER == 1) || (PINSET_TESTER == 2))
// automaticdesigntest(); // \TODO NO AUTOMATIC TEST AVAILABLE
#else
@@ -329,7 +329,8 @@ void m_curout(void)
sendString(MenuPort, TRUE, importantMessage, "Wrote Output to: ",
ItoDStr(dacReadBack(arg1, arg2)), " uA");
}
} else
}
else
{
sendString(MenuPort, TRUE, importantMessage,
"ARGUMENT ERROR! Did nothing... ", Dummy, Dummy);
@@ -64,20 +64,123 @@ xSemaphoreHandle remoteAnalogueSemaphore;
* ---------------------------------------------------------------------------
*/
/* ---------------------------------------------------------------------------
* Function: remoteAioInit
*
* Initialisation of the remote analogue driver; takes the analogue semaphore
*
* Parameter: void
*
* Return: void
* ---------------------------------------------------------------------------
*/
void remoteAioInit (void);
/* ---------------------------------------------------------------------------
* Function: remoteAioWrite
*
* Writes to one remote analogue output
*
* Parameter: UINT8 device - Number of the device to write one
UINT8 channel - Channelnumber that should be affected
INT32 value - Value that should be written
*
* Return: RESULT - Write result
* ---------------------------------------------------------------------------
*/
RESULT remoteAioWrite (UINT8 device, UINT8 channel, INT32 value);
/* ---------------------------------------------------------------------------
* Function: remoteAioWriteAll
*
* Writes to all remote analogue outputs
*
* Parameter: UINT8 device - Number of the device to write on
t_boardtype_analogue board - type of board (MB or EB)
INT32 value - Value that should be written
*
* Return: RESULT - Write result
* ---------------------------------------------------------------------------
*/
RESULT remoteAioWriteAll (UINT8 device, t_boardtype_analogue board, BOOLEAN value);
/* ---------------------------------------------------------------------------
* Function: remoteAioread
*
* Reads on one remote analogue outputs
*
* Parameter: UINT8 device - Number of the device to write on
UINT8 channel - Number of affected channel
*
* Return: UINT32 - Read value
* ---------------------------------------------------------------------------
*/
UINT32 remoteAioRead (UINT8 device, UINT8 channel);
/* ---------------------------------------------------------------------------
* Function: remoteAioread
*
* Reads on one remote analogue outputs
*
* Parameter: UINT8 device - Number of the device to write on
t_boardtype_analogue board - type of board (MB or EB)
*
* Return: void
* ---------------------------------------------------------------------------
*/
void remoteAioReadAll (UINT8 device, t_boardtype_analogue board);
/* ---------------------------------------------------------------------------
* Function: remoteAnalogueSemaphoreRelease
*
* Is called as a result from the remote device to release the analogue
* Semaphore. This call is the last statement within the remote procedure.
* It assures that the complete function is executed before the local
* software resumes working.
*
* Parameters: UINT8 requestNr - Number of the momentary request
* UINT8 nrOfResults - Indicates how many values are returned
* UINT32 *results - Result-Array of "NrOfResults"-size
*
* Return: void
* ---------------------------------------------------------------------------
*/
void remoteAnalogueSemaphoreRelease (UINT8 requestNr, UINT8 nrOfResults, UINT32 *results);
/* ---------------------------------------------------------------------------
* Function: analogueReadResult
*
* Is called as result function; receives the remotely read value
*
* Parameters: UINT8 requestNr - Number of the momentary request
* UINT8 nrOfResults - Indicates how many values are returned
* UINT32 *results - Result-Array of "NrOfResults"-size
*
* Return: void
* ---------------------------------------------------------------------------
*/
void analogueReadResult (UINT8 requestNr, UINT8 nrOfResults, UINT32 *results);
/* ---------------------------------------------------------------------------
* Function: analogueReadAllResult
*
* Is called as result function; receives the remotely read values
*
* Parameters: UINT8 requestNr - Number of the momentary request
* UINT8 nrOfResults - Indicates how many values are returned
* UINT32 *results - Result-Array of "NrOfResults"-size
*
* Return: void
* ---------------------------------------------------------------------------
*/
void analogueReadAllResult (UINT8 requestNr, UINT8 nrOfResults, UINT32 *results);
@@ -85,6 +85,7 @@ BOOLEAN makeHandshake (void)
}
#endif
UINT8 returnRemoteCalibrationStatus (INT32 correctionType)
{
xSemaphoreTake(generalSemaphore, 0);
@@ -16,13 +16,14 @@
* Creation.
* ---------------------------------------------------------------------------
*/
#include "lpc23xx.h"
#include "types.h"
#ifndef REMOTE_MISC_H_
#define REMOTE_MISC_H_
/* ---------------------------------------------------------------------------
* System include files.
* ---------------------------------------------------------------------------
*/
#include "lpc23xx.h"
#include "types.h"
/* ---------------------------------------------------------------------------
* Application include files.
* ---------------------------------------------------------------------------
@@ -67,7 +68,5 @@ UINT8 showRemoteCalibrationStatus (INT32 correctionType);
void digitalReadResult (UINT8 requestNr, UINT8 nrOfResults, UINT32 *results);
#ifndef REMOTE_MISC_H_
#define REMOTE_MISC_H_
#endif /*REMOTE_MISC_H_*/
@@ -58,13 +58,64 @@ xSemaphoreHandle remoteRelaySemaphore;
* Function declarations.
* ---------------------------------------------------------------------------
*/
/* ---------------------------------------------------------------------------
* Function: remoteRelayInit
*
* Initialisation of the relay remote driver, creates and takes relay
* Semaphore.
*
* Parameters: void
*
* Return: void
* ---------------------------------------------------------------------------
*/
void remoteRelayInit(void);
/* ---------------------------------------------------------------------------
* Function: remoteRelaySet
*
* Sets or cleans a relay output on the remote device
*
* Parameters: UINT8 device - Number of the remote device
* UINT8 channel - Number of the effected remote channel
* BOOLEAN value - Value to be written
*
* Return: RESULT - Indicates the status of the write action
* ---------------------------------------------------------------------------
*/
RESULT remoteRelaySet (UINT8 device, UINT8 channel, BOOLEAN value);
/* ---------------------------------------------------------------------------
* Function: remoteRelayRead
*
* reads from one remote relay input. If the result fails, the previous
* generated result will be returned.
*
* Parameters: UINT8 device - Number of the remote device
* UINT8 channel - Number of the effected remote channel
*
* Return: BOOLEAN - The read result
* ---------------------------------------------------------------------------
*/
BOOLEAN remoteRelayRead (UINT8 device, UINT8 channel);
/* ---------------------------------------------------------------------------
* Function: remoteRelaySetAll
*
* Sets or cleans all relay outputs on the remote device
*
* Parameters: UINT8 device - Number of the remote device
* UINT8 channel - Number of the effected remote channel
* BOOLEAN value - Value to be written
*
* Return: RESULT - Indicates the status of the write action
* ---------------------------------------------------------------------------
*/
RESULT remoteRelaySetAll (UINT8 device, t_boardtype_relay board, BOOLEAN value);
void remoteRelaySemaphoreRelease (UINT8 requestNr, UINT8 nrOfResults, UINT32 *results);
@@ -53,16 +53,81 @@
* ---------------------------------------------------------------------------
*/
/* ---------------------------------------------------------------------------
* Function: remoteAnalogueLinetestMBExecute
*
* Main function to the analogue connectivity test of the main board
*
* Parameter: void
*
* Return: BOOLEAN - test result
* ---------------------------------------------------------------------------
*/
BOOLEAN remoteAnalogueLinetestMBExecute (void);
/* ---------------------------------------------------------------------------
* Function: remoteAnalogueLinetestEBExecute
*
* Main function to the analogue connectivity test of the extension board
*
* Parameter: void
*
* Return: BOOLEAN - test result
* ---------------------------------------------------------------------------
*/
BOOLEAN remoteAnalogueLinetestEBExecute (void);
/* ---------------------------------------------------------------------------
* Function: remoteAnalogueOutputTest_MB
*
* Analogue output test for test_item main board
*
* Parameter: void
*
* Return: BOOLEAN - test result
* ---------------------------------------------------------------------------
*/
BOOLEAN remoteAnalogueOutputTest_MB (void);
/* ---------------------------------------------------------------------------
* Function: remoteAnalogueInputTest_MB
*
* Analogue input test for test_item main board
*
* Parameter: void
*
* Return: BOOLEAN - test result
* ---------------------------------------------------------------------------
*/
BOOLEAN remoteAnalogueInputTest_MB (void);
/* ---------------------------------------------------------------------------
* Function: remoteAnalogueOutputTest_EB
*
* Analogue output test for test_item extension board
*
* Parameter: void
*
* Return: BOOLEAN - test result
* ---------------------------------------------------------------------------
*/
BOOLEAN remoteAnalogueOutputTest_EB (void);
/* ---------------------------------------------------------------------------
* Function: remoteAnalogueInputTest_EB
*
* Analogue input test for test_item extension board
*
* Parameter: void
*
* Return: BOOLEAN - test result
* ---------------------------------------------------------------------------
*/
BOOLEAN remoteAnalogueInputTest_EB (void);
@@ -50,6 +50,16 @@
* ---------------------------------------------------------------------------
*/
/* ---------------------------------------------------------------------------
* Function: remoteLEDTestMBexecute
*
* LED test for all LEDS available on CPU and main board
*
* Parameter: void
*
* Return: BOOLEAN - test result
* ---------------------------------------------------------------------------
*/
BOOLEAN remoteLEDTestMBexecute (void);