Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync develop with master for C1t Omega release #643

Merged
merged 14 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions configuration/mysql/garage_port_drayage/port_drayage.sql
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ CREATE TABLE `first_action` (
) ENGINE=InnoDB DEFAULT CHARSET=latin1;

LOCK TABLES `first_action` WRITE;
INSERT INTO `first_action` VALUES ('C1T-1','NULL',-2.3,0.7,'ENTER_STAGING_AREA','one','two');
INSERT INTO `first_action` VALUES ('C1T-1','NULL',-2.46,0.56,'ENTER_STAGING_AREA','one','two');
UNLOCK TABLES;

--
Expand All @@ -45,5 +45,5 @@ CREATE TABLE `freight` (
) ENGINE=InnoDB DEFAULT CHARSET=latin1;

LOCK TABLES `freight` WRITE;
INSERT INTO `freight` VALUES ('C1T-1','NULL',-0.4,-0.4,'EXIT_PORT','zero','one'),('C1T-1','NULL',-2.3,0.7,'ENTER_STAGING_AREA','one','two'),('C1T-1','CARGO_A',-3.4,-1.4,'PICKUP','two','three'),('C1T-1','CARGO_A',-3.4,-3.4,'EXIT_STAGING_AREA','three','four'),('C1T-1','CARGO_A',-3.4,-5.4,'ENTER_PORT','four','five'),('C1T-1','CARGO_A',-0.4,-6.4,'DROPOFF','five','six'),('C1T-1','CARGO_B',2.6,-4.7,'PICKUP','six','seven'),('C1T-1','CARGO_B',0.4,-3.4,'PORT_CHECKPOINT','seven','eight'),('C1T-1','CARGO_B',-0.3,0.2,'EXIT_PORT','eight','nine');
INSERT INTO `freight` VALUES ('C1T-1','NULL',-0.45,-0.45,'EXIT_PORT','zero','one'),('C1T-1','NULL',-2.46,0.56,'ENTER_STAGING_AREA','one','two'),('C1T-1','CARGO_A',-3.45,-1.44,'PICKUP','two','three'),('C1T-1','CARGO_A',-3.45,-3.45,'EXIT_STAGING_AREA','three','four'),('C1T-1','CARGO_A',-3.45,-5.45,'ENTER_PORT','four','five'),('C1T-1','CARGO_A',-1.45,-6.45,'DROPOFF','five','six'),('C1T-1','CARGO_B',2.55,-4.5,'PICKUP','six','seven'),('C1T-1','CARGO_B',0.55,-3.45,'PORT_CHECKPOINT','seven','eight'),('C1T-1','CARGO_B',-0.45,-0.45,'EXIT_PORT','eight','nine');
UNLOCK TABLES;
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ CREATE TABLE `first_action` (
) ENGINE=InnoDB DEFAULT CHARSET=latin1;

LOCK TABLES `first_action` WRITE;
INSERT INTO `first_action` VALUES ('C1T-1','NULL',-2.3,0.7,'ENTER_STAGING_AREA','one','two');
INSERT INTO `first_action` VALUES ('C1T-1','NULL',-2.46,0.56,'ENTER_STAGING_AREA','one','two');
UNLOCK TABLES;

--
Expand All @@ -45,5 +45,5 @@ CREATE TABLE `freight` (
) ENGINE=InnoDB DEFAULT CHARSET=latin1;

LOCK TABLES `freight` WRITE;
INSERT INTO `freight` VALUES ('C1T-1','NULL',-0.4,-0.4,'EXIT_PORT','zero','one'),('C1T-1','NULL',-2.3,0.7,'ENTER_STAGING_AREA','one','two'),('C1T-1','CARGO_A',-3.4,-1.4,'PICKUP','two','three'),('C1T-1','CARGO_A',-3.4,-3.4,'EXIT_STAGING_AREA','three','four'),('C1T-1','CARGO_A',-3.4,-5.4,'ENTER_PORT','four','five'),('C1T-1','CARGO_A',-0.4,-6.4,'DROPOFF','five','six'),('C1T-1','CARGO_B',1.6,-4.7,'PICKUP','six','seven'),('C1T-1','CARGO_B',0.4,-3.4,'PORT_CHECKPOINT','seven','eight'),('C1T-1','CARGO_B',-0.3,0.2,'EXIT_PORT','eight','nine');
INSERT INTO `freight` VALUES ('C1T-1','NULL',-0.45,-0.45,'EXIT_PORT','zero','one'),('C1T-1','NULL',-2.46,0.56,'ENTER_STAGING_AREA','one','two'),('C1T-1','CARGO_A',-3.45,-1.44,'PICKUP','two','three'),('C1T-1','CARGO_A',-3.45,-3.45,'EXIT_STAGING_AREA','three','four'),('C1T-1','CARGO_A',-3.45,-5.45,'ENTER_PORT','four','five'),('C1T-1','CARGO_A',-1.45,-6.45,'DROPOFF','five','six'),('C1T-1','CARGO_B',1.55,-4.5,'PICKUP','six','seven'),('C1T-1','CARGO_B',0.55,-3.45,'PORT_CHECKPOINT','seven','eight'),('C1T-1','CARGO_B',-0.45,-0.45,'EXIT_PORT','eight','nine');
UNLOCK TABLES;
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ CREATE TABLE `first_action` (
) ENGINE=InnoDB DEFAULT CHARSET=latin1;

LOCK TABLES `first_action` WRITE;
INSERT INTO `first_action` VALUES ('C1T-1','NULL',-2.3,0.7,'ENTER_STAGING_AREA','one','two');
INSERT INTO `first_action` VALUES ('C1T-1','NULL',-2.46,0.56,'ENTER_STAGING_AREA','one','two');
UNLOCK TABLES;

--
Expand All @@ -45,5 +45,5 @@ CREATE TABLE `freight` (
) ENGINE=InnoDB DEFAULT CHARSET=latin1;

LOCK TABLES `freight` WRITE;
INSERT INTO `freight` VALUES ('C1T-1','NULL',-0.4,-0.4,'EXIT_PORT','zero','one'),('C1T-1','NULL',-2.3,0.7,'ENTER_STAGING_AREA','one','two'),('C1T-1','CARGO_A',-3.4,-1.4,'PICKUP','two','three'),('C1T-1','CARGO_A',-3.4,-3.4,'EXIT_STAGING_AREA','three','four'),('C1T-1','CARGO_A',-3.4,-5.4,'ENTER_PORT','four','five'),('C1T-1','CARGO_A',-0.4,-6.4,'DROPOFF','five','six'),('C1T-1','CARGO_B',2.6,-4.7,'PICKUP','six','seven'),('C1T-1','CARGO_B',0.4,-3.4,'PORT_CHECKPOINT','seven','eight'),('C1T-1','CARGO_B',-0.3,0.2,'EXIT_PORT','eight','nine');
INSERT INTO `freight` VALUES ('C1T-1','NULL',-0.45,-0.45,'EXIT_PORT','zero','one'),('C1T-1','NULL',-2.46,0.56,'ENTER_STAGING_AREA','one','two'),('C1T-1','CARGO_A',-3.45,-1.44,'PICKUP','two','three'),('C1T-1','CARGO_A',-3.45,-3.45,'EXIT_STAGING_AREA','three','four'),('C1T-1','CARGO_A',-3.45,-5.45,'ENTER_PORT','four','five'),('C1T-1','CARGO_A',-1.45,-6.45,'DROPOFF','five','six'),('C1T-1','CARGO_B',2.55,-4.5,'PICKUP','six','seven'),('C1T-1','CARGO_B',0.55,-3.45,'PORT_CHECKPOINT','seven','eight'),('C1T-1','CARGO_B',-0.45,-0.45,'EXIT_PORT','eight','nine');
UNLOCK TABLES;
11 changes: 11 additions & 0 deletions docs/Release_notes.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
V2X-Hub Release Notes
---------------------------------

Version 7.8.1, released Sep 11th, 2024
--------------------------------------------------------

**Summary:**
V2X Hub release 7.8.1 includes additional SQL files which are created to store command sequences V2X Hub sends to a C1T vehicle to coordinate Port Drayage. These files contain actions and destination points configured to send the vehicle through a pre-designed mock port environment, with one instructing the vehicle to pick up cargo in Lane 1 and the other instructing the vehicle to proceed to Lane 2.

Enhancement in this release:

- V2X-Hub PR 639: Added SQL files for use with the C1T Port Drayage configuration and updated docker compose files to streamline deployment.
- V2X-Hub PR 641: Updated SQL Port Drayage action locations to improve accuracy in tracking port exits.

Version 7.8.0, released Aug 26th, 2024
--------------------------------------------------------

Expand Down
Loading