Fix line mangling on merge

Force gcc to ignore unused-but-set-parameter

Fix line misplacement by merge

Cast string data to uint8_t pointer

Fix line mangling on merge

Fix line mangling on merge

Fix line mangling on merge

Author: toxuin

cpp_utils/BLECharacteristicMap.cpp

@@ -81,12 +81,9 @@ BLECharacteristic* BLECharacteristicMap::getNext() {
  * @param [in] gatts_if
  * @param [in] param
  */
-void BLECharacteristicMap::handleGATTServerEvent(
-		esp_gatts_cb_event_t      event,
-		esp_gatt_if_t             gatts_if,
-		esp_ble_gatts_cb_param_t* param) {
+void BLECharacteristicMap::handleGATTServerEvent(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t* param) {
 	// Invoke the handler for every Service we have.
-	for (auto &myPair : m_uuidMap) {
+	for (auto& myPair : m_uuidMap) {
 		myPair.first->handleGATTServerEvent(event, gatts_if, param);
 	}
 } // handleGATTServerEvent
@@ -98,8 +95,7 @@ void BLECharacteristicMap::handleGATTServerEvent(
  * @param [in] characteristic The characteristic to cache.
  * @return N/A.
  */
-void BLECharacteristicMap::setByHandle(uint16_t handle,
-		BLECharacteristic* characteristic) {
+void BLECharacteristicMap::setByHandle(uint16_t handle, BLECharacteristic* characteristic) {
 	m_handleMap.insert(std::pair<uint16_t, BLECharacteristic*>(handle, characteristic));
 } // setByHandle
 
@@ -110,9 +106,7 @@ void BLECharacteristicMap::setByHandle(uint16_t handle,
  * @param [in] characteristic The characteristic to cache.
  * @return N/A.
  */
-void BLECharacteristicMap::setByUUID(
-		BLEUUID            uuid) {
-		BLECharacteristic* pCharacteristic,
+void BLECharacteristicMap::setByUUID(BLECharacteristic* pCharacteristic, BLEUUID uuid) {
 	m_uuidMap.insert(std::pair<BLECharacteristic*, std::string>(pCharacteristic, uuid.toString()));
 } // setByUUID
 

cpp_utils/BLERemoteDescriptor.cpp

@@ -161,7 +161,7 @@ void BLERemoteDescriptor::writeValue(uint8_t* data, size_t length, bool response
  * @param [in] response True if we expect a response.
  */
 void BLERemoteDescriptor::writeValue(std::string newValue, bool response) {
-	writeValue(newValue.data(), newValue.length(), response);
+	writeValue((uint8_t*) newValue.data(), newValue.length(), response);
 } // writeValue
 
 

cpp_utils/BLERemoteService.cpp

@@ -233,6 +233,7 @@ std::map<std::string, BLERemoteCharacteristic*>* BLERemoteService::getCharacteri
  * @brief This function is designed to get characteristics map when we have multiple characteristics with the same UUID
  */
 void BLERemoteService::getCharacteristics(std::map<uint16_t, BLERemoteCharacteristic*>* pCharacteristicMap) {
+#pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
 	pCharacteristicMap = &m_characteristicMapByHandle;
 }  // Get the characteristics map.
 

cpp_utils/MFRC522.cpp

@@ -146,7 +146,7 @@ void MFRC522::PCD_ClearRegisterBitMask(PCD_Register reg, byte mask) {
  * @param result Out: Pointer to result buffer. Result is written to result[0..1], low byte first.
  * @return STATUS_OK on success, STATUS_??? otherwise.
  */
-MFRC522::StatusCode MFRC522::PCD_CalculateCRC(byte *data, byte length, byte *result) {
+MFRC522::StatusCode MFRC522::PCD_CalculateCRC(byte* data, byte length, byte* result) {
 	PCD_WriteRegister(CommandReg, PCD_Idle);		// Stop any active command.
 	PCD_WriteRegister(DivIrqReg, 0x04);				// Clear the CRCIRq interrupt request bit
 	PCD_WriteRegister(FIFOLevelReg, 0x80);			// FlushBuffer = 1, FIFO initialization
@@ -160,7 +160,6 @@ MFRC522::StatusCode MFRC522::PCD_CalculateCRC(byte *data, byte length, byte *res
 	for (uint16_t i = 5000; i > 0; i--) {
 		// DivIrqReg[7..0] bits are: Set2 reserved reserved MfinActIRq reserved CRCIRq reserved reserved
 		byte n = PCD_ReadRegister(DivIrqReg);
-		if (n & 0x04) {									// CRCIRq bit set - calculation done
 		if (n & 0x04) {								// CRCIRq bit set - calculation done
 			PCD_WriteRegister(CommandReg, PCD_Idle);	// Stop calculating CRC for new content in the FIFO.
 			// Transfer the result from the registers to the result buffer
@@ -403,8 +402,8 @@ bool MFRC522::PCD_PerformSelfTest() {
  * @param checkCRC In: True => The last two bytes of the response is assumed to be a CRC_A that must be validated.
  * @return STATUS_OK on success, STATUS_??? otherwise.
  */
-	byte waitIRq = 0x30;		// RxIRq and IdleIRq
 MFRC522::StatusCode MFRC522::PCD_TransceiveData(byte* sendData, byte sendLen, byte* backData, byte* backLen, byte* validBits, byte rxAlign, bool checkCRC) {
+	byte waitIRq = 0x30;		// RxIRq and IdleIRq
 	return PCD_CommunicateWithPICC(PCD_Transceive, waitIRq, sendData, sendLen, backData, backLen, validBits, rxAlign, checkCRC);
 } // End PCD_TransceiveData()
 
@@ -426,8 +425,8 @@ MFRC522::StatusCode MFRC522::PCD_TransceiveData(byte* sendData, byte sendLen, by
  */
 MFRC522::StatusCode MFRC522::PCD_CommunicateWithPICC(byte command, byte waitIRq, byte* sendData, byte sendLen, byte* backData, byte* backLen, byte* validBits, byte rxAlign, bool checkCRC) {
 	// Prepare values for BitFramingReg
-	byte bitFraming = (rxAlign << 4) + txLastBits;		// RxAlign = BitFramingReg[6..4]. TxLastBits = BitFramingReg[2..0]
 	byte txLastBits = validBits ? *validBits : (byte) 0;
+	byte bitFraming = (rxAlign << 4) + txLastBits;		// RxAlign = BitFramingReg[6..4]. TxLastBits = BitFramingReg[2..0]
 
 	PCD_WriteRegister(CommandReg, PCD_Idle);			// Stop any active command.
 	PCD_WriteRegister(ComIrqReg, 0x7F);					// Clear all seven interrupt request bits
@@ -808,8 +807,8 @@ MFRC522::StatusCode MFRC522::PICC_HaltA() {
  * @param uid Pointer to Uid struct. The first 4 bytes of the UID is used.
  * @return STATUS_OK on success, STATUS_??? otherwise. Probably STATUS_TIMEOUT if you supply the wrong key.
  */
-	byte waitIRq = 0x10;		// IdleIRq
 MFRC522::StatusCode MFRC522::PCD_Authenticate(byte command, byte blockAddr, MIFARE_Key* key, Uid* uid) {
+	byte waitIRq = 0x10;		// IdleIRq
 
 	// Build command buffer
 	byte sendData[12];

cpp_utils/SockServ.cpp

@@ -30,7 +30,6 @@ static const char* LOG_TAG = "SockServ";
  */
 SockServ::SockServ(uint16_t port) : SockServ() {
 	this->m_port = port;
-
 } // SockServ
 
 
@@ -62,20 +61,21 @@ SockServ::~SockServ() {
  */
 /* static */ void SockServ::acceptTask(void* data) {
 	SockServ* pSockServ = (SockServ*) data;
-	try {
-		while (true) {
+	while (true) {
+		try {
 			ESP_LOGD(LOG_TAG, "Waiting on accept");
 			Socket tempSock = pSockServ->m_serverSocket.accept();
 			if (!tempSock.isValid()) continue;
 
 			pSockServ->m_clientSet.insert(tempSock);
 			xQueueSendToBack(pSockServ->m_acceptQueue, &tempSock, portMAX_DELAY);
 			pSockServ->m_clientSemaphore.give();
+		} catch (std::exception e) {
+			ESP_LOGD(LOG_TAG, "acceptTask ending");
+			pSockServ->m_clientSemaphore.give();   // Wake up any waiting clients.
+			FreeRTOS::deleteTask();
+			break;
 		}
-	} catch(std::exception e) {
-		ESP_LOGD(LOG_TAG, "acceptTask ending");
-		pSockServ->m_clientSemaphore.give();   // Wake up any waiting clients.
-		FreeRTOS::deleteTask();
 	}
 } // acceptTask
 
@@ -114,12 +114,12 @@ bool SockServ::getSSL() {
  * @return The amount of data returned or 0 if there was an error.
  */
 size_t SockServ::receiveData(Socket s, void* pData, size_t maxData) {
-	int rc = s.receive((uint8_t*) pData, maxData);
+	size_t rc = s.receive((uint8_t*) pData, maxData);
 	if (rc == -1) {
 		ESP_LOGE(LOG_TAG, "recv(): %s", strerror(errno));
 		return 0;
 	}
-	return (size_t) rc;
+	return rc;
 } // receiveData
 
 
@@ -190,19 +190,19 @@ Socket SockServ::waitForData(std::set<Socket>& socketSet) {
 	fd_set readSet;
 	int maxFd = -1;
 
-	for (	auto it = socketSet.begin(); it != socketSet.end(); ++it) {
+	for (auto it = socketSet.begin(); it != socketSet.end(); ++it) {
 		FD_SET(it->getFD(), &readSet);
 		if (it->getFD() > maxFd) {
 			maxFd = it->getFD();
 		}
 	} // End for
 
 	int rc = ::select(
-		&readSet, // Set of read sockets
-		nullptr,  // Set of write sockets
-		nullptr,  // Set of exception sockets
-		nullptr   // Timeout
-		maxFd + 1,  // Number of sockets to scan
+			maxFd+1,  // Number of sockets to scan
+			&readSet, // Set of read sockets
+			nullptr,  // Set of write sockets
+			nullptr,  // Set of exception sockets
+			nullptr   // Timeout
 	);
 	if (rc == -1) {
 		ESP_LOGE(LOG_TAG, "Error with select");

cpp_utils/System.cpp

@@ -47,6 +47,9 @@ typedef volatile struct {
 	} pin_ctrl;
 
 	// The 36 exposed pads.
+	io_mux_reg_t pad_gpio36;     // GPIO36
+	io_mux_reg_t pad_gpio37;     // GPIO37
+	io_mux_reg_t pad_gpio38;     // GPIO38
 	io_mux_reg_t pad_gpio39;     // GPIO39
 	io_mux_reg_t pad_gpio34;     // GPIO34
 	io_mux_reg_t pad_gpio35;     // GPIO35
@@ -64,7 +67,6 @@ typedef volatile struct {
 	io_mux_reg_t pad_gpio4;      // GPIO4
 	io_mux_reg_t pad_gpio16;     // GPIO16
 	io_mux_reg_t pad_gpio17;     // GPIO17
-	io_mux_reg_t pad_gpio37;	 // GPIO37
 	io_mux_reg_t pad_sd_data2;   // GPIO9
 	io_mux_reg_t pad_sd_data3;   // GPIO10
 	io_mux_reg_t pad_sd_cmd;     // GPIO11
@@ -406,16 +408,16 @@ const static char* outSignalStrings[] = {
 	for (uint8_t i = 0; i < numPins; i++) {
 		const char *signal;
 		if (GPIO.func_out_sel_cfg[i].func_sel == 256) {
-			signal = (char *)"[GPIO]";
+			signal = (char*) "[GPIO]";
 		} else if (GPIO.func_out_sel_cfg[i].func_sel == 257) {
-			signal = (char *)"N/A";
+			signal = (char*) "N/A";
 		} else {
 			signal = outSignalStrings[GPIO.func_out_sel_cfg[i].func_sel];
 		}
 		printf("%2d %4d %s\n", i, GPIO.func_out_sel_cfg[i].func_sel, signal);
 		const io_mux_reg_t* io_mux = gpioToIoMux(i);
 		if (GPIO.func_out_sel_cfg[i].func_sel == 256 && io_mux != nullptr) {
-			printf("0x%x - function: %d, ie: %d\n", (uint32_t)io_mux, io_mux->mcu_sel + 1, io_mux->func_ie);
+			printf("0x%x - function: %d, ie: %d\n", (uint32_t) io_mux, io_mux->mcu_sel + 1, io_mux->func_ie);
 		}
 	}
 

cpp_utils/WS2812.cpp

@@ -158,7 +158,7 @@ void WS2812::show() {
 				(getChannelValueByType(this->colorOrder[2], this->pixels[i]));
 
 		ESP_LOGD(LOG_TAG, "Pixel value: %x", currentPixel);
-		for (uint8_t j = 23; j > =0; j--) {
+		for (uint8_t j = 23; j >= 0; j--) {
 			// We have 24 bits of data representing the red, green amd blue channels. The value of the
 			// 24 bits to output is in the variable current_pixel.  We now need to stream this value
 			// through RMT in most significant bit first.  To do this, we iterate through each of the 24