Diff: max86150.cpp

Revision:

10:28b8729cf5dc

Parent:

9:171171516ebd

Child:

14:ee2175578993

--- a/max86150.cpp	Mon Mar 02 23:14:08 2020 +0000
+++ b/max86150.cpp	Sat Mar 07 03:19:35 2020 +0000
@@ -258,7 +258,7 @@
 }
 
 void MAX86150::setPulseAmplitudeProximity(uint8_t amplitude) {
-  writeRegister8(_i2caddr, MAX86150_LED_PROX_AMP, amplitude);
+  writeRegister8(_i2caddr, MAX86150_LED_PILOT_PA, amplitude);
 }
 
 void MAX86150::setProximityThreshold(uint8_t threshMSB)
@@ -366,14 +366,14 @@
 {
         activeDevices=3;
         writeRegister8(_i2caddr,MAX86150_SYSCONTROL,0x01); //it as 0x01
-        wait_ms(2000);
+        wait_ms(2);
         //pc.printf("Just set SYSCONTOL REG: %x\n", readRegister8(_i2caddr,MAX86150_SYSCONTROL));
         //delay(100);
         //wait_ms(100);
         
          
          // FIFO Config
-         writeRegister8(_i2caddr,MAX86150_FIFOCONFIG,0b11111111);
+         writeRegister8(_i2caddr,MAX86150_FIFOCONFIG,0b01111111); //first bit is don't care
         //FIFO CONTROL
         writeRegister8(_i2caddr,MAX86150_FIFOCONTROL1,(0b00100001));
         writeRegister8(_i2caddr,MAX86150_FIFOCONTROL2,(0b00001001));
@@ -383,10 +383,17 @@
         //pc.printf("Set FIFO_CTRL1: %x\n", readRegister8(_i2caddr, MAX86150_FIFOCONTROL1));
         //pc.printf("Set FIFO_CTRL2: %x\n", readRegister8(_i2caddr, MAX86150_FIFOCONTROL2));
         // PPG CONFIG
-        //writeRegister8(_i2caddr,MAX86150_PPGCONFIG1,0b11010111);
+        writeRegister8(_i2caddr,MAX86150_PPGCONFIG1,0b11010110);
         //writeRegister8(_i2caddr,MAX86150_PPGCONFIG1,0b11100111);
-        //writeRegister8(_i2caddr,MAX86150_PPGCONFIG2, 0x01);
-        //writeRegister8(_i2caddr,MAX86150_LED_RANGE, 0x00 ); // PPG_ADC_RGE: 32768nA
+        writeRegister8(_i2caddr,MAX86150_PPGCONFIG2, 0x00);
+        writeRegister8(_i2caddr,MAX86150_LED_RANGE, 0b00000101 ); // PPG_ADC_RGE: 32768nA
+        writeRegister8(_i2caddr,0x12, 0xFF );
+        writeRegister8(_i2caddr,0x11, 0xFF );
+        //enablePROXINT();
+        //setProximityThreshold(0x05);
+        //setPulseAmplitudeProximity(0xFF);
+        setPulseAmplitudeRed(0xFF);
+        setPulseAmplitudeIR(0xFF);
         
         //pc.printf("Before setting, SYS CTRL REG: %x\n",readRegister8(_i2caddr,MAX86150_SYSCONTROL));
         //wait_ms(2000);
@@ -394,18 +401,21 @@
         //writeRegister8(_i2caddr,MAX86150_SYSCONTROL,0x04);//start FIFO
         //wait_ms(1000);
         //pc.printf("Just set FIFO, SYS CTRL REG: %x\n",readRegister8(_i2caddr,MAX86150_SYSCONTROL));
+        
+        
+        
         // ECG CONFIG
         writeRegister8(_i2caddr,MAX86150_ECG_CONFIG1,0b00000011);
         writeRegister8(_i2caddr,MAX86150_ECG_CONFIG3,0b00001111);
 
-        setPulseAmplitudeRed(0x00);
-        setPulseAmplitudeIR(0x00);
+        //setPulseAmplitudeRed(0x00);
+        //setPulseAmplitudeIR(0x00);
         
         //Enable Interrupt
-         writeRegister8(_i2caddr,MAX86150_INTENABLE1,0b10000000);
+         writeRegister8(_i2caddr,MAX86150_INTENABLE1,0b00000000);
          writeRegister8(_i2caddr,MAX86150_INTENABLE2,0b00000100);
-        clearFIFO(); //Reset the FIFO before we begin checking the sensor
-        writeRegister8(_i2caddr,MAX86150_SYSCONTROL,0x04);
+        //clearFIFO(); //Reset the FIFO before we begin checking the sensor
+        //writeRegister8(_i2caddr,MAX86150_SYSCONTROL,0x04);
         //wait_ms(1);
         pc.printf("Cleared FIFO, SYS CTRL REG: %x\n",readRegister8(_i2caddr,MAX86150_SYSCONTROL));
 }