auto-sync
This commit is contained in:
parent
8ebb83b92a
commit
cf287775d4
|
@ -47,16 +47,19 @@ void MenuTree::nextItem(void) {
|
||||||
topVisible = topVisible->next;
|
topVisible = topVisible->next;
|
||||||
}
|
}
|
||||||
|
|
||||||
MenuItem::MenuItem(MenuItem * parent, const char *text, VoidCallback callback) : MenuItem(parent, LL_STRING, text, callback) {
|
MenuItem::MenuItem(MenuItem * parent, const char *text, VoidCallback callback) {
|
||||||
|
baseConstructor(parent, LL_STRING, text, callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
MenuItem::MenuItem(MenuItem * parent, const char *text) : MenuItem(parent, LL_STRING, text, NULL) {
|
MenuItem::MenuItem(MenuItem * parent, const char *text) {
|
||||||
|
baseConstructor(parent, LL_STRING, text, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
MenuItem::MenuItem(MenuItem * parent, lcd_line_e lcdLine) : MenuItem(parent, lcdLine, NULL, NULL) {
|
MenuItem::MenuItem(MenuItem * parent, lcd_line_e lcdLine) {
|
||||||
|
baseConstructor(parent, lcdLine, NULL, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
MenuItem::MenuItem(MenuItem * parent, lcd_line_e lcdLine, const char *text, VoidCallback callback) {
|
void MenuItem::baseConstructor(MenuItem * parent, lcd_line_e lcdLine, const char *text, VoidCallback callback) {
|
||||||
this->parent = parent;
|
this->parent = parent;
|
||||||
this->lcdLine = lcdLine;
|
this->lcdLine = lcdLine;
|
||||||
this->text = text;
|
this->text = text;
|
||||||
|
|
|
@ -42,7 +42,7 @@ typedef void (*VoidCallback)(void);
|
||||||
|
|
||||||
class MenuItem {
|
class MenuItem {
|
||||||
public:
|
public:
|
||||||
MenuItem(MenuItem * parent, lcd_line_e lcdLine, const char *text, VoidCallback callback);
|
void baseConstructor(MenuItem * parent, lcd_line_e lcdLine, const char *text, VoidCallback callback);
|
||||||
MenuItem(MenuItem * parent, const char *text, VoidCallback callback);
|
MenuItem(MenuItem * parent, const char *text, VoidCallback callback);
|
||||||
MenuItem(MenuItem * parent, const char *text);
|
MenuItem(MenuItem * parent, const char *text);
|
||||||
MenuItem(MenuItem * parent, lcd_line_e lcdLine);
|
MenuItem(MenuItem * parent, lcd_line_e lcdLine);
|
||||||
|
|
|
@ -21,13 +21,18 @@ void single_wave_s::init(pin_state_t *pinStates) {
|
||||||
this->pinStates = pinStates;
|
this->pinStates = pinStates;
|
||||||
}
|
}
|
||||||
|
|
||||||
multi_wave_s::multi_wave_s() {
|
void multi_wave_s::baseConstructor() {
|
||||||
waves = NULL;
|
waves = NULL;
|
||||||
switchTimes = NULL;
|
switchTimes = NULL;
|
||||||
reset();
|
reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
multi_wave_s::multi_wave_s(float *switchTimes, single_wave_s *waves) : multi_wave_s() {
|
multi_wave_s::multi_wave_s() {
|
||||||
|
baseConstructor();
|
||||||
|
}
|
||||||
|
|
||||||
|
multi_wave_s::multi_wave_s(float *switchTimes, single_wave_s *waves) {
|
||||||
|
baseConstructor();
|
||||||
init(switchTimes, waves);
|
init(switchTimes, waves);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -39,6 +39,7 @@ class TriggerShape;
|
||||||
|
|
||||||
class multi_wave_s {
|
class multi_wave_s {
|
||||||
public:
|
public:
|
||||||
|
void baseConstructor();
|
||||||
multi_wave_s();
|
multi_wave_s();
|
||||||
multi_wave_s(float *st, single_wave_s *waves);
|
multi_wave_s(float *st, single_wave_s *waves);
|
||||||
void init(float *st, single_wave_s *waves);
|
void init(float *st, single_wave_s *waves);
|
||||||
|
|
|
@ -22,8 +22,7 @@ SimplePwm::SimplePwm() {
|
||||||
sr[0] = waveInstance;
|
sr[0] = waveInstance;
|
||||||
init(_switchTimes, sr);
|
init(_switchTimes, sr);
|
||||||
}
|
}
|
||||||
|
void PwmConfig::baseConstructor() {
|
||||||
PwmConfig::PwmConfig() {
|
|
||||||
memset(&scheduling, 0, sizeof(scheduling));
|
memset(&scheduling, 0, sizeof(scheduling));
|
||||||
memset(&safe, 0, sizeof(safe));
|
memset(&safe, 0, sizeof(safe));
|
||||||
scheduling.name = "PwmConfig";
|
scheduling.name = "PwmConfig";
|
||||||
|
@ -34,7 +33,12 @@ PwmConfig::PwmConfig() {
|
||||||
stateChangeCallback = NULL;
|
stateChangeCallback = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
PwmConfig::PwmConfig(float *st, single_wave_s *waves) : PwmConfig() {
|
PwmConfig::PwmConfig() {
|
||||||
|
baseConstructor();
|
||||||
|
}
|
||||||
|
|
||||||
|
PwmConfig::PwmConfig(float *st, single_wave_s *waves) {
|
||||||
|
baseConstructor();
|
||||||
multiWave.init(st, waves);
|
multiWave.init(st, waves);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -43,6 +43,7 @@ class PwmConfig {
|
||||||
public:
|
public:
|
||||||
PwmConfig();
|
PwmConfig();
|
||||||
PwmConfig(float *switchTimes, single_wave_s *waves);
|
PwmConfig(float *switchTimes, single_wave_s *waves);
|
||||||
|
void baseConstructor();
|
||||||
void init(float *switchTimes, single_wave_s *waves);
|
void init(float *switchTimes, single_wave_s *waves);
|
||||||
|
|
||||||
void weComplexInit(const char *msg,
|
void weComplexInit(const char *msg,
|
||||||
|
|
|
@ -28,6 +28,7 @@ AdcDevice::AdcDevice(ADCConversionGroup* hwConfig) {
|
||||||
hwConfig->sqr1 = 0;
|
hwConfig->sqr1 = 0;
|
||||||
hwConfig->sqr2 = 0;
|
hwConfig->sqr2 = 0;
|
||||||
hwConfig->sqr3 = 0;
|
hwConfig->sqr3 = 0;
|
||||||
|
memset(hardwareIndexByIndernalAdcIndex, 0, sizeof(hardwareIndexByIndernalAdcIndex));
|
||||||
memset(internalAdcIndexByHardwareIndex, 0xFFFFFFFF, sizeof(internalAdcIndexByHardwareIndex));
|
memset(internalAdcIndexByHardwareIndex, 0xFFFFFFFF, sizeof(internalAdcIndexByHardwareIndex));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -386,7 +386,7 @@ void initIntermediateLoggingBuffer(void) {
|
||||||
|
|
||||||
#endif /* ! EFI_UNIT_TEST */
|
#endif /* ! EFI_UNIT_TEST */
|
||||||
|
|
||||||
Logging::Logging() {
|
void Logging::baseConstructor() {
|
||||||
name = NULL;
|
name = NULL;
|
||||||
buffer = NULL;
|
buffer = NULL;
|
||||||
linePointer = NULL;
|
linePointer = NULL;
|
||||||
|
@ -394,7 +394,12 @@ Logging::Logging() {
|
||||||
isInitialized = false;
|
isInitialized = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
Logging::Logging(char const *name, char *buffer, int bufferSize) : Logging() {
|
Logging::Logging() {
|
||||||
|
baseConstructor();
|
||||||
|
}
|
||||||
|
|
||||||
|
Logging::Logging(char const *name, char *buffer, int bufferSize) {
|
||||||
|
baseConstructor();
|
||||||
#if ! EFI_UNIT_TEST
|
#if ! EFI_UNIT_TEST
|
||||||
initLoggingExt(this, "settings control", buffer, bufferSize);
|
initLoggingExt(this, "settings control", buffer, bufferSize);
|
||||||
#endif /* ! EFI_UNIT_TEST */
|
#endif /* ! EFI_UNIT_TEST */
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
// size of buffers?
|
// size of buffers?
|
||||||
class Logging {
|
class Logging {
|
||||||
public:
|
public:
|
||||||
|
void baseConstructor();
|
||||||
Logging();
|
Logging();
|
||||||
Logging(const char *name, char *buffer, int bufferSize);
|
Logging(const char *name, char *buffer, int bufferSize);
|
||||||
const char *name;
|
const char *name;
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
IntListenerArray::IntListenerArray() {
|
IntListenerArray::IntListenerArray() {
|
||||||
currentListenersCount = 0;
|
currentListenersCount = 0;
|
||||||
memset(&args, 0, sizeof(args));
|
memset(&args, 0, sizeof(args));
|
||||||
|
memset(&callbacks, 0, sizeof(callbacks));
|
||||||
}
|
}
|
||||||
|
|
||||||
void IntListenerArray::registerCallback(VoidInt handler, void *arg) {
|
void IntListenerArray::registerCallback(VoidInt handler, void *arg) {
|
||||||
|
|
Loading…
Reference in New Issue