Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

3 files changed, 54 insertions, 6 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c
index 185d4ac66..b035ff97b 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c
@@ -69,6 +69,8 @@ float CalculateDispenserPressure (int DispenserId)
     //DispenserPressure[DispenserId] *=10000000;        //uBar;
     //DispenserPressure[DispenserId] *=145.0377;  //PSI;
 
+    DispenserPressure[DispenserId] *= 10; //MPascal -> Bar
+
     return(DispenserPressure[DispenserId]);
 }
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Cartridge.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Cartridge.c
index 581a27f1f..68b79edeb 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Cartridge.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Cartridge.c
@@ -12,7 +12,7 @@
 
 #include "Drivers/USB_Communication/USBCDCD.h"
 
-
+//#include "drivers/twine_graphicslib/graphics_adapter.h"
 
 #include "Stub_Status.h"
 
@@ -25,6 +25,20 @@ void Stub_CartridgeReadRequest(MessageContainer* requestContainer)
 
 	//request->cartridgeid
 
+    //writeLine("cartridge Request: ");
+
+    //writeFloat(request->cartridgeid);
+
+    /*
+      int i;
+      for( i=0;i<8;i++)
+      {
+            Read_MidTank_Pressure_Sensor(i);
+            SysCtlDelay(1);
+      }
+
+    */
+
     StubCartridgeReadResponse response =   STUB_CARTRIDGE_READ_RESPONSE__INIT;
 	
 	response.cartridgeid = request->cartridgeid;
@@ -43,8 +57,20 @@ void Stub_CartridgeReadRequest(MessageContainer* requestContainer)
 	response.has_cartridgeused = false;
 	
     status_response(status,&response.status, &response.statusword ,&response.has_statusword);
+/*
+    writeLine("Sending Response: ");
 
-
+    writeFloat(response.cartridgeid);
+    writeString(", ");
+    writeFloat(response.cartridgecolor);
+    writeString(", ");
+    writeFloat(response.cartridgeversion);
+    writeString(", ");
+    writeFloat(response.cartridgedata);
+    writeString(", ");
+    writeFloat(response.cartridgeused);
+    writeString(", ");
+*/
     Write_status_response(status);
 
     responseContainer = createContainer(MESSAGE_TYPE__StubCartridgeReadResponse, requestContainer->token, true, &response, &stub_cartridge_read_response__pack, &stub_cartridge_read_response__get_packed_size);
@@ -71,8 +97,19 @@ void Stub_CartridgeWriteRequest(MessageContainer* requestContainer)
 	//request->cartridgeversion
 	//request->cartridgedata
 	//request->cartridgeused
+/*
+    writeLine("Cartridge Request: ");
 
-	
+    writeFloat(request->cartridgeid);
+    writeString(", ");
+    writeFloat(request->cartridgecolor);
+    writeString(", ");
+    writeFloat(request->cartridgeversion);
+    writeString(", ");
+    writeFloat(request->cartridgedata);
+    writeString(", ");
+    writeFloat(request->cartridgeused);
+*/
     StubCartridgeWriteResponse response =   STUB_CARTRIDGE_WRITE_RESPONSE__INIT;
 	
 	response.cartridgeid = request->cartridgeid;
@@ -83,7 +120,13 @@ void Stub_CartridgeWriteRequest(MessageContainer* requestContainer)
 //    response.statusword = OK;
 //    response.has_statusword = true;
 	status_response(status,&response.status, &response.statusword ,&response.has_statusword);
+/*
+    writeLine("Sending Response: ");
 
+    writeFloat(response.cartridgeid);
+    writeString(", ");*/
+//    writeFloat(response.statusword);
+//    WRITELINESTATUS;
     Write_status_response(status);
 
     responseContainer = createContainer(MESSAGE_TYPE__StubCartridgeWriteResponse, requestContainer->token, true, &response, &stub_cartridge_write_response__pack, &stub_cartridge_write_response__get_packed_size);
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_ExtFlash.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_ExtFlash.c
index f478e9428..51c92ed8c 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_ExtFlash.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_ExtFlash.c
@@ -300,10 +300,10 @@ void Stub_ExtFlashWriteWordsRequest(MessageContainer* requestContainer)
 
     StubExtFlashWriteWordsResponse response =   STUB_EXT_FLASH_WRITE_WORDS_RESPONSE__INIT;
 
-    response.address = 0;// alwayes send sddress 0
-    response.has_address = true;
+    uint32_t Current_Start_address = ExtFlashWriteBuf(/*0,*/request->n_wordtwrite, request->wordtwrite);// alwayes send sddress 0
 
-    uint32_t Address = ExtFlashWriteBuf(0,request->n_wordtwrite, request->wordtwrite);// alwayes send sddress 0
+    response.address = Current_Start_address;
+    response.has_address = true;
 
     status_response(status,&response.status, &response.statusword ,&response.has_statusword);
 
@@ -331,6 +331,9 @@ void Stub_ExtFlashReadWordsRequest(MessageContainer* requestContainer)
     response.readbytes =  ExtFlashReadBuf(request->address,request->number_of_words);
     response.n_readbytes = request->number_of_words;
 
+    response.address = request->address;
+    response.has_address = true;
+
     status_response(status,&response.status, &response.statusword ,&response.has_statusword);
 
     responseContainer = createContainer(MESSAGE_TYPE__StubExtFlashReadWordsResponse, requestContainer->token, true, &response, &stub_ext_flash_read_words_response__pack, &stub_ext_flash_read_words_response__get_packed_size);