From 87a00f7cee822c9ef2ddc3bff4d2b8a7e8a7bf8b Mon Sep 17 00:00:00 2001 From: tza Date: Sat, 8 Jun 2024 21:37:08 +0300 Subject: [PATCH] fix web bus_monitor --- pyren3/bus_monitor.py | 61 ++--- pyren3/dump.txt | 442 +++++++++++++++++++++++++++++++ pyren3/web_html/bus_monitor.html | 1 + 3 files changed, 472 insertions(+), 32 deletions(-) create mode 100644 pyren3/dump.txt diff --git a/pyren3/bus_monitor.py b/pyren3/bus_monitor.py index a8dd29b..1ea9b5c 100644 --- a/pyren3/bus_monitor.py +++ b/pyren3/bus_monitor.py @@ -269,7 +269,7 @@ def optParser(): parser.add_argument('-p', help="ELM327 com port name", dest="port", - default="/dev/tty0") + default="/dev/ttyS5") parser.add_argument("-r", help="com port rate during diagnostic session {38400[default],57600,115200,230400,500000}", @@ -289,7 +289,7 @@ def optParser(): parser.add_argument("-x", help="xml file with frames defenition", dest="xmlfile", - default="can_v84_10.xml") + default="canv84.12.xml") parser.add_argument("-o", help="output file for saving parameters list", @@ -299,7 +299,7 @@ def optParser(): parser.add_argument("-f", help="file with selected parameters list", dest="infile", - default="candump.txt") + default="dump.txt") parser.add_argument("--log", help="log file name", @@ -375,14 +375,12 @@ def chooseXml(): return choice[0] -def main(): - web = Flask(__name__, static_folder="web_static/", static_url_path="/static") - socket = SocketIO(web) - +def main(socket): global candef global outfile global infile global show_loc + global mon optParser() @@ -409,30 +407,29 @@ def main(): mon.framefilter = mod_globals.opt_ecuAddr mon.setFilter(mon.framefilter) - def mainloop(): - while(1): - time.sleep( 0.03 ) - ct = mod_elm.pyren_time() - if (ct-lt)>0.1: - lt = ct - show_loc.set() - socket.emit("frame", {"frame": [v for v in mon.showData(ct)]}) - show_loc.clear() + while(1): + time.sleep( 0.03 ) + ct = mod_elm.pyren_time() + if (ct-lt)>0.1: + lt = ct + show_loc.set() + socket.emit("frame", {"frame": [v for v in mon.showData(ct)]}) + show_loc.clear() - @socket.on("connect") - def on_connect(): - keys = [] - for d in mon.showList: - if d in list(mon.datas.keys()): - keys.append(d) - socket.emit("setKeys", {"keys": keys}) - - @web.get("/") - def index(): - return send_file("web_html/bus_monitor.html") - - socket.start_background_task(mainloop) - socket.run(web, "0.0.0.0", 5000) +web = Flask(__name__, static_folder="web_static/", static_url_path="/static") +socket = SocketIO(web) -if __name__ == '__main__': - main() +@socket.on("connect") +def on_connect(): + keys = [] + for d in mon.showList: + if d in list(mon.datas.keys()): + keys.append(d) + socket.emit("setKeys", {"keys": keys}) + +@web.get("/") +def index(): + return send_file("web_html/bus_monitor.html") + +socket.start_background_task(main, socket) +socket.run(web, "0.0.0.0", 5000) \ No newline at end of file diff --git a/pyren3/dump.txt b/pyren3/dump.txt new file mode 100644 index 0000000..99676ea --- /dev/null +++ b/pyren3/dump.txt @@ -0,0 +1,442 @@ +AirbagCrashOrder;SCALED; +CrashDetected_84;LIST +CrashDetectionOutOfOrder_84;LIST +ResetInfo_AIRBAG_84;LIST +ValidAIRBAGInformation_84;LIST +PassAIRBAG_OFF_84;LIST +AIRBAGMalfunction_84;LIST +PassengerSafetyBeltSwitch;LIST +PassengerDetectionOnSeat;LIST +DriverSafetyBeltSwitch;LIST +InputShaftRevolution;SCALED; +OutputShaftRevolution;SCALED; +FuelCutRequestedEngineSpeed;SCALED; +ManualModeState;LIST +AT_Faults_States_84;SCALED; +TransmRangeEngaged_84_copy_;LIST +AT_PositionDisplay_84;LIST +AT_ProgSelect_84;LIST +GearShiftRefused_84;LIST +ResetInfo_AT_84;LIST +BrakePedalRequest;LIST +Underdrive_84;LIST +FullLoad;LIST +AT_Warning;LIST +AT_Eco_Selected_Mode;LIST +AT_Snow_Selected_Mode;LIST +AT_Impulsive_Selected_Mode;LIST +AT_MinimumIdleSpeedRequest;SCALED; +FastTorqueRequest_84;SCALED; +Limit_SlowTorqReq_84;SCALED; +AT_Torque;SCALED; +TorqueConverterState_84;LIST +DragReduction_84;LIST +IdleSpeedIncreaseRequest_84;LIST +AT_TorqueRequestInProgress;LIST +AT_FanRequest_84;LIST +MajorFailure_84;LIST +TransmRangeEngaged_84;LIST +AT_MILReq_84;SCALED; +AT_Clock;SCALED; +AnticipatedRGBPumpState;LIST +CrankingAuthorisation_AT_84;LIST +PowerTrainGain_84;SCALED; +AT_TorqueControlType;LIST +TA_Position;LIST +Filling1_84;SCALED; +Filling2_84;SCALED; +DoorSwitches;SCALED; +PositionLightsRequest_UCH_;LIST +LowBeamRequest_UCH_;LIST +ResetInfo_UCH_84;LIST +FlashingIndicatorStatus;LIST +SSPPInhibition_84;LIST +HighBeamRequest_UCH_;LIST +APCLineStatus_copy_;LIST +IgnitionState_UCH_;LIST +FrontFogLightsRequest;LIST +SteeringLock_BCM_Failure;LIST +DoorLockingState;SCALED; +RearFogLightStatus_84;LIST +WipingMalfunction;LIST +AutomaticWipingMalfunction;LIST +ManualRearDefrostStatus;LIST +BuzzerRequest;LIST +TrailerPresence_84;LIST +ExternalTemp_84;SCALED; +EngineCoolantTemp_84_copy_;SCALED; +HeaterUnitSetpointFreeze;LIST +DayRunningLightRequest;LIST +RearGearEngaged_84;LIST +Card_Key_Number_84;LIST +SmartKeylessInformationDisplay;LIST +Badge_battery_low;LIST +TripDisplayScrollingRequest;LIST +DistanceTotalizer;SCALED; +AbsoluteTimeSince1rstIgnition;SCALED; +MaxTimeToCommute;SCALED; +VehicleSpeed_UPC;LIST +WakeUpType;LIST +LoadDrivenByBCMToBeCommuted;LIST +OuputStatus__copy_;LIST +StartingMode_BCM;LIST +IdleSpeedIncrease_UCH_;LIST +ALS_activated;LIST +ALSMalfunction;LIST +RearDefrostRequest;LIST +ClimateCoolingRequest_84;LIST +Dongle_ID_BCM_1;SCALED; +BCM_WakeUpSleepCommand;LIST +FrontWipingRequest;LIST +Dongle_ID_BCM_2;SCALED; +HeadLampsWasherRequest;LIST +HeadLampsWasherSelection;LIST +Dongle_command_BCM;SCALED; +ElectricalPowerDrived;SCALED; +ATPowerLatch_84;LIST +VehiculeRunning;LIST +CloseActiveBrakeSwitch_UCH;LIST +ClutchSwitchMaximumTravel_84;LIST +DeliveryModeInfo;LIST +BlowerState;LIST +BrakePadWear;LIST +CustomerEngIddleSpeedReq;LIST +ChildLockMalfunction;LIST +DayNightInformation;LIST +EngineImmobiliserFailure;LIST +CrankingAuthorization_Verlog;LIST +ClimateCoolingStatusCopy;LIST +HardTopPositionCopy;LIST +KeylessPushState;LIST +Key_or_Keyless_Vehicule;LIST +DiagMuxOn_BCM;LIST +EmergencyEngineStop;SCALED; +SLockValueControl_84;SCALED; +SteeringLockCode_84;SCALED; +UCHComputerOperatingProperly_84;SCALED; +IgnitionON_84;LIST +Steering_Column_Unlock_84;LIST +Steering_Column_Lock_84;LIST +ClearSteeringCode_84;LIST +VehicleSpeed_84;SCALED; +Odometer_84;SCALED; +ESPStateLamp;LIST +ABSStateLamp;LIST +EBVStateLamp;LIST +ResetInfo_ABS_84;LIST +EBVinRegulation_84;LIST +VSUStateLamp;LIST +ABSMalfunction_84;LIST +ABSinRegulation_84;LIST +CloseActiveBrakeSwitch_ABS_84;LIST +ABS_WarningRequest;LIST +FillingStatus_84;LIST +WheelsLockingState;LIST +HDCStateLamp;LIST +ECBStateLamp;LIST +VSUPresence;LIST +ASRStaticTorqueRequest_84;SCALED; +ASRDynamicTorqueRequest_84;SCALED; +MSRTorqueRequest_84;SCALED; +TorqueControlType_84;LIST +Shifting_Authorization_84;LIST +EarlyGearShiftUp_84;LIST +ESPMalfunction_84;LIST +ESPDeactivated_84;LIST +ESPClock_84;SCALED; +ASRinRegulation_84;LIST +AYCinRegulation_84;LIST +MSRinRegulation_84;LIST +MSRDisabled_84;LIST +ASRMalfunction;LIST +ShiftMapChangeRequest;LIST +ETCShutdownRequest;LIST +RequestedTransferedTorque;SCALED; +HeaterUnitSetPoint;SCALED; +ResetInfo_CLIM_84;LIST +CabinFanState;LIST +ClimateCoolingSelect;LIST +RearDefrostPush;SCALED; +RearDefrostAutoSelect;LIST +RearDefrostPushInvalid;LIST +EvaporatorTemperature;SCALED; +DistanceTotalizer_APV_84;SCALED; +MilLampState_84;LIST +DisplayedOilLevel_84;LIST +FuelLevel_APV_84;SCALED; +OilDrainingRange_84;SCALED; +ShortVehicleID;LIST +Cluster_RefusetoSleep;LIST +FuelLow_84;LIST +ResetInfo_TdB_84;LIST +BrakeSystemMalfunction_84;LIST +HandBrakeSwitch_84;LIST +DiagFuelGauge_84;LIST +DistanceTotalizer_84;SCALED; +LPGLow_84;LIST +AIRBAGMalfunctionLampState_84;LIST +PassengerAIRBAG_OFFLampState_84;LIST +AIRBAGMalfuncLampOperational_84;LIST +PassAIRBAG_OFFLampOperational_84;LIST +VehicleType;LIST +Cluster_WakeUpSleepReq;LIST +SNOW_SW;LIST +ClusterDrivenLampsAutoCheck_84;LIST +MuteRadioOrder;LIST +FuelLevel_84;SCALED; +SafetyBeltLampState;LIST +PositionLightsStatus;LIST +NightDimmedLight_MaxPercent_84;SCALED; +DayDimmedLight_MaxPercent_84;SCALED; +DisplayedSpeed;SCALED; +PositionLightsRequest_DSU;LIST +LowBeamRequest_DSU;LIST +HighBeamRequest_DSU;LIST +LeftTurnIndicatorRequest_DSU;LIST +RightTurnIndicatorRequest_DSU;LIST +ResetInfo_DSU;LIST +DriveStyleDetection;SCALED; +GradeLogicFlag;LIST +LockUpRequest;LIST +EngineCoolantTemp_84;SCALED; +FuelConsumption_84;SCALED; +IdleSpeedControlRequest_84;SCALED; +DiagMuxOn_84_copy;LIST +MILLamp_84;LIST +WarningWaterTemp_84;LIST +DieselPreHeating_84;LIST +EngineControlFailureLevel1_84;LIST +EngineControlFailureLevel2_84;LIST +ResetInfo_ECM_84;LIST +RequestedSpeed_84;SCALED; +RequestedSpeedBlink_84;LIST +CruiseControlStatusDisplay;LIST +EngOverSpeedCutOffThreshold_84;LIST +FuelConsumptionType_84;LIST +EngineStatus_84__copy_;LIST +PDCUTREQ;LIST +ELAMP;LIST +DieselFilterWaterDetection;LIST +ParticulateFilterState;LIST +EngineCoolantRegulationTemperatu;LIST +DownTransitionOfEngineCoolantTem;LIST +NominalFuelConsumption;SCALED; +EngineFanSpeedRequest;LIST +EngineStatus_84;LIST +CompressorActivation;LIST +RearDefrostRequest_ECM;LIST +ElectricalPowerCut_Freeze_84;LIST +MaximumMechanicalPowerAllowed_84;SCALED; +EngineRPM_84_copy_;SCALED; +AllowedPowerGradient;SCALED; +CrankingAuthorisation_ATviaECM;LIST +CrankingAuthorization_ECM;LIST +AlternatorMaximumPower;SCALED; +EngineRPM_84;SCALED; +MeanEffectiveTorque_84;SCALED; +RawPedal;SCALED; +RequestedTorqueAfterProc_84;SCALED; +TorqueRequestStatus_84;LIST +ASR_MSRAcknowledgement_84;LIST +ClutchSwitch_84;LIST +ATTorqueAcknowledgement;LIST +OpenActiveBrakeSwitch_ECM_84;LIST +FrictionTorque_84;SCALED; +Reserved_1bit;LIST +DiagMuxOn_84;LIST +ParticulateFilterFailureDisplay;LIST +SLockRequestControl_84;SCALED; +EngineTorque_WithoutGBReq_84;SCALED; +MinimumInstantTorque;SCALED; +MaximumInstantTorque;SCALED; +CruiseControlStatus_84;LIST +ECM_MechanicalLoadRequest;LIST +KickDownActivated;LIST +ErgonomicPedal;SCALED; +RequestForLPG_NGFlow_84;SCALED; +Request_GazolinePumpCutOff_84;LIST +LPG_NGModeRequest_84;LIST +CylinderNumber_84;LIST +GazComposition_84;LIST +CorrectionCylinderNumber_84;LIST +IntakeManifoldPressure_84;SCALED; +LPG_NGLampRequest_84;LIST +LPG_NGPushLampRequest_84;LIST +EngineMode_84;LIST +Flow_CylinderCorrection_84;SCALED; +IntakeManifoldAirTemperature_84;SCALED; +EPSIndexNotDetected;LIST +EPSteeringFailure;LIST +ResetInfo_EPS;LIST +Dongle_command_EPS;SCALED; +Dongle_ID_EPS;SCALED; +SteeringLockCOP_84;SCALED; +WrongCode_84;LIST +AntiscanOn_84;LIST +LockForbidden_84;LIST +UnlockingFinished_84;LIST +UndefinedPosition_84;LIST +LockingFinished_84;LIST +Blank_Coded_84;LIST +ResetInfo_Verrou_84;LIST +SteeringLockMinorElecFailure_84;LIST +ESCL3Position_84;LIST +SteeringActuatorFailure_84;LIST +SteeringLockMajorElecFailure_84;LIST +SpeedInhibition_84;LIST +SafetyLineInhibition_84;LIST +InconsistentUCHMessage_84;LIST +PowerSupplyFeedback_84;LIST +AbsentFrameUCH_to_ESCL3_84;LIST +OutofRangeOperatingVoltage_84;LIST +SensorTestAuthorized_84;LIST +TimeOutOnSensorTest_84;LIST +ConfigAttemptCounter_84;LIST +BitRateConfigured_84;LIST +BitRateConfiguration_84;LIST +WheelSpeed_F_R;SCALED; +WheelSpeed_F_L;SCALED; +VehicleSpeed_84_copy;SCALED; +MessageCounterFront;SCALED; +ChecksumFront;SCALED; +CarburetionType_84;LIST +LPGNG_PetrolOperation_84;LIST +LPG_NGSystemMalfunction_84;LIST +LPG_NGTankEmpty_84;LIST +DiagnosticLPG_NGGauge_84;LIST +LPG_NGSystemReady_84;LIST +LPG_NGGaugeInformation_84;SCALED; +ActualLPG_NGFlow_84;SCALED; +LPG_NG_84;LIST +InvalidLPG_NGConsumption_84;LIST +LPG_NGMILRequest_84;LIST +LPG_NGPressure_84;SCALED; +LPG_NGTemperature_84;SCALED; +LPG_NGSystemMinorFailure_84;LIST +LPG_NGSystemMajorFailure_84;LIST +OuputStatus;LIST +MBLFailureDisplay;LIST +ResetInfo_HLS;LIST +UCCType;LIST +ResetInfo_UCC_84;LIST +ResetInfo_APB;LIST +ClampingStatusDisplayInhibition;LIST +ParkingBrakeRequestInProgress;LIST +ParkingBrakeMalfunction;LIST +ParkingBrakeBindingStatus;LIST +VehicleForwardTilt;SCALED; +VehicleSideTilt;SCALED; +ClampingAlertToDriver;LIST +PorN_display_request;LIST +BuzzerRequest_FPA;LIST +ClutchPosition;LIST +WheelSpeed_R_R_84;SCALED; +WheelSpeed_R_L_84;SCALED; +VehicleSpeed_CVT;SCALED; +MessageCounterRear;SCALED; +ChecksumRear;SCALED; +SSPPStopLamp_84;LIST +SSPPServiceLamp_84;LIST +SpeedPressureMisadaptation_84;LIST +OverSpeedBuzzer_PAX;LIST +SSPP_Buzzer;LIST +LoadPressureMisadaptation_84;LIST +VehiclePressureState_84;LIST +SSPPLeakageLamp_84;LIST +FrontLeftWheelState_84;LIST +FrontRightWheelState_84;LIST +RearRightWheelState_84;LIST +RearLeftWheelState_84;LIST +Right_LeftImbalance_84;LIST +FrontLeftWheelPressure_84;SCALED; +FrontRightWheelPressure_84;SCALED; +RearRightWheelPressure_84;SCALED; +RearLeftWheelPressure_84;SCALED; +DrivingRange_PAX;SCALED; +SteeringWheelAngle;SCALED; +SteeringWheelRotationSpeed;SCALED; +ResetInfo_Swa;LIST +SwaSensorInternalStatus;LIST +SwaMessageCounter;SCALED; +SwaChecksum;SCALED; +HardTopPosition;LIST +RollClosureRequest;LIST +HardTopFailure;LIST +ElectricWindowRequest;LIST +ResetInfo_UCT;LIST +GeneralBadUse;LIST +Rollbar_failure;LIST +FinishRoofMovement;LIST +UCT_Buzzer;LIST +ResetInfo_PAS;LIST +UPAFailureDispRequest;LIST +UPAStatusDispRequest;LIST +AlternatorLoad_84;SCALED; +RearGearEngaged_84_UPC;LIST +NeutralContact;LIST +EngineFanSpeedStatus;LIST +StarterStatus_copy;LIST +RotorCurrent_84;SCALED; +AlternatorNumber;LIST +InstantMecanicalPowerByAlt;SCALED; +PredictedMecanicalPowerByAlt;SCALED; +APCLineStatus;LIST +LowBatVoltDisplay;LIST +StarterStatus;LIST +FrontWiperStatus;LIST +FrontWiperStopPosition_USM;LIST +RearDefrostStatus;LIST +ClimateCoolingStatus;LIST +PositionLightsStatus_84;LIST +LowBeamStatus;LIST +HighBeamStatus;LIST +FrontFogLightStatus;LIST +ResetInfo_USM;LIST +FrontWiperProtection;LIST +BatteryVoltage_USM;SCALED; +OilPressureSwitch;LIST +HeadLampsWasherStatus;LIST +BatteryLamp;LIST +IgnitionSupplyConfirmation;LIST +USM_WakeUpSleepReq;LIST +USM_RefusetoSleep;LIST +OKToCommuteLoadByUSM;LIST +Dongle_command_USM;SCALED; +Dongle_ID_USM;SCALED; +LongitudinalAccelerationProc;SCALED; +Transversalacceleration_84;SCALED; +SoftwareLockValue_84 +SoftwareLockRequest_84 +AIRBAG_to_DTOOL +APB_to_DTOOL +AT_to_DTOOL +BCM_to_DTOOL +BRAKE_to_DTOOL +CLIM_to_DTOOL +CLUSTER_to_DTOOL +DTOOL_to_AIRBAG +DTOOL_to_ALL +DTOOL_to_ALLUCEOBD +DTOOL_to_APB +DTOOL_to_AT +DTOOL_to_BCM +DTOOL_to_BRAKE +DTOOL_to_CLIM +DTOOL_to_CLUSTER +DTOOL_to_ECM +DTOOL_to_EPS +DTOOL_to_GCU +DTOOL_to_HLS +DTOOL_to_PAS +DTOOL_to_UCT +DTOOL_to_USM +ECM_to_DTOOL +EPS_to_DTOOL +GCU_to_DTOOL +HLS_to_DTOOL +PAS_to_DTOOL +UCT_to_DTOOL +USM_to_DTOOL +OBD_Request_84 +OBD_Response_AT_84 +YawRate_84;SCALED; diff --git a/pyren3/web_html/bus_monitor.html b/pyren3/web_html/bus_monitor.html index 551b487..39cac93 100644 --- a/pyren3/web_html/bus_monitor.html +++ b/pyren3/web_html/bus_monitor.html @@ -31,6 +31,7 @@ this.keys = msg.keys; }); socket.on("frame", (msg) => { + console.log(msg) this.values = msg.frame; }); },