aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Scripting: adjust EFI_SkyPower for rev 0.3 protocol

Browse Source
This commit is contained in:
Andrew Tridgell 2022-10-25 09:27:15 +11:00 committed by Randy Mackay
parent d9e8d0ab19
commit 4755ca7434
1 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
libraries/AP_Scripting/drivers/EFI_SkyPower.lua
View File

@ -80,6 +80,7 @@ local EFI_SP_GEN_FN = bind_add_param('GEN_FN', 7, 0) -- generator con
local EFI_SP_MIN_RPM = bind_add_param('MIN_RPM', 8, 0) -- min RPM, for engine restart local EFI_SP_MIN_RPM = bind_add_param('MIN_RPM', 8, 0) -- min RPM, for engine restart
if EFI_SP_ENABLE:get() == 0 then if EFI_SP_ENABLE:get() == 0 then
gcs:send_text(0, string.format("EFISP: disabled"))
return return
end end
@ -101,6 +102,10 @@ end
local now_s = get_time_sec() local now_s = get_time_sec()
function C_TO_KELVIN(temp)
return temp + 273.15
end
--[[ --[[
EFI Engine Object EFI Engine Object
--]] --]]
@ -149,10 +154,9 @@ local function engine_control(_driver, _idx)
-- Temperature Data Structure -- Temperature Data Structure
local temps = {} local temps = {}
temps.egt1 = 0.0 -- Engine Gas Temperature: Sensor 1 temps.egt = 0.0 -- Exhaust Gas Temperature
temps.egt2 = 0.0 -- Engine Gas Temperature: Sensor 2 temps.cht = 0.0 -- Cylinder Head Temperature
temps.cht1 = 0.0 -- Cylinder Head Temperature: Sensor 1 temps.imt = 0.0 -- intake manifold temperature
temps.cht2 = 0.0 -- Cylinder Head Temperature: Sensor 2
-- read telemetry packets -- read telemetry packets
function self.update_telemetry() function self.update_telemetry()
@ -166,7 +170,7 @@ local function engine_control(_driver, _idx)
end end
-- All Frame IDs for this EFI Engine are in the 11-bit address space -- All Frame IDs for this EFI Engine are in the 11-bit address space
if not frame:isExtended() then if frame:isExtended() then
self.handle_EFI_packet(frame, _idx) self.handle_EFI_packet(frame, _idx)
end end
end end
@ -186,44 +190,35 @@ local function engine_control(_driver, _idx)
throttle_angle = get_uint16(frame, 4) * 0.1 throttle_angle = get_uint16(frame, 4) * 0.1
last_rpm_t = get_time_sec() last_rpm_t = get_time_sec()
elseif id == 0x101 then elseif id == 0x101 then
air_pressure = get_uint16(frame, 4) current_load = get_uint16(frame, 0) * 0.1
target_load = get_uint16(frame, 2) * 0.1
inj_time = get_uint16(frame, 4)
inj_ang = get_uint16(frame, 6) * 0.1
elseif id == 0x102 then elseif id == 0x102 then
inj_ang = get_uint16(frame, 2) * 0.1 -- unused fields
inj_time = get_uint16(frame, 4) * 0.1
elseif id == 0x104 then elseif id == 0x104 then
supply_voltage = get_uint16(frame, 0) * 0.1 supply_voltage = get_uint16(frame, 0) * 0.1
elseif id == 0x105 then ecu_temp = get_uint16(frame, 2) * 0.1
temps.cht1 = get_uint16(frame, 0) * 0.1 air_pressure = get_uint16(frame, 4)
temps.egt1 = get_uint16(frame, 4) * 0.1 fuel_consumption_lph = get_uint16(frame,6)*0.001
elseif id == 0x10A then
target_load = get_uint16(frame, 6) * 0.1
elseif id == 0x10C then
temps.cht2 = get_uint16(frame, 4) * 0.1
temps.egt2 = get_uint16(frame, 6) * 0.1
elseif id == 0x10D then
current_load = get_uint16(frame, 2) * 0.1
elseif id == 0x10F then
fuel_consumption_lph = get_uint16(frame,4)*0.1
if last_fuel_s > 0 then if last_fuel_s > 0 then
local dt = now_s - last_fuel_s local dt = now_s - last_fuel_s
local fuel_lps = fuel_consumption_lph / 3600.0 local fuel_lps = fuel_consumption_lph / 3600.0
fuel_total_l = fuel_total_l + fuel_lps * dt fuel_total_l = fuel_total_l + fuel_lps * dt
end end
last_fuel_s = now_s last_fuel_s = now_s
elseif id == 0x113 then elseif id == 0x105 then
gen.amps = get_uint16(frame, 2) * 0.01 temps.cht = get_uint16(frame, 0) * 0.1
elseif id == 0x114 then temps.imt = get_uint16(frame, 2) * 0.1
gen.rpm = get_uint16(frame, 0) temps.egt = get_uint16(frame, 4) * 0.1
elseif id == 0x115 then
gen.batt_current = get_uint16(frame, 4) * 0.01
end end
end end
-- Build and set the EFI_State that is passed into the EFI Scripting backend -- Build and set the EFI_State that is passed into the EFI Scripting backend
function self.set_EFI_State() function self.set_EFI_State()
-- Cylinder_Status -- Cylinder_Status
cylinder_state:cylinder_head_temperature(0.5 * (temps.cht1 + temps.cht2)) cylinder_state:cylinder_head_temperature(C_TO_KELVIN(temps.cht))
cylinder_state:exhaust_gas_temperature(0.5 * (temps.egt1 + temps.egt2)) cylinder_state:exhaust_gas_temperature(C_TO_KELVIN(temps.egt))
cylinder_state:ignition_timing_deg(ignition_angle) cylinder_state:ignition_timing_deg(ignition_angle)
cylinder_state:injection_time_ms(inj_time*0.001) cylinder_state:injection_time_ms(inj_time*0.001)
@ -235,6 +230,7 @@ local function engine_control(_driver, _idx)
efi_state:throttle_position_percent(math.floor(throttle_angle*100.0/90.0+0.5)) efi_state:throttle_position_percent(math.floor(throttle_angle*100.0/90.0+0.5))
efi_state:atmospheric_pressure_kpa(air_pressure*0.1) efi_state:atmospheric_pressure_kpa(air_pressure*0.1)
efi_state:ignition_voltage(supply_voltage) efi_state:ignition_voltage(supply_voltage)
efi_state:intake_manifold_temperature(C_TO_KELVIN(temps.imt))
-- copy cylinder_state to efi_state -- copy cylinder_state to efi_state
efi_state:cylinder_status(cylinder_state) efi_state:cylinder_status(cylinder_state)