Diff: main.cpp

Revision:

6:0ec9dd0e8eb0

Parent:

5:df9f75bee8ac

Child:

7:5b7f7ec9efe0

diff -r df9f75bee8ac -r 0ec9dd0e8eb0 main.cpp
--- a/main.cpp	Sat Aug 11 22:03:51 2018 +0000
+++ b/main.cpp	Sun Aug 12 00:02:14 2018 +0000
@@ -42,8 +42,13 @@
 SPI spi(P5_1, P5_2, P5_0); /* mosi, miso, sclk */
 //DigitalOut cs(P3_0);
 DigitalOut cs(P5_3);
-PinName interrupt_pin = P3_2;
-//PinName interrupt_pin = P5_4;
+//PinName interrupt_pin = P3_3;
+//PinnName interrupt_pin = P5_7;
+//PinName interrupt_pin = P5_5;
+//PinName interrupt_pin = P3_6;
+//PinName interrupt_pin = P3_7;
+//PinName interrupt_pin = P3_2;
+PinName interrupt_pin = P5_4;
 // Virtual serial port over USB
 USBSerial microUSB; 
 
@@ -76,26 +81,26 @@
     printf("\r\n\rmax86140 authenication software\r\n");
     MAX8614X m(spi,cs,interrupt_pin);
     m.readRegister(MAX8614X::MAX8614X_PART_ID_REG, data, 1);
-    printf("device id should be 0x24, read val = %x\r\n", data[0]);
+    printf("device id should be 0x24, reg %02X = %02X\r\n", MAX8614X::MAX8614X_PART_ID_REG, data[0]);
 
     //● Enable SHA_DONE Interrupt
     m.writeRegister(MAX8614X::MAX8614X_INT_ENABLE2_REG, MAX8614X::MAX8614X_IE_SHA_DONE_EN);
 
     m.readRegister(MAX8614X::MAX8614X_INT_ENABLE2_REG, data, 1);
-    printf("enable sha done interrupt, read val = %d\r\n", data[0]);
+    printf("enable sha done interrupt, reg %02X = %02X\r\n", MAX8614X::MAX8614X_INT_ENABLE2_REG, data[0]);
 
 
     //● Enable SHA_EN bit.
     m.writeRegister(MAX8614X::MAX8614X_SHA_CFG_REG,MAX8614X::MAX8614X_SHACFG_SHA_EN);
 
     m.readRegister(MAX8614X::MAX8614X_SHA_CFG_REG, data, 1);
-    printf("enable sha cmd, read val = %d\r\n", data[0]);
+    printf("enable sha CFG,  reg %02X = %02X\r\n", MAX8614X::MAX8614X_SHA_CFG_REG, data[0]);
     
     //● Write 160-bit random challenge value to RAM using registers MEM_IDX and MEM_DATA.
     // Enable Memory Write, Select Bank 0, address 0x00 to 0xFF
     m.writeRegister(MAX8614X::MAX8614X_MEMORY_CONTROL_REG, MAX8614X::MAX8614X_MEMCNTRL_WR_EN_MASK | MAX8614X::MAX8614X_MEMCNTRL_BANK0_MASK);
        m.readRegister(MAX8614X::MAX8614X_MEMORY_CONTROL_REG, data, 1);
-    printf("MEM CNTRL REG should be 2, read val = %d\r\n", data[0]);
+    printf("MEM CNTRL REG should be 2,  reg %02X = = %02X\r\n", MAX8614X::MAX8614X_MEMORY_CONTROL_REG, data[0]);
  
     for (i = 0; i < CHALLENGE_SZ; i++) {
         m.writeRegister(MAX8614X::MAX8614X_MEMORY_INDEX_REG, i);
@@ -115,21 +120,21 @@
     m.writeRegister(MAX8614X::MAX8614X_SHA_CMD_REG,MAX8614X::MAX8614X_SHACMD_MAC_ROM_ID);
 
     m.readRegister(MAX8614X::MAX8614X_SHA_CMD_REG, data, 1);
-    printf("sha cmd reg should be 0x35 mac rom id, read val = %X\r\n", data[0]);
+    printf("sha cmd reg should be 0x35 mac rom id,  reg %02X = %02X\r\n", MAX8614X::MAX8614X_SHA_CMD_REG, data[0]);
         m.readRegister(MAX8614X::MAX8614X_INT_STATUS2_REG, data, 1);
-        printf("int status2, read val = %X\r\n", data[0]);
+        printf("int status2, reg %02X = %X\r\n", MAX8614X::MAX8614X_INT_STATUS2_REG, data[0]);
     //● Write 1 to SHA_START and 1 to SHA_EN bit.
     m.writeRegister(MAX8614X::MAX8614X_SHA_CFG_REG,MAX8614X::MAX8614X_SHACFG_SHA_EN | MAX8614X::MAX8614X_SHACFG_SHA_START);
     m.readRegister(MAX8614X::MAX8614X_SHA_CFG_REG, data, 1);
-    printf("sha CFG reg should be 0x3, read val = %X\r\n", data[0]);
+    printf("sha CFG reg should be 0x3,  reg %02X = %02X\r\n", MAX8614X::MAX8614X_SHA_CFG_REG, data[0]);
     
     //● Wait for SHA_DONE interrupt.
     m.clearShaComplete();
     data[0] = 0;
-//    while(!m.isShaComplete()) {
+//  while(!m.isShaComplete()) {
     while(!m.isShaComplete() && !data[0] ) {
         m.readRegister(MAX8614X::MAX8614X_INT_STATUS2_REG, data, 1);
-        printf("int status2, read val = %X\r\n", data[0]);
+        printf("int status2, reg %02X = %X\r\n", MAX8614X::MAX8614X_INT_STATUS2_REG, data[0]);
         
     }   
     // ● Read 256 MAC value from RAM using registers MEM_IDX and MEM_DATA.