mirror of https://github.com/FOME-Tech/fome-fw.git
Map3D considered harmful #421
This commit is contained in:
parent
a070f26256
commit
a4897ebc09
|
@ -17,8 +17,8 @@
|
|||
#error "Unexpected OS ACCESS HERE"
|
||||
#endif
|
||||
|
||||
static boostOpenLoop_Map3D_t boostMapOpen;
|
||||
static boostOpenLoop_Map3D_t boostMapClosed;
|
||||
static Map3D<BOOST_RPM_COUNT, BOOST_LOAD_COUNT, uint8_t, uint8_t, uint8_t> boostMapOpen;
|
||||
static Map3D<BOOST_RPM_COUNT, BOOST_LOAD_COUNT, uint8_t, uint8_t, uint8_t> boostMapClosed;
|
||||
static SimplePwm boostPwmControl("boost");
|
||||
|
||||
void BoostController::init(IPwm* pwm, const ValueProvider3D* openLoopMap, const ValueProvider3D* closedLoopTargetMap, pid_s* pidParams) {
|
||||
|
|
|
@ -7,12 +7,14 @@ static GppwmChannel channels[GPPWM_CHANNELS];
|
|||
static OutputPin pins[GPPWM_CHANNELS];
|
||||
static SimplePwm outputs[GPPWM_CHANNELS];
|
||||
|
||||
using gppwm_Map3D_t = Map3D<GPPWM_RPM_COUNT, GPPWM_LOAD_COUNT, uint8_t, int16_t, int16_t>;
|
||||
|
||||
static gppwm_Map3D_t table1;
|
||||
static gppwm_Map3D_t table2;
|
||||
static gppwm_Map3D_t table3;
|
||||
static gppwm_Map3D_t table4;
|
||||
|
||||
static gppwm_Map3D_t* tables[] = {
|
||||
static gppwm_Map3D_t* const tables[] = {
|
||||
&table1,
|
||||
&table2,
|
||||
&table3,
|
||||
|
|
|
@ -118,13 +118,8 @@ private:
|
|||
float m_valueMult = 1;
|
||||
};
|
||||
|
||||
typedef Map3D<FUEL_RPM_COUNT, FUEL_LOAD_COUNT, uint8_t, uint16_t, uint16_t> lambda_Map3D_t;
|
||||
typedef Map3D<FUEL_RPM_COUNT, FUEL_LOAD_COUNT, uint16_t, uint16_t, uint16_t> fuel_Map3D_t;
|
||||
typedef Map3D<BARO_CORR_SIZE, BARO_CORR_SIZE, float, float, float> baroCorr_Map3D_t;
|
||||
typedef Map3D<PEDAL_TO_TPS_SIZE, PEDAL_TO_TPS_SIZE, uint8_t, uint8_t, uint8_t> pedal2tps_t;
|
||||
typedef Map3D<BOOST_RPM_COUNT, BOOST_LOAD_COUNT, uint8_t, uint8_t, uint8_t> boostOpenLoop_Map3D_t;
|
||||
typedef Map3D<BOOST_RPM_COUNT, BOOST_LOAD_COUNT, uint8_t, uint8_t, uint8_t> boostClosedLoop_Map3D_t;
|
||||
typedef Map3D<GPPWM_RPM_COUNT, GPPWM_LOAD_COUNT, uint8_t, int16_t, int16_t> gppwm_Map3D_t;
|
||||
typedef Map3D<FUEL_RPM_COUNT, FUEL_LOAD_COUNT, uint16_t, uint16_t, uint16_t> mapEstimate_Map3D_t;
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue