Browse Source

Kompiliert nun auch für PC. Allerdings noch nicht vollständig getesetet!

Rind 3 years ago
parent
commit
bd796b728a
4 changed files with 10 additions and 6 deletions
  1. 1 2
      README.md
  2. 1 1
      gfamininet.pro
  3. 6 3
      src/gfabootlmast.c
  4. 2 0
      src/gfaserial.c

+ 1 - 2
README.md

@@ -1,12 +1,11 @@
 ## libgfamininet
 ## libgfamininet
 
 
 Mininet-Master-Implementation. *Enthält außerdem einen Bootloader-Master (zur Kommunikation mit Tiva-Bootloader / App), der direkt auf dem Mininet-Master aufsetzt*.  
 Mininet-Master-Implementation. *Enthält außerdem einen Bootloader-Master (zur Kommunikation mit Tiva-Bootloader / App), der direkt auf dem Mininet-Master aufsetzt*.  
-Läuft momentan **nur auf Sitara, nicht auf PC**!
 
 
 ---
 ---
 
 
 ***Version:***  
 ***Version:***  
-libgfamininet.so.1.0.0  
+libgfamininet.so.1.1.0  
 
 
 ***SO-Name:***  
 ***SO-Name:***  
 libgfamininet.so.1
 libgfamininet.so.1

+ 1 - 1
gfamininet.pro

@@ -1,5 +1,5 @@
 TEMPLATE = lib
 TEMPLATE = lib
-VERSION = 1.0
+VERSION = 1.1
 CONFIG -= qt app_bundle
 CONFIG -= qt app_bundle
 CONFIG += c++11 shared thread
 CONFIG += c++11 shared thread
 
 

+ 6 - 3
src/gfabootlmast.c

@@ -226,7 +226,7 @@ int GfaBlmBUCmdReset(HGFABLM hBlm, uint8_t nNodeAddr, uint32_t nInitialBaudrate)
 			}
 			}
 
 
 			if(	(ack[0] == 0) &&
 			if(	(ack[0] == 0) &&
-				(ack[1] == COMMAND_ACK))
+                ((uint8_t)ack[1] == COMMAND_ACK))
 			{
 			{
 #if 0
 #if 0
 				do
 				do
@@ -318,7 +318,7 @@ int GfaBlmBUCmdPing(HGFABLM hBlm, uint8_t nNodeAddr)
 
 
 			if(ack[0] == 0)
 			if(ack[0] == 0)
 			{
 			{
-                return (ack[1] == COMMAND_ACK) ? 0 : -1;
+                return ((uint8_t)ack[1] == COMMAND_ACK) ? 0 : -1;
 			}
 			}
 			else
 			else
 			{
 			{
@@ -378,7 +378,7 @@ int GfaBlmBUCmdGetStatus(HGFABLM hBlm, uint8_t nNodeAddr, uint8_t *pbStatus)
 
 
 			if(ack[0] == 0)
 			if(ack[0] == 0)
 			{
 			{
-				if(ack[1] == COMMAND_ACK)
+                if((uint8_t)ack[1] == COMMAND_ACK)
 				{
 				{
 					if((nRet = GfaBlmBUCmdPollData(hBlm, nNodeAddr, stat, 3, 500)) != 3)
 					if((nRet = GfaBlmBUCmdPollData(hBlm, nNodeAddr, stat, 3, 500)) != 3)
 						return -1;
 						return -1;
@@ -1168,10 +1168,13 @@ int GfaBlmGetImgInfo(HGFABLM hBlm, uint8_t nNodeAddr, uint32_t nDumpAddr, bool b
 
 
 							pii->nImgLength	= aih.nImgLength;
 							pii->nImgLength	= aih.nImgLength;
 							pii->nImgCRC32	= aih.nImgCRC32;
 							pii->nImgCRC32	= aih.nImgCRC32;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpointer-to-int-cast"
 							if((nRet = GfaBlmBootloaderDump(hBlm, nNodeAddr, (uint32_t)aih.app.pszImgMaterialNum, GFA_APP_MAX_IMG_MATERIAL_NUM_LENGTH / sizeof(uint32_t), pii->szImgMaterialNum, GFA_APP_MAX_IMG_MATERIAL_NUM_LENGTH)) != 0)
 							if((nRet = GfaBlmBootloaderDump(hBlm, nNodeAddr, (uint32_t)aih.app.pszImgMaterialNum, GFA_APP_MAX_IMG_MATERIAL_NUM_LENGTH / sizeof(uint32_t), pii->szImgMaterialNum, GFA_APP_MAX_IMG_MATERIAL_NUM_LENGTH)) != 0)
 								return -1;
 								return -1;
 							if((nRet = GfaBlmBootloaderDump(hBlm, nNodeAddr, (uint32_t)aih.app.pszImgNameBuild, GFA_APP_MAX_IMG_NAME_BUILD_LENGTH / sizeof(uint32_t), pii->szImgNameBuild, GFA_APP_MAX_IMG_NAME_BUILD_LENGTH)) != 0)
 							if((nRet = GfaBlmBootloaderDump(hBlm, nNodeAddr, (uint32_t)aih.app.pszImgNameBuild, GFA_APP_MAX_IMG_NAME_BUILD_LENGTH / sizeof(uint32_t), pii->szImgNameBuild, GFA_APP_MAX_IMG_NAME_BUILD_LENGTH)) != 0)
 								return -1;
 								return -1;
+#pragma GCC diagnostic pop
 							pii->szImgMaterialNum[GFA_APP_MAX_IMG_MATERIAL_NUM_LENGTH - 1] = '\0';
 							pii->szImgMaterialNum[GFA_APP_MAX_IMG_MATERIAL_NUM_LENGTH - 1] = '\0';
 							pii->szImgNameBuild[GFA_APP_MAX_IMG_NAME_BUILD_LENGTH - 1] = '\0';
 							pii->szImgNameBuild[GFA_APP_MAX_IMG_NAME_BUILD_LENGTH - 1] = '\0';
 							return 0;
 							return 0;

+ 2 - 0
src/gfaserial.c

@@ -221,7 +221,9 @@ static int _SetRS485(LPGFA_SERIAL_DEVICE psd, bool bSet)
 			rs485.flags |= SER_RS485_RX_DURING_TX;
 			rs485.flags |= SER_RS485_RX_DURING_TX;
 		rs485.delay_rts_after_send		= 0;
 		rs485.delay_rts_after_send		= 0;
 		rs485.delay_rts_before_send		= 0;
 		rs485.delay_rts_before_send		= 0;
+#ifdef _TARGET_BUILD
         rs485.udelay_before_enable_tx	= 10;
         rs485.udelay_before_enable_tx	= 10;
+#endif	//	_TARGET_BUILD
         psd->bRS485Set = true;
         psd->bRS485Set = true;
 	}
 	}
 	else
 	else