From 6110e0eeedb48c81fad0e5175aa3639f1a703bfa Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 12 10月 2015 21:51:20 +0800
Subject: [PATCH] Format and trailing space cleanup
---
examples/test-CVI_w_GUI/main.c | 394 ++++++++++++++++++++++++++------------------------------
1 files changed, 184 insertions(+), 210 deletions(-)
diff --git a/examples/test-CVI_w_GUI/main.c b/examples/test-CVI_w_GUI/main.c
index ef981e1..bed589c 100644
--- a/examples/test-CVI_w_GUI/main.c
+++ b/examples/test-CVI_w_GUI/main.c
@@ -69,85 +69,76 @@
/* helper function to remove <LF> and <CR> from the end of a string */
/* this is needed only here for the GUI, there is a 'insert line to a text box' function */
+
/* that automatically adds a new line, so this prohibits double line feeds for the GUI */
-void removeTrailingEndcodes(char *buf)
-{
- int len;
- len = strlen(buf);
-
- while(len > 0)
- {
- len--;
- switch(buf[len])
- {
- case '\n' :
- case '\r' :
- buf[len] = '\0';
- break;
- default :
- len = 0; // stop loop
- break;
- }
- }
+void removeTrailingEndcodes(char *buf) {
+ int len;
+ len = strlen(buf);
+
+ while (len > 0) {
+ len--;
+ switch (buf[len]) {
+ case '\n':
+ case '\r':
+ buf[len] = '\0';
+ break;
+ default:
+ len = 0; // stop loop
+ break;
+ }
+ }
}
/* wrapper for debugging output, collects debug output until a <LF> */
+
/* is received, then removes the <LF> and outputs the line on the GUI */
-void debug_output(char *buf)
-{
- static char pbuf[512];
- static int pos = 0;
- int len;
-
- len = strlen(buf);
- if(buf[len-1] == '\n')
- {
- buf[len-1] == '\0';
- len--;
- memcpy(&pbuf[pos], buf, len);
- pos = 0;
- InsertTextBoxLine (panelHandle, PANEL_OUTPUTDEBUG, -1, pbuf);
- }
- else
- {
- memcpy(&pbuf[pos], buf, len);
- pos += len;
- }
-
+void debug_output(char *buf) {
+ static char pbuf[512];
+ static int pos = 0;
+ int len;
+
+ len = strlen(buf);
+ if (buf[len - 1] == '\n') {
+ buf[len - 1] == '\0';
+ len--;
+ memcpy(&pbuf[pos], buf, len);
+ pos = 0;
+ InsertTextBoxLine(panelHandle, PANEL_OUTPUTDEBUG, -1, pbuf);
+ } else {
+ memcpy(&pbuf[pos], buf, len);
+ pos += len;
+ }
+
}
-size_t SCPI_Write(scpi_t * context, const char * data, size_t len)
-{
- if((SCPI_outputBuffer_idx + len) > (SCPI_OUPUT_BUFFER_SIZE-1))
- {
- len = (SCPI_OUPUT_BUFFER_SIZE-1) - SCPI_outputBuffer_idx; // limit length to left over space
- // apparently there is no mechanism to cope with buffers that are too small
- }
- memcpy(&SCPI_outputBuffer[SCPI_outputBuffer_idx], data, len);
- SCPI_outputBuffer_idx += len;
-
- SCPI_outputBuffer[SCPI_outputBuffer_idx] = '\0';
- // return fwrite(data, 1, len, stdout);
- return len;
+size_t SCPI_Write(scpi_t * context, const char * data, size_t len) {
+ if ((SCPI_outputBuffer_idx + len) > (SCPI_OUPUT_BUFFER_SIZE - 1)) {
+ len = (SCPI_OUPUT_BUFFER_SIZE - 1) - SCPI_outputBuffer_idx; // limit length to left over space
+ // apparently there is no mechanism to cope with buffers that are too small
+ }
+ memcpy(&SCPI_outputBuffer[SCPI_outputBuffer_idx], data, len);
+ SCPI_outputBuffer_idx += len;
+
+ SCPI_outputBuffer[SCPI_outputBuffer_idx] = '\0';
+ // return fwrite(data, 1, len, stdout);
+ return len;
}
-scpi_result_t SCPI_Flush(scpi_t * context)
-{
-// fwrite(SCPI_outputBuffer, 1, SCPI_outputBuffer_idx, stdout);
- removeTrailingEndcodes(SCPI_outputBuffer);
- InsertTextBoxLine (panelHandle, PANEL_OUTPUT, -1, SCPI_outputBuffer);
- SCPI_outputBuffer_idx = 0;
- return SCPI_RES_OK;
+scpi_result_t SCPI_Flush(scpi_t * context) {
+ // fwrite(SCPI_outputBuffer, 1, SCPI_outputBuffer_idx, stdout);
+ removeTrailingEndcodes(SCPI_outputBuffer);
+ InsertTextBoxLine(panelHandle, PANEL_OUTPUT, -1, SCPI_outputBuffer);
+ SCPI_outputBuffer_idx = 0;
+ return SCPI_RES_OK;
}
-int SCPI_Error(scpi_t * context, int_fast16_t err)
-{
- char buf[512];
-
-// fprintf(stderr, "**ERROR: %d, \"%s\"\r\n", (int16_t) err, SCPI_ErrorTranslate(err));
- sprintf(buf, "**ERROR: %d, \"%s\"", (int16_t) err, SCPI_ErrorTranslate(err));
- InsertTextBoxLine (panelHandle, PANEL_OUTPUTERR, -1, buf);
- return 0;
+int SCPI_Error(scpi_t * context, int_fast16_t err) {
+ char buf[512];
+
+ // fprintf(stderr, "**ERROR: %d, \"%s\"\r\n", (int16_t) err, SCPI_ErrorTranslate(err));
+ sprintf(buf, "**ERROR: %d, \"%s\"", (int16_t) err, SCPI_ErrorTranslate(err));
+ InsertTextBoxLine(panelHandle, PANEL_OUTPUTERR, -1, buf);
+ return 0;
}
scpi_result_t SCPI_Control(scpi_t * context, scpi_ctrl_name_t ctrl, scpi_reg_val_t val) {
@@ -161,10 +152,10 @@
}
scpi_result_t SCPI_Reset(scpi_t * context) {
- char buf[256];
-// fprintf(stderr, "**Reset\r\n");
- sprintf(buf, "**Reset\r\n");
- debug_output(buf);
+ char buf[256];
+ // fprintf(stderr, "**Reset\r\n");
+ sprintf(buf, "**Reset\r\n");
+ debug_output(buf);
return SCPI_RES_OK;
}
@@ -172,184 +163,167 @@
return SCPI_RES_ERR;
}
-
/*
*
*/
-int main(int argc, char** argv)
-{
- int result;
+int main(int argc, char** argv) {
+ int result;
- SCPI_Init(&scpi_context);
+ SCPI_Init(&scpi_context);
- if (InitCVIRTE (0, argv, 0) == 0)
- return -1; /* out of memory */
- if ((panelHandle = LoadPanel (0, "TestLibscpi.uir", PANEL)) < 0)
- return -1;
- DisplayPanel (panelHandle);
+ if (InitCVIRTE(0, argv, 0) == 0)
+ return -1; /* out of memory */
+ if ((panelHandle = LoadPanel(0, "TestLibscpi.uir", PANEL)) < 0)
+ return -1;
+ DisplayPanel(panelHandle);
- updateSSCPIRegister();
+ updateSSCPIRegister();
- RunUserInterface ();
- DiscardPanel (panelHandle);
+ RunUserInterface();
+ DiscardPanel(panelHandle);
- return (EXIT_SUCCESS);
+ return (EXIT_SUCCESS);
}
-
-void updateSSCPIRegister(void)
-{
- updateSTB();
- updateSRE();
- updateESR();
- updateESE();
+void updateSSCPIRegister(void) {
+ updateSTB();
+ updateSRE();
+ updateESR();
+ updateESE();
}
-void updateSTB(void)
-{
- scpi_reg_val_t regVal;
-
- regVal = SCPI_RegGet(&scpi_context, SCPI_REG_STB);
+void updateSTB(void) {
+ scpi_reg_val_t regVal;
- gui_updateSTB((uint8_t)(0x00FF & regVal));
+ regVal = SCPI_RegGet(&scpi_context, SCPI_REG_STB);
+
+ gui_updateSTB((uint8_t) (0x00FF & regVal));
}
-void updateESR(void)
-{
- scpi_reg_val_t regVal;
-
- regVal = SCPI_RegGet(&scpi_context, SCPI_REG_ESR);
+void updateESR(void) {
+ scpi_reg_val_t regVal;
- gui_updateESR((uint8_t)(0x00FF & regVal));
+ regVal = SCPI_RegGet(&scpi_context, SCPI_REG_ESR);
+
+ gui_updateESR((uint8_t) (0x00FF & regVal));
}
-void updateESE(void)
-{
- scpi_reg_val_t regVal;
-
- regVal = SCPI_RegGet(&scpi_context, SCPI_REG_ESE);
+void updateESE(void) {
+ scpi_reg_val_t regVal;
- gui_updateESE((uint8_t)(0x00FF & regVal));
+ regVal = SCPI_RegGet(&scpi_context, SCPI_REG_ESE);
+
+ gui_updateESE((uint8_t) (0x00FF & regVal));
}
-void updateSRE(void)
-{
- scpi_reg_val_t regVal;
-
- regVal = SCPI_RegGet(&scpi_context, SCPI_REG_SRE);
+void updateSRE(void) {
+ scpi_reg_val_t regVal;
- gui_updateSRE((uint8_t)(0x00FF & regVal));
+ regVal = SCPI_RegGet(&scpi_context, SCPI_REG_SRE);
+
+ gui_updateSRE((uint8_t) (0x00FF & regVal));
}
-
/*
* The CALLBACK functions below are called from the CVI runtime engine when
* user clicks on buttons, inputs data on the GUI etc.
*/
-int CVICALLBACK cb_scpi_input (int panel, int control, int event,
- void *callbackData, int eventData1, int eventData2)
-{
- char buf[256];
- int len;
-
- switch (event)
- {
- case EVENT_COMMIT:
- GetCtrlVal(panel, control, buf);
- /* we have to add a endcode to make SCPI accept the string, here a <LF> is added */
- len = strlen(buf);
- buf[len] = '\n';
- len++;
- SCPI_Input(&scpi_context, buf, len);
-
- updateSSCPIRegister();
- break;
- }
- return 0;
+int CVICALLBACK cb_scpi_input(int panel, int control, int event,
+ void *callbackData, int eventData1, int eventData2) {
+ char buf[256];
+ int len;
+
+ switch (event) {
+ case EVENT_COMMIT:
+ GetCtrlVal(panel, control, buf);
+ /* we have to add a endcode to make SCPI accept the string, here a <LF> is added */
+ len = strlen(buf);
+ buf[len] = '\n';
+ len++;
+ SCPI_Input(&scpi_context, buf, len);
+
+ updateSSCPIRegister();
+ break;
+ }
+ return 0;
}
-int CVICALLBACK cb_quit (int panel, int control, int event,
- void *callbackData, int eventData1, int eventData2)
-{
- switch (event)
- {
- case EVENT_COMMIT:
- QuitUserInterface (0);
- break;
- }
- return 0;
+int CVICALLBACK cb_quit(int panel, int control, int event,
+ void *callbackData, int eventData1, int eventData2) {
+ switch (event) {
+ case EVENT_COMMIT:
+ QuitUserInterface(0);
+ break;
+ }
+ return 0;
}
/*
* Helper functions for GUI
*/
-void gui_updateSTB(uint8_t newSTB)
-{
- char buf[5];
-
- sprintf(buf, "0x%02X", newSTB);
- SetCtrlVal(panelHandle, PANEL_STBHEX, buf);
-
- SetCtrlVal(panelHandle, PANEL_STB0, (newSTB & 0x01));
- SetCtrlVal(panelHandle, PANEL_STB1, (newSTB & 0x02));
- SetCtrlVal(panelHandle, PANEL_STB2, (newSTB & 0x04));
- SetCtrlVal(panelHandle, PANEL_STB3, (newSTB & 0x08));
- SetCtrlVal(panelHandle, PANEL_STB4, (newSTB & 0x10));
- SetCtrlVal(panelHandle, PANEL_STB5, (newSTB & 0x20));
- SetCtrlVal(panelHandle, PANEL_STB6, (newSTB & 0x40));
- SetCtrlVal(panelHandle, PANEL_STB7, (newSTB & 0x80));
-
- if(0x00 == (newSTB & 0x40)) SetCtrlVal(panelHandle, PANEL_LEDSRQ, 0);
+void gui_updateSTB(uint8_t newSTB) {
+ char buf[5];
+
+ sprintf(buf, "0x%02X", newSTB);
+ SetCtrlVal(panelHandle, PANEL_STBHEX, buf);
+
+ SetCtrlVal(panelHandle, PANEL_STB0, (newSTB & 0x01));
+ SetCtrlVal(panelHandle, PANEL_STB1, (newSTB & 0x02));
+ SetCtrlVal(panelHandle, PANEL_STB2, (newSTB & 0x04));
+ SetCtrlVal(panelHandle, PANEL_STB3, (newSTB & 0x08));
+ SetCtrlVal(panelHandle, PANEL_STB4, (newSTB & 0x10));
+ SetCtrlVal(panelHandle, PANEL_STB5, (newSTB & 0x20));
+ SetCtrlVal(panelHandle, PANEL_STB6, (newSTB & 0x40));
+ SetCtrlVal(panelHandle, PANEL_STB7, (newSTB & 0x80));
+
+ if (0x00 == (newSTB & 0x40)) SetCtrlVal(panelHandle, PANEL_LEDSRQ, 0);
}
-void gui_updateESR(uint8_t newESR)
-{
- char buf[5];
-
- sprintf(buf, "0x%02X", newESR);
- SetCtrlVal(panelHandle, PANEL_ESRHEX, buf);
-
- SetCtrlVal(panelHandle, PANEL_ESR0, (newESR & 0x01));
- SetCtrlVal(panelHandle, PANEL_ESR1, (newESR & 0x02));
- SetCtrlVal(panelHandle, PANEL_ESR2, (newESR & 0x04));
- SetCtrlVal(panelHandle, PANEL_ESR3, (newESR & 0x08));
- SetCtrlVal(panelHandle, PANEL_ESR4, (newESR & 0x10));
- SetCtrlVal(panelHandle, PANEL_ESR5, (newESR & 0x20));
- SetCtrlVal(panelHandle, PANEL_ESR6, (newESR & 0x40));
- SetCtrlVal(panelHandle, PANEL_ESR7, (newESR & 0x80));
+void gui_updateESR(uint8_t newESR) {
+ char buf[5];
+
+ sprintf(buf, "0x%02X", newESR);
+ SetCtrlVal(panelHandle, PANEL_ESRHEX, buf);
+
+ SetCtrlVal(panelHandle, PANEL_ESR0, (newESR & 0x01));
+ SetCtrlVal(panelHandle, PANEL_ESR1, (newESR & 0x02));
+ SetCtrlVal(panelHandle, PANEL_ESR2, (newESR & 0x04));
+ SetCtrlVal(panelHandle, PANEL_ESR3, (newESR & 0x08));
+ SetCtrlVal(panelHandle, PANEL_ESR4, (newESR & 0x10));
+ SetCtrlVal(panelHandle, PANEL_ESR5, (newESR & 0x20));
+ SetCtrlVal(panelHandle, PANEL_ESR6, (newESR & 0x40));
+ SetCtrlVal(panelHandle, PANEL_ESR7, (newESR & 0x80));
}
-void gui_updateESE(uint8_t newESE)
-{
- char buf[5];
-
- sprintf(buf, "0x%02X", newESE);
- SetCtrlVal(panelHandle, PANEL_ESEHEX, buf);
-
- SetCtrlVal(panelHandle, PANEL_ESE0, (newESE & 0x01));
- SetCtrlVal(panelHandle, PANEL_ESE1, (newESE & 0x02));
- SetCtrlVal(panelHandle, PANEL_ESE2, (newESE & 0x04));
- SetCtrlVal(panelHandle, PANEL_ESE3, (newESE & 0x08));
- SetCtrlVal(panelHandle, PANEL_ESE4, (newESE & 0x10));
- SetCtrlVal(panelHandle, PANEL_ESE5, (newESE & 0x20));
- SetCtrlVal(panelHandle, PANEL_ESE6, (newESE & 0x40));
- SetCtrlVal(panelHandle, PANEL_ESE7, (newESE & 0x80));
+void gui_updateESE(uint8_t newESE) {
+ char buf[5];
+
+ sprintf(buf, "0x%02X", newESE);
+ SetCtrlVal(panelHandle, PANEL_ESEHEX, buf);
+
+ SetCtrlVal(panelHandle, PANEL_ESE0, (newESE & 0x01));
+ SetCtrlVal(panelHandle, PANEL_ESE1, (newESE & 0x02));
+ SetCtrlVal(panelHandle, PANEL_ESE2, (newESE & 0x04));
+ SetCtrlVal(panelHandle, PANEL_ESE3, (newESE & 0x08));
+ SetCtrlVal(panelHandle, PANEL_ESE4, (newESE & 0x10));
+ SetCtrlVal(panelHandle, PANEL_ESE5, (newESE & 0x20));
+ SetCtrlVal(panelHandle, PANEL_ESE6, (newESE & 0x40));
+ SetCtrlVal(panelHandle, PANEL_ESE7, (newESE & 0x80));
}
-void gui_updateSRE(uint8_t newSRE)
-{
- char buf[5];
-
- sprintf(buf, "0x%02X", newSRE);
- SetCtrlVal(panelHandle, PANEL_SREHEX, buf);
-
- SetCtrlVal(panelHandle, PANEL_SRE0, (newSRE & 0x01));
- SetCtrlVal(panelHandle, PANEL_SRE1, (newSRE & 0x02));
- SetCtrlVal(panelHandle, PANEL_SRE2, (newSRE & 0x04));
- SetCtrlVal(panelHandle, PANEL_SRE3, (newSRE & 0x08));
- SetCtrlVal(panelHandle, PANEL_SRE4, (newSRE & 0x10));
- SetCtrlVal(panelHandle, PANEL_SRE5, (newSRE & 0x20));
- SetCtrlVal(panelHandle, PANEL_SRE6, (newSRE & 0x40));
- SetCtrlVal(panelHandle, PANEL_SRE7, (newSRE & 0x80));
+void gui_updateSRE(uint8_t newSRE) {
+ char buf[5];
+
+ sprintf(buf, "0x%02X", newSRE);
+ SetCtrlVal(panelHandle, PANEL_SREHEX, buf);
+
+ SetCtrlVal(panelHandle, PANEL_SRE0, (newSRE & 0x01));
+ SetCtrlVal(panelHandle, PANEL_SRE1, (newSRE & 0x02));
+ SetCtrlVal(panelHandle, PANEL_SRE2, (newSRE & 0x04));
+ SetCtrlVal(panelHandle, PANEL_SRE3, (newSRE & 0x08));
+ SetCtrlVal(panelHandle, PANEL_SRE4, (newSRE & 0x10));
+ SetCtrlVal(panelHandle, PANEL_SRE5, (newSRE & 0x20));
+ SetCtrlVal(panelHandle, PANEL_SRE6, (newSRE & 0x40));
+ SetCtrlVal(panelHandle, PANEL_SRE7, (newSRE & 0x80));
}
--
Gitblit v1.9.1