Digital input for MF624 implemented.

[mf624-simulink.git] / sfAnalogOutput.c

diff --git a/sfAnalogOutput.c b/sfAnalogOutput.c
index a3fa03db6847084450f9198debbc3aad11fc4383..d6d89a861405c76932157e423d3dcadca2442186 100644 (file)
--- a/sfAnalogOutput.c
+++ b/sfAnalogOutput.c
@@ -18,12 +18,14 @@
 #define S_FUNCTION_NAME  sfAnalogOutput
 #define S_FUNCTION_LEVEL 2
 
+#define CHNL_PRM(S)     (mxGetScalar(ssGetSFcnParam(S, 0)))
+
 /*
  * Need to include simstruc.h for the definition of the SimStruct and
  * its associated macro definitions.
  */
 #include "simstruc.h"
-#include "mf624.h"
+#include "mf624_SIMULINK.h"
 
 /* Error handling
  * --------------
@@ -62,7 +64,7 @@ static void mdlInitializeSizes(SimStruct *S)
 {
     /* See sfuntmpl_doc.c for more details on the macros below */
 
-    ssSetNumSFcnParams(S, 0);  /* Number of expected parameters */
+    ssSetNumSFcnParams(S, 1);  /* Number of expected parameters */
     if (ssGetNumSFcnParams(S) != ssGetSFcnParamsCount(S)) {
         /* Return if number of expected != number of actual parameters */
         return;
@@ -87,7 +89,7 @@ static void mdlInitializeSizes(SimStruct *S)
     ssSetNumSampleTimes(S, 1);
     ssSetNumRWork(S, 0);
     ssSetNumIWork(S, 0);
-    ssSetNumPWork(S, 1);
+    ssSetNumPWork(S, 0);
     ssSetNumModes(S, 0);
     ssSetNumNonsampledZCs(S, 0);
 
@@ -107,7 +109,7 @@ static void mdlInitializeSizes(SimStruct *S)
  */
 static void mdlInitializeSampleTimes(SimStruct *S)
 {
-    ssSetSampleTime(S, 0, CONTINUOUS_SAMPLE_TIME);
+    ssSetSampleTime(S, 0, -1);
     ssSetOffsetTime(S, 0, 0.0);
 
 }
@@ -144,31 +146,10 @@ static void mdlInitializeSampleTimes(SimStruct *S)
    */
   static void mdlStart(SimStruct *S)
   {
-    //TODO: get pointer to mfst state structure and store it in pwork
-    #define TEST
-    #if defined(TEST)
-    #define BUFF_SMALL         32
-    mf624_state_t* mfst = malloc(sizeof(mf624_state_t));
-    char buff[BUFF_SMALL];
-       memset(buff, '\0', BUFF_SMALL);
-    mfst->uio_dev = "uio0";
-
-       strncat(buff, "/dev/", 5);
-       strncat(buff, mfst->uio_dev, sizeof(buff) - 6);
-
-       mfst->device_fd = open_device(buff);
-       if (mfst->device_fd < 0) {
-        ssSetErrorStatus(S,"open failed");
-        return;
-       }
-       if (mmap_regions(mfst) < 0) {
-        ssSetErrorStatus(S,"mmap_regions failed");
-               return;
-       }
-
+        if (mf624_init(NULL) != 0)
+           return;
        DAC_enable(mfst);
-    ssSetPWorkValue(S, 0, mfst);
-    #endif
+    //ssSetPWorkValue(S, 0, mfst);
   }
 #endif /*  MDL_START */
 
@@ -182,8 +163,12 @@ static void mdlInitializeSampleTimes(SimStruct *S)
 static void mdlOutputs(SimStruct *S, int_T tid)
 {
     const real_T *u = (const real_T*) ssGetInputPortSignal(S,0);
-    mf624_state_t* mfst = ssGetPWorkValue(S,0);
+    //mf624_state_t* mfst = ssGetPWorkValue(S,0);
     int out;
+
+    if (mf624_check(S) != 0)
+           return;
+
     if(u[0] > 9.9988){
         out = 0x3FFF;
     }
@@ -193,7 +178,7 @@ static void mdlOutputs(SimStruct *S, int_T tid)
     else {
         out = (int) ((u[0] + 10) * 8192 / 10 + 0.5);
     }
-    DAC_write(mfst, DA0, out);
+    mf624_write16(out, MFST2REG(mfst, 2, dac_channel2reg[(int)CHNL_PRM(S)-1]));
 }
 
 
@@ -236,10 +221,16 @@ static void mdlOutputs(SimStruct *S, int_T tid)
  */
 static void mdlTerminate(SimStruct *S)
 {
-    #if defined(TEST)
-    free(ssGetPWorkValue(S,0));
-    #endif
-    
+    //mf624_state_t* mfst = ssGetPWorkValue(S,0);
+    if (mf624_check(NULL) != 0)
+           return;
+
+    /*At the end of simulation disable D/A outputs*/
+    mf624_write32((mf624_read32(MFST2REG(mfst, 0, GPIOC_reg))
+                  & ~GPIOC_DACEN_mask), // disable output,
+                 MFST2REG(mfst, 0, GPIOC_reg));
+
+    mf624_done();
 }