Diff: main.cpp

Revision:

19:5a6bf2a0ecf6

Parent:

18:18074899e25b

Child:

20:048516dc1015

--- a/main.cpp	Sun Mar 25 08:47:18 2018 +0000
+++ b/main.cpp	Mon Mar 26 12:12:37 2018 +0000
@@ -91,11 +91,18 @@
             *(__IO uint32_t *) Dac_Reg = (uint16_t)(4095/2);
             
             // generate delay between pulses
-            led.write(0);
             // delay post pulse // sets the pulse rate
-            wait(1.0f/(2.0f*PULSE_RATE));
-            led.write(1);
-            wait(1.0f/(2.0f*PULSE_RATE));
+            float waitTime = (1.0f/(2.0f*PULSE_RATE) - (((float)NUM_SAMPLES)/1000000.0f));
+            if (waitTime > 0){
+                led.write(0);
+                wait(waitTime);
+                led.write(1);
+                wait(1.0f/(2.0f*PULSE_RATE));
+            }else{
+                 wait(0.5);
+                 printf("!!! Error Wait time is negative %f !!!\r\n", waitTime);
+                 wait(0.5);
+            }
         } // end button press
         led.write(0);
     }// end while(True)
@@ -112,13 +119,13 @@
     // DAC Initialization
     hdac1.Instance = DAC;
     if(HAL_DAC_Init(&hdac1) != HAL_OK) {
-        printf("!!! Error in DAC initialization !!!\n");
+        printf("!!! Error in DAC initialization !!!\r\n");
     }
 
     // DAC channel OUT1 config
     sConfig.DAC_Trigger = DAC_TRIGGER_NONE;
     sConfig.DAC_OutputBuffer = DAC_OUTPUTBUFFER_ENABLE;
     if (HAL_DAC_ConfigChannel(&hdac1, &sConfig, DAC_CHANNEL_1) != HAL_OK) {
-        printf("!!! Error in DAC channel initialization !!!\n");
+        printf("!!! Error in DAC channel initialization !!!\r\n");
     }
 }