From 71a69d41eaaeec1fd115bc306724c57c421fc668 Mon Sep 17 00:00:00 2001
From: Avi Levkovich <avi@twine-s.com>
Date: Mon, 19 Oct 2020 14:18:28 +0300
Subject: merge

---
 Software/Embedded_SW/Embedded/.cproject | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Software/Embedded_SW/Embedded')

diff --git a/Software/Embedded_SW/Embedded/.cproject b/Software/Embedded_SW/Embedded/.cproject
index 526c6ee8c..e2f89b83b 100644
--- a/Software/Embedded_SW/Embedded/.cproject
+++ b/Software/Embedded_SW/Embedded/.cproject
@@ -170,7 +170,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="Modules/Stubs_Handler/temperature_sensor.c|Modules/Stubs_Handler/Stub_SteperMotor.c|Modules/Stubs_Handler/User_Leds.c|Modules/Stubs_Handler/Stub_HW_Version.c|Modules/Stubs_Handler/Stub_L6470.c|Drivers/I2C_Communication/ektm4c129_i2c_master_udma_fifo.c|Drivers/I2C_Communication/Thermo_K|Drivers/On_Chip_Flash|Drivers/I2C_Communication/RFID_NFC/Test_RFID.c|Drivers/I2C_Communication/I2C_FIFO.c|Drivers/I2C_Communication/test_fifo_dma.c|Drivers/Uart_Comm/WHS_Controller_Comm/Modbus|Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/tcp|Drivers/I2C_Communication/RFID_NFC/NFC_I2C|Drivers/I2C_Communication/RFID_NFC/PN7150|Drivers/I2C_Communication/Head_Card/ADC/Head_ADC_old.c|src|EmbParam.cfg" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="Common/CheckSum|Common/Software_CRC|Modules/Stubs_Handler/temperature_sensor.c|Modules/Stubs_Handler/Stub_SteperMotor.c|Modules/Stubs_Handler/User_Leds.c|Modules/Stubs_Handler/Stub_HW_Version.c|Modules/Stubs_Handler/Stub_L6470.c|Drivers/I2C_Communication/ektm4c129_i2c_master_udma_fifo.c|Drivers/I2C_Communication/Thermo_K|Drivers/On_Chip_Flash|Drivers/I2C_Communication/RFID_NFC/Test_RFID.c|Drivers/I2C_Communication/I2C_FIFO.c|Drivers/I2C_Communication/test_fifo_dma.c|Drivers/Uart_Comm/WHS_Controller_Comm/Modbus|Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/tcp|Drivers/I2C_Communication/RFID_NFC/NFC_I2C|Drivers/I2C_Communication/RFID_NFC/PN7150|Drivers/I2C_Communication/Head_Card/ADC/Head_ADC_old.c|src|EmbParam.cfg" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
-- 
cgit v1.3.1