Diff: src/boards.cpp

Revision:

11:01dcfb29fbc4

Parent:

10:6c3233b03658

Child:

12:fd1fd1857628

--- a/src/boards.cpp	Fri Dec 07 17:39:01 2018 +0000
+++ b/src/boards.cpp	Fri Dec 07 20:42:41 2018 +0000
@@ -28,12 +28,12 @@
 
 #include "mbed.h"
 #include "globals.h"
+#include "parameters.h"
 #include "boards.h"
+#include "lut.h"
 #include "all_io.h"
 #include "serial.h"
 #include "stdio.h"
-#include "parameters.h"
-#include "lut.h"
 
 unsigned int boardEnableBits;
 
@@ -49,46 +49,19 @@
 /*******************************************************************************
 setBoardEnables
 *******************************************************************************/
-//void setBoardEnables(unsigned int enableBits[])
 unsigned int setBoardEnables(unsigned int tCode)
 {
-   //unsigned int i = 0;
-   //unsigned int boardTcode = 0;
-   // Default is all boards OFF
-   //unsigned int boardTcode = ALLOFF;
-   
-   //dec2therm_fix(tCode, (unsigned int)BOARDS_THERMCODE_WIDTH);
-   
-   //for (i = 0; i < MAX_BOARDS; i++){
-   //   // 0 == enabled
-   //   boardTcode = (thermCode[i] & (1 << i));
-   //}
-    
-   //wr_out = boardTcode;
    wr_out = tCode;
-   //return boardTcode;
    return tCode;
 }
 
 /*******************************************************************************
 setBoardWeights
 *******************************************************************************/
-//void setBoardWeights(unsigned int enableWeights[])
 unsigned int setBoardWeights(unsigned int bCode)
 {
-   //unsigned int i = 0;
-   //unsigned int boardBcode = 0;
-   
-   //dec2bin_fix(bCode, WEIGHT_BIN_WIDTH);
-
-   //for (i = 0; i <= WEIGHT_BIN_WIDTH; i++){
-   //   // 0 == enabled
-   //   boardBcode = (binCode[i] & (1 << i));
-   //}
-   //en_out = boardBcode;
    en_out = bCode;
    toggleLatchSignal();
-   //return boardBcode;
    return bCode;
 }
 
@@ -99,15 +72,6 @@
     extchlat = OFF;
     extchlat = ON;
     extchlat = OFF;
-}
-
-/*******************************************************************************
-initDACs
-*******************************************************************************/
-void initDACs(void)
-{
-   //setupDacInit();
-   //sendDACs(dinitbits);
 }    
 
 /************************************************************
@@ -135,38 +99,14 @@
 /*******************************************************************************
 startConverter
 *******************************************************************************/
-// RK: ch[i][reg].enabled has not been used correctly yet. Need to modify that code.
 void startConverter(unsigned int reg)
 {
-   //unsigned int i;
-   //float period;
    running = TRUE;
-
-   //unsigned int boardsEnabled = 0;
-   //char stemp[50];
-   
-   //for (i = 0; i < MAX_BOARDS; i++){
-   //   //if (ch[i][reg].enabled == 1)
-   //   //{
-   //       // Set the corresponding bit
-   //       boardsEnabled |= (1 << i);
-   //
-   //       sprintf(stemp, "\n\rBoard %d RUNNING", i + 1);
-   //       sendSerial(stemp);
-   //   //}
-   //}
-   // Invert the bits because 0 == enabled on the SPI write
-   //boardsEnabled = ~boardsEnabled;
-   
    // Fire in the hole!
    wr_out_code = setBoardEnables(reg);
    
    sprintf(strbuf, "\r\nConverter started");
-   sendSerial(strbuf);
-
-   //setupRunVoltages();
-   //currentRegister = reg;
-   //pulser.attach_us(&pulserInt, period);    
+   sendSerial(strbuf);  
 }   
 
 /*******************************************************************************
@@ -174,9 +114,7 @@
 *******************************************************************************/
 void stopConverter(void)
 {
-   //pulser.detach();
    wr_out_code = setBoardEnables(ALLOFF);
-   //setBoardEnables((unsigned int *)alloff);
    running = FALSE;
    sprintf(strbuf, "\r\nConverter stopped");
    sendSerial(strbuf);
@@ -186,10 +124,6 @@
 updateControls
 *******************************************************************************/
 void updateControls(unsigned short ref){
-    //getLUTcode(i12);
-    //getLUTcode(my12);
-    
-    ref = ref/ADC_RESULT_SCALE_FACTOR;
 
     unsigned int cBuf = getLUT_thermCode(ref);
     wr_out_code = setBoardEnables(cBuf);
@@ -199,8 +133,7 @@
 }
 
 void XupdateControls(unsigned short ref){
-    //getLUTcode(i12);
-    //getLUTcode(my12);
+
     sprintf(strbuf, "refr=%d\r\n", ref);
     sendSerial(strbuf);