Diff: main.cpp

Revision:

2:b489f23d9d2c

Parent:

1:8b6ad9d92745

Child:

3:59a57634f1fa

--- a/main.cpp	Sun Jan 31 16:13:08 2016 +0000
+++ b/main.cpp	Wed Feb 03 21:44:06 2016 +0000
@@ -45,8 +45,8 @@
 Serial serial(USBTX,USBRX);
 FastPWM mclk(PA_15);
 FastPWM sq(PB_7);
+SPI DDS(PC_12, NC, PC_10);
 SPI DAC(PC_12, NC, PC_10);
-SPI DDS(PC_12, NC, PC_10);
 DigitalOut SYNC1(PC_11);
 DigitalOut SYNC2(PD_2);
 
@@ -77,9 +77,7 @@
         ddsstop;
         dacstop;
         DDS.format(16,2);
- //       DAC.format(16,1);
- //       DDS.frequency(1000);
- ddsstart;  
+        ddsstart;  
   DDS.write(0x21C2); ddsstart; DDS.write(0x20C2);
    ddsstop;
     /*    ddsstart;
@@ -105,9 +103,12 @@
     int amplitude () {
         uint16_t ampt;
         uint16_t ampReg;
-        ampt = uint16_t(819.2*amp);
+        ampt = uint16_t(819.2*(5-amp));
         ampReg = uint16_t(ampt & 0xFFF);
+        DAC.format(16,1);
+        dacstart;
         DAC.write(ampReg*4);
+        dacstop;
         serial.printf("amp %X \r\n", ampReg*4);
         return 0;
     }
@@ -148,7 +149,7 @@
 
     int square() {
         freqsq();
-        ddsstart; DDS.write(0x210A);
+        ddsstart;DDS.write(0x210A);
         ddsstart;DDS.write(0x4000);
         ddsstart;DDS.write(0x4000);
         ddsstart;DDS.write(0x8000);