调整支持HEX烧录功能

tao_z

2022-07-20 14a1ed561791fbc2357cb37206a1c0e73a97abc2

 Shifter.py

@@ -3,7 +3,9 @@
from udsoncan import DidCodec

import configparser
from dbc import *
import cantools

ProjectDBC = cantools.database.load_file("DBC/SX7H.dbc")


class AsciiCodec(DidCodec):
@@ -138,9 +140,9 @@
class ShifterClass():

    def __init__(self):
        self.position = ShifterPosition(0)
        self.Pbutton = 0
        self.UnlockButton = 0
        self.position = None
        self.Pbutton = None
        self.UnlockButton = None
        self.Voltage = 0
        self.canid = ShifterCANID()

@@ -172,6 +174,12 @@
            0xF197: AsciiCodec(8),
            0xF15a: AsciiCodec(10),
            0xF15B: AsciiCodec(10),
            0xDF00: PartNumberCodec(1),
            0xDF01: PartNumberCodec(2),
            0xDF02: PartNumberCodec(1),
            0xDF03: PartNumberCodec(3),
            0xDF04: PartNumberCodec(3),
            0x1000: PartNumberCodec(2),
        }
        try:
            config = configparser.ConfigParser()
@@ -185,14 +193,115 @@
            self.canid.phy_rxId = 0x742
            self.canid.fun_rxId = 0x7df
            self.canid.normalid = 0x420
        self.dbc = DBC("DBC/DFLZM.dbc")
        self.SA1_message = ProjectDBC.get_message_by_name('SA1')

    def FramUnpack(self, id=0x420, frame=[]):
        data = ' '.join(['{:0<2x}'.format(a).upper() for a in list(frame)])
        unpackframe = self.dbc.analyzer(msgid=0x420, data=str(data))
        # print(unpackframe[5]['value']['raw'])
        self.Pbutton = unpackframe[5]['value']['phy']
        # print(unpackframe[6]['value']['raw'])
        self.UnlockButton = unpackframe[4]['value']['phy']
        # print(unpackframe[4]['value']['raw'])
        self.position = unpackframe[7]['value']['phy']
        input_signal = ProjectDBC.decode_message(id, frame)
        # part_str = str(input_signal['SA1_Status_ParkButtonReq'])
        # print(type(part_str))
        # if input_signal['SA1_Status_ParkButtonReq'] == 'No request':
        #     print('yes')
        # print(SA1_Status_ParkButtonReq_dic[part_str])
        self.Pbutton = SA1_Status_ParkButtonReq_dic[str(
            input_signal['SA1_Status_ParkButtonReq'])]
        self.UnlockButton = SA1_Status_UnlockButtonReq_dic[str(
            input_signal['SA1_Status_UnlockButtonReq'])]
        self.position = SA1_Status_GearShftPosReq_dic[str(
            input_signal['SA1_Status_GearShftPosReq'])]

    def PackFrame(self, dic):
        data = self.SA1_message.encode({
            'SA1_Status_PRNDL':
            0,
            'SA1_Status_GearShftPosReq':
            SA1_Status_GearShftPosReq_dic[self.position],
            'SA1_Status_ParkButtonReq':
            SA1_Status_ParkButtonReq_dic[self.Pbutton],
            "SA1_ShifterManualSignal":
            0,
            "SA1_ShifterModeSignal":
            0,
            "SA1_Status_ShftSensSng_Fault":
            0,
            "SA1_IND_ShifterMisUsd":
            0,
            "SA1_Live_counter":
            1,
            "SA1_Status_UnlockButtonReq":
            SA1_Status_UnlockButtonReq_dic[self.UnlockButton],
            "SA1_Status_EcoShifterModeReq":
            0,
            "SA1_Status_RqGearPosInV":
            0xf,
            "SA1_Status_ShiftPosValidFlag":
            0,
        })
        return data


class VehicleClass():

    def __init__(self):
        self.Odm = 0
        self.speed = 0
        self.brake = 0
        self.ShiftLeverPos = 'P'
        self.pre_ShiftLeverPos = 'P'
        self.max_pos = 'Shifter position Zero'
        self.IC1_message = ProjectDBC.get_message_by_name('IC1')
        self.TCU2_message = ProjectDBC.get_message_by_name('TCU2')
        self.ABS1_message = ProjectDBC.get_message_by_name('ABS1')
        self.Engine2_message = ProjectDBC.get_message_by_name('Engine2')

    def pack_IC1(self, odm):
        self.Odm = odm
        data = self.IC1_message.encode({"odometer_value": odm})
        return data

    def pack_TCU2(self, shiftpos):
        #from value get key
        self.ShiftLeverPos = [
            k for k, v in TCU2_ShiterLevel_dic.items() if v == shiftpos
        ][0]
        data = self.TCU2_message.encode({
            "ShiftLeverPos": shiftpos,
            "TCUDrivingMode": 0,
            "ActualGear": 0
        })
        return data

    def pack_ABS1(self, speed):
        self.speed = speed
        data = self.ABS1_message.encode({"vehicle_speed": speed})
        return data

    def pack_Engine2(self, brake):
        self.brake = brake
        data = self.Engine2_message.encode({"brake_pedal_status ": brake})
        return data

    def ShiftLogic(self, shift: ShifterClass):
        reqpos = 0
        if shift.Pbutton == SA1_Status_ParkButtonReq_dic[
                'Driver request park button']:
            reqpos = TCU2_ShiterLevel_dic['P']
            self.pre_ShiftLeverPos = "P"
            self.max_pos = 'Shifter position Zero'
        elif (shift.position >= SA1_Status_GearShftPosReq_dic['M-']) and (
                shift.position <= SA1_Status_GearShftPosReq_dic['M']):
            reqpos = TCU2_ShiterLevel_dic['M']
            self.pre_ShiftLeverPos = "P"
            self.max_pos = 'Shifter position Zero'
        else:
            if shift.position is not SA1_Status_GearShftPosReq_dic[
                    'Shifter position Zero']:
                self.max_pos = ShiftMaxPosMap_dic[self.max_pos][shift.position]
                reqpos = GearShiftMap_dic[self.pre_ShiftLeverPos][self.max_pos]
            else:
                reqpos = GearShiftMap_dic[self.pre_ShiftLeverPos][self.max_pos]
                self.max_pos = 'Shifter position Zero'
                self.pre_ShiftLeverPos = [
                    k for k, v in TCU2_ShiterLevel_dic.items() if v == reqpos
                ][0]
        data = self.pack_TCU2(reqpos)
        return data