siwat/espmega-pro-ecu-genrator
3
0
Fork 0
Code Pull requests Activity

Compare commits

base: siwat:9df8df1956572fa3c5e7d81f89b9476cf077687d
Branches Tags
siwat:main
..
compare: siwat:c7cfaeb98b9ce2dbb569ffba9f02e3bb34fa7b58
Branches Tags
siwat:main

No commits in common. "9df8df1956572fa3c5e7d81f89b9476cf077687d" and "c7cfaeb98b9ce2dbb569ffba9f02e3bb34fa7b58" have entirely different histories.
9df8df1956 ... c7cfaeb98b

2 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/GasolineGenerator.cpp
View file

@ -2,6 +2,7 @@
GasolineGenerator::GasolineGenerator() GasolineGenerator::GasolineGenerator()
{ {
} }
/** /**
@ -13,7 +14,7 @@ GasolineGenerator::GasolineGenerator()
* @param outputCard The digital output card used for controlling the generator components * @param outputCard The digital output card used for controlling the generator components
* @param config The configuration settings for the generator, pins are of input and output cards specified earlier. * @param config The configuration settings for the generator, pins are of input and output cards specified earlier.
*/ */
void GasolineGenerator::initialize(DigitalInputCard *inputCard, DigitalOutputCard *outputCard, const GasolineGeneratorConfig &config) void GasolineGenerator::initialize(DigitalInputCard* inputCard, DigitalOutputCard* outputCard, const GasolineGeneratorConfig &config)
{ {
this->config = &config; this->config = &config;
this->inputCard = inputCard; this->inputCard = inputCard;
@ -47,7 +48,7 @@ void GasolineGenerator::initialize(DigitalInputCard *inputCard, DigitalOutputCar
*/ */
void GasolineGenerator::loop() void GasolineGenerator::loop()
{ {
unsigned long currentTime = (xTaskGetTickCount() * 1000) / configTICK_RATE_HZ; unsigned long currentTime = millis();
switch (state) switch (state)
{ {
@ -95,7 +96,7 @@ void GasolineGenerator::start()
} }
state = GeneratorState::STARTING; state = GeneratorState::STARTING;
startupStartTime = (xTaskGetTickCount() * 1000) / configTICK_RATE_HZ; startupStartTime = millis();
ignitionStartTime = 0; ignitionStartTime = 0;
isEngineRunning = false; isEngineRunning = false;
starterEngaged = false; starterEngaged = false;
@ -105,7 +106,7 @@ void GasolineGenerator::start()
// Step 2: Power up ignition system // Step 2: Power up ignition system
setIgnitionSystem(true); setIgnitionSystem(true);
ignitionStartTime = (xTaskGetTickCount() * 1000) / configTICK_RATE_HZ; ignitionStartTime = millis();
} }
/** /**

6
src/GasolineGenerator.hpp
View file

@ -28,14 +28,14 @@ struct GasolineGeneratorConfig
* @brief Enumeration for the generator states. * @brief Enumeration for the generator states.
* This enum defines the possible states of the gasoline generator. * This enum defines the possible states of the gasoline generator.
*/ */
enum class GeneratorState enum class GeneratorState {
{
STOPPED, STOPPED,
STARTING, STARTING,
RUNNING, RUNNING,
SHUTTING_DOWN SHUTTING_DOWN
}; };
/** /**
* @brief Gasoline Generator class for managing a gasoline-powered generator. * @brief Gasoline Generator class for managing a gasoline-powered generator.
* *
@ -48,7 +48,7 @@ class GasolineGenerator
{ {
public: public:
GasolineGenerator(); GasolineGenerator();
void initialize(DigitalInputCard *inputCard, DigitalOutputCard *outputCard, const GasolineGeneratorConfig &config); void initialize(DigitalInputCard* inputCard, DigitalOutputCard* outputCard, const GasolineGeneratorConfig &config);
void loop(); void loop();
void start(); void start();
void shutdown(); void shutdown();