Commit 03233b0b authored by Yann Garcia's avatar Yann Garcia
Browse files

Editorial changes

parent bf4481fe

lib/LibItsAvm_Checksums_function.ttcn

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ module LibItsAvm_Checksums_function { 
    log(">>> f_avm_e2e_compute_checksum: p_data: ", p_data);



    // Calculate the checksum over the e2eProtection.length_ field and the rest of the message (excluding the first 6 bytes and the 4 bytes of crc32)

    // See E2E Protocol Specification AUTOSAR FOR23-11 Figure 6.77: E2E Profile 4 Header (https://www.autosar.org/fileadmin/standards/R23-11/FO/AUTOSAR_FO_PRS_E2EProtocol.pdf)

    var octetstring v_data := 

      int2oct(lengthof(p_data) - 6, 2) &                                         // e2eProtection.length_

      substr(p_data, 6 + 2, 2 + 4) &                                             // rollingCounter + dataID - crc32

lib/LibItsAvm_Templates.ttcn

+10 −9
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ module LibItsAvm_Templates { 
    import from LibItsCommon_Functions all;

    import from LibItsCommon_TypesAndValues all;

    import from LibItsCommon_ASN1_NamedNumbers all;

    import from LibItsCommon_ASN1_AVM_NamedNumbers all;



    // LibItsAvm

    import from LibItsAvm_TypesAndValues all;
@@ -732,14 +733,14 @@ module LibItsAvm_Templates { 
        }



        template (omit) VehicleState m_vehicle_state(

                                                     in template (value) OperationModeEnum p_operationMode,

                                                     in template (value) GearEnum p_gearState,

                                                     in template (value) DirectionIndicatorEnum p_directionIndicatorState,

                                                     in template (value) ParkingBrakeStateEnum p_parkingBrakeState,

                                                     in template (value) MotorSystemEnum p_motorSystemState,

                                                     in template (value) VelocityComponentValue p_currentVelocity,

                                                     in template (value) HighResCurvature p_currentCurvature,

                                                     in template (value) boolean p_secureStandstill,

                                                     in template (value) OperationModeEnum p_operationMode := driving,

                                                     in template (value) GearEnum p_gearState := forwards,

                                                     in template (value) DirectionIndicatorEnum p_directionIndicatorState := off,

                                                     in template (value) ParkingBrakeStateEnum p_parkingBrakeState := engaging,

                                                     in template (value) MotorSystemEnum p_motorSystemState := on_,

                                                     in template (value) VelocityComponentValue p_currentVelocity := 115, // 1.15 m/s

                                                     in template (value) HighResCurvature p_currentCurvature := LibItsCommon_ASN1_AVM_NamedNumbers.Avm_HighResCurvature_straight,

                                                     in template (value) boolean p_secureStandstill := true,

                                                     in template (omit) TimestampIts p_vehicleStateGenerationTime := omit,

                                                     in template (omit) WaypointIndex p_idxLastWayPoint := omit,

                                                     in template (omit) Pose p_localizedPose := omit

lib_system/LibItsAvm_Functions.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ module LibItsAvm_Functions { 
                f_acTriggerSecEvent(m_acDisableSecurity);

            }

            

        } // End of function f_initialiseSecuredMode()

        } // End of function f_uninitialiseSecuredMode()

        

        /**

         * @desc    Triggers event in the test system adaptation.