From b0823127f152fe97a6e8fce29e427c7f3db9cf5a Mon Sep 17 00:00:00 2001 From: Avi Levkovich Date: Tue, 20 Feb 2018 16:43:17 +0200 Subject: MERGE --- Software/Code_Composer/twine_usblib_demo/.cproject | 2 + .../PMR/Common/MessageType.pb-c.c | 68 +- .../PMR/Common/MessageType.pb-c.h | 26 + .../twine_usblib_demo/PMR/Jobs/Job.pb-c.h | 4 + .../PMR/Stubs/StubFPGAReadBackRegRequest.pb-c.c | 105 ++ .../PMR/Stubs/StubFPGAReadBackRegRequest.pb-c.h | 80 ++ .../PMR/Stubs/StubFPGAReadBackRegResponse.pb-c.c | 132 +++ .../PMR/Stubs/StubFPGAReadBackRegResponse.pb-c.h | 89 ++ .../PMR/Stubs/StubFPGAReadVersionRequest.pb-c.c | 92 ++ .../PMR/Stubs/StubFPGAReadVersionRequest.pb-c.h | 75 ++ .../PMR/Stubs/StubFPGAReadVersionResponse.pb-c.c | 170 ++++ .../PMR/Stubs/StubFPGAReadVersionResponse.pb-c.h | 92 ++ .../PMR/Stubs/StubL6470DriverRequest.pb-c.c | 339 +++++++ .../PMR/Stubs/StubL6470DriverRequest.pb-c.h | 110 +++ .../PMR/Stubs/StubL6470DriverResponse.pb-c.c | 274 ++++++ .../PMR/Stubs/StubL6470DriverResponse.pb-c.h | 105 ++ .../PMR/Stubs/StubMotorInitRequest.pb-c.c | 196 ++++ .../PMR/Stubs/StubMotorInitRequest.pb-c.h | 91 ++ .../PMR/Stubs/StubMotorInitResponse.pb-c.c | 105 ++ .../PMR/Stubs/StubMotorInitResponse.pb-c.h | 74 ++ .../PMR/Stubs/StubMotorMovRequest.pb-c.c | 118 +++ .../PMR/Stubs/StubMotorMovRequest.pb-c.h | 76 ++ .../PMR/Stubs/StubMotorMovResponse.pb-c.c | 170 ++++ .../PMR/Stubs/StubMotorMovResponse.pb-c.h | 90 ++ .../PMR/Stubs/StubMotorPositionRequest.pb-c.c | 92 ++ .../PMR/Stubs/StubMotorPositionRequest.pb-c.h | 72 ++ .../PMR/Stubs/StubMotorPositionResponse.pb-c.c | 105 ++ .../PMR/Stubs/StubMotorPositionResponse.pb-c.h | 74 ++ .../PMR/Stubs/StubMotorRunRequest.pb-c.c | 118 +++ .../PMR/Stubs/StubMotorRunRequest.pb-c.h | 76 ++ .../PMR/Stubs/StubMotorRunResponse.pb-c.c | 170 ++++ .../PMR/Stubs/StubMotorRunResponse.pb-c.h | 90 ++ .../PMR/Stubs/StubMotorSpeedRequest.pb-c.c | 92 ++ .../PMR/Stubs/StubMotorSpeedRequest.pb-c.h | 72 ++ .../PMR/Stubs/StubMotorSpeedResponse.pb-c.c | 105 ++ .../PMR/Stubs/StubMotorSpeedResponse.pb-c.h | 74 ++ .../PMR/Stubs/StubMotorStatusRequest.pb-c.c | 105 ++ .../PMR/Stubs/StubMotorStatusRequest.pb-c.h | 74 ++ .../PMR/Stubs/StubMotorStatusResponse.pb-c.c | 287 ++++++ .../PMR/Stubs/StubMotorStatusResponse.pb-c.h | 102 ++ .../PMR/Stubs/StubMotorStopRequest.pb-c.c | 105 ++ .../PMR/Stubs/StubMotorStopRequest.pb-c.h | 77 ++ .../PMR/Stubs/StubMotorStopResponse.pb-c.c | 118 +++ .../PMR/Stubs/StubMotorStopResponse.pb-c.h | 82 ++ .../twine_usblib_demo/Stubs_Handler/Calculate.c | 5 +- .../twine_usblib_demo/Stubs_Handler/Container.c | 34 + .../twine_usblib_demo/Stubs_Handler/DataDef.h | 70 +- .../twine_usblib_demo/Stubs_Handler/Progress.c | 5 +- .../Stubs_Handler/Stub_Cartridge.c | 9 +- .../Stubs_Handler/Stub_Dispenser.c | 5 +- .../Stubs_Handler/Stub_ExtFlash.c | 10 +- .../Stubs_Handler/Stub_FPGAReadBackReg.c | 69 ++ .../Stubs_Handler/Stub_FPGAReadBackReg.h | 11 + .../Stubs_Handler/Stub_FPGAReadVersion.c | 81 ++ .../Stubs_Handler/Stub_FPGAReadVersion.h | 6 + .../twine_usblib_demo/Stubs_Handler/Stub_GPIO.c | 25 +- .../twine_usblib_demo/Stubs_Handler/Stub_Heater.c | 5 +- .../twine_usblib_demo/Stubs_Handler/Stub_L6470.c | 133 +++ .../twine_usblib_demo/Stubs_Handler/Stub_L6470.h | 3 + .../twine_usblib_demo/Stubs_Handler/Stub_Motor.c | 448 +++++++++ .../twine_usblib_demo/Stubs_Handler/Stub_Motor.h | 7 + .../Stubs_Handler/Stub_MotorEncoder.c | 5 +- .../Stubs_Handler/Stub_OptLimitSwitch.c | 5 +- .../Stubs_Handler/Stub_SteperMotor.c | 5 +- .../twine_usblib_demo/Stubs_Handler/Stub_Valve.c | 5 +- .../Stubs_Handler/temperature_sensor.c | 263 +++++ .../Stubs_Handler/temperature_sensor.h | 1 + .../twine_usblib_demo/drivers/ADC_Sampling/ADC.c | 295 ++++++ .../twine_usblib_demo/drivers/ADC_Sampling/ADC.h | 40 + .../twine_usblib_demo/drivers/FPGA/FPGA.c | 88 ++ .../twine_usblib_demo/drivers/FPGA/FPGA.h | 9 + .../twine_usblib_demo/drivers/FPGA/FPGA_Comm.h | 731 ++++++++++++++ .../twine_usblib_demo/drivers/FPGA/FPGA_SPI_Comm.c | 281 ++++++ .../drivers/FPGA/Moters_Driver/L6470.c | 706 ++++++++++++++ .../drivers/FPGA/Moters_Driver/L6470.h | 338 +++++++ .../drivers/I2C_Communication/I2C.h | 31 + .../twine_usblib_demo/drivers/SPI/SPI_Comm.c | 1031 ++++++++++++++++++++ .../twine_usblib_demo/drivers/SPI/SPI_Comm.h | 16 + .../twine_usblib_demo/drivers/SPI/spi_master.c | 519 ++++++++++ .../twine_usblib_demo/drivers/SPI/spi_master.h | 1 + Software/Code_Composer/twine_usblib_demo/main.c | 28 + .../twine_usblib_demo/tm4c129xnczad_startup_ccs.c | 3 +- Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 8388608 -> 8388608 bytes Software/Graphics/external-bridge-tcp.png | Bin 0 -> 3618 bytes Software/Graphics/external-bridge-usb.png | Bin 0 -> 3623 bytes Software/Graphics/machine-trans.png | Bin 0 -> 45618 bytes Software/PMR/Messages/Common/MessageType.proto | 21 +- .../Stubs/StubFPGAReadBackRegRequest.proto | 10 + .../Stubs/StubFPGAReadBackRegResponse.proto | 12 + .../Stubs/StubFPGAReadVersionRequest.proto | 9 + .../Stubs/StubFPGAReadVersionResponse.proto | 15 + .../Messages/Stubs/StubL6470DriverRequest.proto | 28 + .../Messages/Stubs/StubL6470DriverResponse.proto | 23 + .../PMR/Messages/Stubs/StubMotorInitRequest.proto | 17 + .../PMR/Messages/Stubs/StubMotorInitResponse.proto | 10 + .../PMR/Messages/Stubs/StubMotorMovRequest.proto | 11 + .../PMR/Messages/Stubs/StubMotorMovResponse.proto | 16 + .../Messages/Stubs/StubMotorPositionRequest.proto | 9 + .../Messages/Stubs/StubMotorPositionResponse.proto | 10 + .../PMR/Messages/Stubs/StubMotorRunRequest.proto | 11 + .../PMR/Messages/Stubs/StubMotorRunResponse.proto | 16 + .../PMR/Messages/Stubs/StubMotorSpeedRequest.proto | 9 + .../Messages/Stubs/StubMotorSpeedResponse.proto | 10 + .../Messages/Stubs/StubMotorStatusRequest.proto | 10 + .../Messages/Stubs/StubMotorStatusResponse.proto | 24 + .../PMR/Messages/Stubs/StubMotorStopRequest.proto | 10 + .../PMR/Messages/Stubs/StubMotorStopResponse.proto | 11 + .../Visual_Studio/Tango.PMR/Common/MessageType.cs | 50 +- Software/Visual_Studio/Tango.PMR/Jobs/Job.cs | 252 ++++- Software/Visual_Studio/Tango.PMR/Jobs/Segment.cs | 33 +- .../Tango.PMR/Stubs/StubFPGAReadBackRegRequest.cs | 194 ++++ .../Tango.PMR/Stubs/StubFPGAReadBackRegResponse.cs | 257 +++++ .../Tango.PMR/Stubs/StubFPGAReadVersionRequest.cs | 162 +++ .../Tango.PMR/Stubs/StubFPGAReadVersionResponse.cs | 339 +++++++ .../Tango.PMR/Stubs/StubL6470DriverRequest.cs | 701 +++++++++++++ .../Tango.PMR/Stubs/StubL6470DriverResponse.cs | 564 +++++++++++ .../Tango.PMR/Stubs/StubMotorInitRequest.cs | 390 ++++++++ .../Tango.PMR/Stubs/StubMotorInitResponse.cs | 188 ++++ .../Tango.PMR/Stubs/StubMotorMovRequest.cs | 216 ++++ .../Tango.PMR/Stubs/StubMotorMovResponse.cs | 336 +++++++ .../Tango.PMR/Stubs/StubMotorPositionRequest.cs | 159 +++ .../Tango.PMR/Stubs/StubMotorPositionResponse.cs | 188 ++++ .../Tango.PMR/Stubs/StubMotorRunRequest.cs | 216 ++++ .../Tango.PMR/Stubs/StubMotorRunResponse.cs | 336 +++++++ .../Tango.PMR/Stubs/StubMotorSpeedRequest.cs | 159 +++ .../Tango.PMR/Stubs/StubMotorSpeedResponse.cs | 188 ++++ .../Tango.PMR/Stubs/StubMotorStatusRequest.cs | 188 ++++ .../Tango.PMR/Stubs/StubMotorStatusResponse.cs | 585 +++++++++++ .../Tango.PMR/Stubs/StubMotorStopRequest.cs | 191 ++++ .../Tango.PMR/Stubs/StubMotorStopResponse.cs | 222 +++++ .../Web/Tango.MachineService/App_Data/Tango.db | Bin 602112 -> 602112 bytes 132 files changed, 16410 insertions(+), 96 deletions(-) create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubFPGAReadBackRegRequest.pb-c.c create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubFPGAReadBackRegRequest.pb-c.h create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubFPGAReadBackRegResponse.pb-c.c create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubFPGAReadBackRegResponse.pb-c.h create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubFPGAReadVersionRequest.pb-c.c create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubFPGAReadVersionRequest.pb-c.h create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubFPGAReadVersionResponse.pb-c.c create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubFPGAReadVersionResponse.pb-c.h create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubL6470DriverRequest.pb-c.c create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubL6470DriverRequest.pb-c.h create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubL6470DriverResponse.pb-c.c create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubL6470DriverResponse.pb-c.h create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorInitRequest.pb-c.c create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorInitRequest.pb-c.h create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorInitResponse.pb-c.c create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorInitResponse.pb-c.h create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorMovRequest.pb-c.c create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorMovRequest.pb-c.h create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorMovResponse.pb-c.c create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorMovResponse.pb-c.h create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorPositionRequest.pb-c.c create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorPositionRequest.pb-c.h create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorPositionResponse.pb-c.c create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorPositionResponse.pb-c.h create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorRunRequest.pb-c.c create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorRunRequest.pb-c.h create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorRunResponse.pb-c.c create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorRunResponse.pb-c.h create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorSpeedRequest.pb-c.c create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorSpeedRequest.pb-c.h create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorSpeedResponse.pb-c.c create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorSpeedResponse.pb-c.h create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorStatusRequest.pb-c.c create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorStatusRequest.pb-c.h create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorStatusResponse.pb-c.c create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorStatusResponse.pb-c.h create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorStopRequest.pb-c.c create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorStopRequest.pb-c.h create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorStopResponse.pb-c.c create mode 100644 Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorStopResponse.pb-c.h create mode 100644 Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_FPGAReadBackReg.c create mode 100644 Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_FPGAReadBackReg.h create mode 100644 Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_FPGAReadVersion.c create mode 100644 Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_FPGAReadVersion.h create mode 100644 Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_L6470.c create mode 100644 Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_L6470.h create mode 100644 Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Motor.c create mode 100644 Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Motor.h create mode 100644 Software/Code_Composer/twine_usblib_demo/Stubs_Handler/temperature_sensor.c create mode 100644 Software/Code_Composer/twine_usblib_demo/Stubs_Handler/temperature_sensor.h create mode 100644 Software/Code_Composer/twine_usblib_demo/drivers/ADC_Sampling/ADC.c create mode 100644 Software/Code_Composer/twine_usblib_demo/drivers/ADC_Sampling/ADC.h create mode 100644 Software/Code_Composer/twine_usblib_demo/drivers/FPGA/FPGA.c create mode 100644 Software/Code_Composer/twine_usblib_demo/drivers/FPGA/FPGA.h create mode 100644 Software/Code_Composer/twine_usblib_demo/drivers/FPGA/FPGA_Comm.h create mode 100644 Software/Code_Composer/twine_usblib_demo/drivers/FPGA/FPGA_SPI_Comm.c create mode 100644 Software/Code_Composer/twine_usblib_demo/drivers/FPGA/Moters_Driver/L6470.c create mode 100644 Software/Code_Composer/twine_usblib_demo/drivers/FPGA/Moters_Driver/L6470.h create mode 100644 Software/Code_Composer/twine_usblib_demo/drivers/I2C_Communication/I2C.h create mode 100644 Software/Code_Composer/twine_usblib_demo/drivers/SPI/SPI_Comm.c create mode 100644 Software/Code_Composer/twine_usblib_demo/drivers/SPI/SPI_Comm.h create mode 100644 Software/Code_Composer/twine_usblib_demo/drivers/SPI/spi_master.c create mode 100644 Software/Code_Composer/twine_usblib_demo/drivers/SPI/spi_master.h create mode 100644 Software/Graphics/external-bridge-tcp.png create mode 100644 Software/Graphics/external-bridge-usb.png create mode 100644 Software/Graphics/machine-trans.png create mode 100644 Software/PMR/Messages/Stubs/StubFPGAReadBackRegRequest.proto create mode 100644 Software/PMR/Messages/Stubs/StubFPGAReadBackRegResponse.proto create mode 100644 Software/PMR/Messages/Stubs/StubFPGAReadVersionRequest.proto create mode 100644 Software/PMR/Messages/Stubs/StubFPGAReadVersionResponse.proto create mode 100644 Software/PMR/Messages/Stubs/StubL6470DriverRequest.proto create mode 100644 Software/PMR/Messages/Stubs/StubL6470DriverResponse.proto create mode 100644 Software/PMR/Messages/Stubs/StubMotorInitRequest.proto create mode 100644 Software/PMR/Messages/Stubs/StubMotorInitResponse.proto create mode 100644 Software/PMR/Messages/Stubs/StubMotorMovRequest.proto create mode 100644 Software/PMR/Messages/Stubs/StubMotorMovResponse.proto create mode 100644 Software/PMR/Messages/Stubs/StubMotorPositionRequest.proto create mode 100644 Software/PMR/Messages/Stubs/StubMotorPositionResponse.proto create mode 100644 Software/PMR/Messages/Stubs/StubMotorRunRequest.proto create mode 100644 Software/PMR/Messages/Stubs/StubMotorRunResponse.proto create mode 100644 Software/PMR/Messages/Stubs/StubMotorSpeedRequest.proto create mode 100644 Software/PMR/Messages/Stubs/StubMotorSpeedResponse.proto create mode 100644 Software/PMR/Messages/Stubs/StubMotorStatusRequest.proto create mode 100644 Software/PMR/Messages/Stubs/StubMotorStatusResponse.proto create mode 100644 Software/PMR/Messages/Stubs/StubMotorStopRequest.proto create mode 100644 Software/PMR/Messages/Stubs/StubMotorStopResponse.proto create mode 100644 Software/Visual_Studio/Tango.PMR/Stubs/StubFPGAReadBackRegRequest.cs create mode 100644 Software/Visual_Studio/Tango.PMR/Stubs/StubFPGAReadBackRegResponse.cs create mode 100644 Software/Visual_Studio/Tango.PMR/Stubs/StubFPGAReadVersionRequest.cs create mode 100644 Software/Visual_Studio/Tango.PMR/Stubs/StubFPGAReadVersionResponse.cs create mode 100644 Software/Visual_Studio/Tango.PMR/Stubs/StubL6470DriverRequest.cs create mode 100644 Software/Visual_Studio/Tango.PMR/Stubs/StubL6470DriverResponse.cs create mode 100644 Software/Visual_Studio/Tango.PMR/Stubs/StubMotorInitRequest.cs create mode 100644 Software/Visual_Studio/Tango.PMR/Stubs/StubMotorInitResponse.cs create mode 100644 Software/Visual_Studio/Tango.PMR/Stubs/StubMotorMovRequest.cs create mode 100644 Software/Visual_Studio/Tango.PMR/Stubs/StubMotorMovResponse.cs create mode 100644 Software/Visual_Studio/Tango.PMR/Stubs/StubMotorPositionRequest.cs create mode 100644 Software/Visual_Studio/Tango.PMR/Stubs/StubMotorPositionResponse.cs create mode 100644 Software/Visual_Studio/Tango.PMR/Stubs/StubMotorRunRequest.cs create mode 100644 Software/Visual_Studio/Tango.PMR/Stubs/StubMotorRunResponse.cs create mode 100644 Software/Visual_Studio/Tango.PMR/Stubs/StubMotorSpeedRequest.cs create mode 100644 Software/Visual_Studio/Tango.PMR/Stubs/StubMotorSpeedResponse.cs create mode 100644 Software/Visual_Studio/Tango.PMR/Stubs/StubMotorStatusRequest.cs create mode 100644 Software/Visual_Studio/Tango.PMR/Stubs/StubMotorStatusResponse.cs create mode 100644 Software/Visual_Studio/Tango.PMR/Stubs/StubMotorStopRequest.cs create mode 100644 Software/Visual_Studio/Tango.PMR/Stubs/StubMotorStopResponse.cs diff --git a/Software/Code_Composer/twine_usblib_demo/.cproject b/Software/Code_Composer/twine_usblib_demo/.cproject index c6812f5ac..b1256533d 100644 --- a/Software/Code_Composer/twine_usblib_demo/.cproject +++ b/Software/Code_Composer/twine_usblib_demo/.cproject @@ -52,6 +52,8 @@