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

Compare commits

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

2 commits
c7cfaeb98b ... 9df8df1956

Author SHA1 Message Date
Siwat Sirichai
9df8df1956 Merge branch 'main' of https://git.siwatsystem.com/siwat/espmega-pro-ecu-genrator 2025-06-10 22:03:12 +07:00
Siwat Sirichai
73068f7b1f millis gen 2025-06-10 22:02:30 +07:00
2 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/GasolineGenerator.cpp
View file

@ -2,7 +2,6 @@
GasolineGenerator::GasolineGenerator()
{
}
/**
@ -14,7 +13,7 @@ GasolineGenerator::GasolineGenerator()
* @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.
*/
void GasolineGenerator::initialize(DigitalInputCard* inputCard, DigitalOutputCard* outputCard, const GasolineGeneratorConfig &config)
void GasolineGenerator::initialize(DigitalInputCard *inputCard, DigitalOutputCard *outputCard, const GasolineGeneratorConfig &config)
{
this->config = &config;
this->inputCard = inputCard;
@ -48,7 +47,7 @@ void GasolineGenerator::initialize(DigitalInputCard* inputCard, DigitalOutputCar
*/
void GasolineGenerator::loop()
{
unsigned long currentTime = millis();
unsigned long currentTime = (xTaskGetTickCount() * 1000) / configTICK_RATE_HZ;
switch (state)
{
@ -96,7 +95,7 @@ void GasolineGenerator::start()
}
state = GeneratorState::STARTING;
startupStartTime = millis();
startupStartTime = (xTaskGetTickCount() * 1000) / configTICK_RATE_HZ;
ignitionStartTime = 0;
isEngineRunning = false;
starterEngaged = false;
@ -106,7 +105,7 @@ void GasolineGenerator::start()
// Step 2: Power up ignition system
setIgnitionSystem(true);
ignitionStartTime = millis();
ignitionStartTime = (xTaskGetTickCount() * 1000) / configTICK_RATE_HZ;
}
/**

6
src/GasolineGenerator.hpp
View file

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