andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Annotations in C++ code to produce formulas in rusEfi console #807

This commit is contained in:
rusefi 2019-06-30 09:38:51 -04:00
parent 10b8989dc8
commit ded41e5efe
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
firmware/controllers/generated/trigger_structs.h Normal file
View File

@ -0,0 +1,21 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/trigger.txt Sat Jun 29 20:53:25 EDT 2019
// begin
#ifndef CONTROLLERS_GENERATED_TRIGGER_STRUCTS_H
#define CONTROLLERS_GENERATED_TRIGGER_STRUCTS_H
#include "rusefi_types.h"
#define HW_EVENT_TYPES 6
// start of trigger_central_s
struct trigger_central_s {
trigger_central_s();
/**
* offset 0
*/
int hwEventCounters[HW_EVENT_TYPES];
/** total size 24*/
};
typedef struct trigger_central_s trigger_central_s;
#endif
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/trigger.txt Sat Jun 29 20:53:25 EDT 2019

6
firmware/controllers/trigger/trigger_central.cpp
View File

@ -24,7 +24,11 @@
#include "rpm_calculator.h" #include "rpm_calculator.h"
TriggerCentral::TriggerCentral() : hwEventCounters() { trigger_central_s::trigger_central_s() : hwEventCounters() {
}
TriggerCentral::TriggerCentral() : trigger_central_s() {
// we need this initial to have not_running at first invocation // we need this initial to have not_running at first invocation
previousShaftEventTimeNt = (efitimems_t) -10 * US2NT(US_PER_SECOND_LL); previousShaftEventTimeNt = (efitimems_t) -10 * US2NT(US_PER_SECOND_LL);

6
firmware/controllers/trigger/trigger_central.h
View File

@ -11,20 +11,19 @@
#include "rusefi_enums.h" #include "rusefi_enums.h"
#include "listener_array.h" #include "listener_array.h"
#include "trigger_decoder.h" #include "trigger_decoder.h"
#include "trigger_structs.h"
class Engine; class Engine;
typedef void (*ShaftPositionListener)(trigger_event_e signal, uint32_t index DECLARE_ENGINE_PARAMETER_SUFFIX); typedef void (*ShaftPositionListener)(trigger_event_e signal, uint32_t index DECLARE_ENGINE_PARAMETER_SUFFIX);
#define HAVE_CAM_INPUT() engineConfiguration->camInput != GPIO_UNASSIGNED #define HAVE_CAM_INPUT() engineConfiguration->camInput != GPIO_UNASSIGNED
#define HW_EVENT_TYPES 6
/** /**
* Maybe merge TriggerCentral and TriggerState classes into one class? * Maybe merge TriggerCentral and TriggerState classes into one class?
* Probably not: we have an instance of TriggerState which is used for trigger initialization, * Probably not: we have an instance of TriggerState which is used for trigger initialization,
* also composition probably better than inheritance here * also composition probably better than inheritance here
*/ */
class TriggerCentral { class TriggerCentral : public trigger_central_s {
public: public:
TriggerCentral(); TriggerCentral();
void addEventListener(ShaftPositionListener handler, const char *name, Engine *engine); void addEventListener(ShaftPositionListener handler, const char *name, Engine *engine);
@ -49,7 +48,6 @@ public:
volatile efitime_t previousShaftEventTimeNt; volatile efitime_t previousShaftEventTimeNt;
private: private:
IntListenerArray<15> triggerListeneres; IntListenerArray<15> triggerListeneres;
int hwEventCounters[HW_EVENT_TYPES];
// Used by 'useNoiselessTriggerDecoder', see handleShaftSignal() // Used by 'useNoiselessTriggerDecoder', see handleShaftSignal()
efitick_t lastSignalTimes[HW_EVENT_TYPES]; efitick_t lastSignalTimes[HW_EVENT_TYPES];