Merge pull request #470 from openxc/sq-major-fix

refactor major code smells defined in sonarqube.
openxc · Jan 6, 2021 · 439c910 · 439c910
2 parents 953e027 + 7d7f1cd
commit 439c910
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 126 deletions.
diff --git a/src/platform/pic32/blueNRG.c b/src/platform/pic32/blueNRG.c
@@ -179,16 +179,22 @@ static int16_t SPI_Write(uint8_t* data1, uint8_t* data2, uint16_t Nb_bytes1, uin
   SPI_SendRecieve(STBTLE_SPICHANNEL, header_master, header_slave, 5);
 
   if(header_slave[0] != 0x02){
-    result = -1;
-    goto failed; // BlueNRG not awake.
+    result = -1; 
+    // Release CS line
+    SPI_CS_SetHigh(STBTLE_SPICHANNEL);
+
+    return result;// BlueNRG not awake.
   }
 
   rx_bytes = header_slave[1];
 
   if(rx_bytes < Nb_bytes1)
   {
     result = -2;
-    goto failed; // underflow      
+    // Release CS line
+    SPI_CS_SetHigh(STBTLE_SPICHANNEL);
+
+    return result;// underflow.      
   }
 
   SPI_SendRecieve(STBTLE_SPICHANNEL, data1, NULL, Nb_bytes1);