Skip to content

run make format #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

run make format #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 25 additions & 23 deletions inc/adc_interface_client.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,31 @@

const uint8_t kTypeAdcInterface = 91;

class AdcInterfaceClient : public ClientAbstract {
public:
AdcInterfaceClient(uint8_t obj_idn)
: ClientAbstract(kTypeAdcInterface, obj_idn),
adc_voltage_(kTypeAdcInterface, obj_idn, kSubAdcVoltage),
raw_value_(kTypeAdcInterface, obj_idn, kSubRawValue){};

// Client Entries
ClientEntry<float> adc_voltage_;
ClientEntry<uint16_t> raw_value_;

void ReadMsg(uint8_t* rx_data, uint8_t rx_length) {
static const uint8_t kEntryLength = kSubRawValue + 1;
ClientEntryAbstract* entry_array[kEntryLength] = {
&adc_voltage_, // 0
&raw_value_ // 1
};
ParseMsg(rx_data, rx_length, entry_array, kEntryLength);
}

private:
static const uint8_t kSubAdcVoltage = 0;
static const uint8_t kSubRawValue = 1;
class AdcInterfaceClient : public ClientAbstract
{
public:
AdcInterfaceClient(uint8_t obj_idn)
: ClientAbstract(kTypeAdcInterface, obj_idn),
adc_voltage_(kTypeAdcInterface, obj_idn, kSubAdcVoltage),
raw_value_(kTypeAdcInterface, obj_idn, kSubRawValue) {};

// Client Entries
ClientEntry<float> adc_voltage_;
ClientEntry<uint16_t> raw_value_;

void ReadMsg(uint8_t *rx_data, uint8_t rx_length)
{
static const uint8_t kEntryLength = kSubRawValue + 1;
ClientEntryAbstract *entry_array[kEntryLength] = {
&adc_voltage_, // 0
&raw_value_ // 1
};
ParseMsg(rx_data, rx_length, entry_array, kEntryLength);
}

private:
static const uint8_t kSubAdcVoltage = 0;
static const uint8_t kSubRawValue = 1;
};

#endif /* ADC_INTERFACE_CLIENT_HPP_ */
77 changes: 39 additions & 38 deletions inc/anticogging_client.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,44 +20,45 @@

const uint8_t kTypeAnticogging = 71;

class AnticoggingClient: public ClientAbstract{
public:
AnticoggingClient(uint8_t obj_idn):
ClientAbstract( kTypeAnticogging, obj_idn),
table_size_( kTypeAnticogging, obj_idn, kSubTableSize),
is_data_valid_( kTypeAnticogging, obj_idn, kSubIsDataValid),
is_enabled_( kTypeAnticogging, obj_idn, kSubIsEnabled),
erase_( kTypeAnticogging, obj_idn, kSubErase),
left_shift_( kTypeAnticogging, obj_idn, kSubLeftShift)
{};

// Client Entries
ClientEntry<uint16_t> table_size_;
ClientEntry<uint8_t> is_data_valid_;
ClientEntry<uint8_t> is_enabled_;
ClientEntryVoid erase_;
ClientEntry<uint8_t> left_shift_;

void ReadMsg(uint8_t* rx_data, uint8_t rx_length)
{
static const uint8_t kEntryLength = kSubLeftShift+1;
ClientEntryAbstract* entry_array[kEntryLength] = {
&table_size_, // 0
&is_data_valid_, // 1
&is_enabled_, // 2
&erase_, // 3
&left_shift_ // 4
};

ParseMsg(rx_data, rx_length, entry_array, kEntryLength);
}

private:
static const uint8_t kSubTableSize = 0;
static const uint8_t kSubIsDataValid = 1;
static const uint8_t kSubIsEnabled = 2;
static const uint8_t kSubErase = 3;
static const uint8_t kSubLeftShift = 4;
class AnticoggingClient: public ClientAbstract
{
public:
AnticoggingClient(uint8_t obj_idn):
ClientAbstract(kTypeAnticogging, obj_idn),
table_size_(kTypeAnticogging, obj_idn, kSubTableSize),
is_data_valid_(kTypeAnticogging, obj_idn, kSubIsDataValid),
is_enabled_(kTypeAnticogging, obj_idn, kSubIsEnabled),
erase_(kTypeAnticogging, obj_idn, kSubErase),
left_shift_(kTypeAnticogging, obj_idn, kSubLeftShift)
{};

// Client Entries
ClientEntry<uint16_t> table_size_;
ClientEntry<uint8_t> is_data_valid_;
ClientEntry<uint8_t> is_enabled_;
ClientEntryVoid erase_;
ClientEntry<uint8_t> left_shift_;

void ReadMsg(uint8_t *rx_data, uint8_t rx_length)
{
static const uint8_t kEntryLength = kSubLeftShift + 1;
ClientEntryAbstract *entry_array[kEntryLength] = {
&table_size_, // 0
&is_data_valid_, // 1
&is_enabled_, // 2
&erase_, // 3
&left_shift_ // 4
};

ParseMsg(rx_data, rx_length, entry_array, kEntryLength);
}

private:
static const uint8_t kSubTableSize = 0;
static const uint8_t kSubIsDataValid = 1;
static const uint8_t kSubIsEnabled = 2;
static const uint8_t kSubErase = 3;
static const uint8_t kSubLeftShift = 4;
};

#endif // ANTICOGGING_CLIENT_H
123 changes: 62 additions & 61 deletions inc/anticogging_pro_client.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

/*
Name: anticogging_pro_client.hpp
Last update: 2023/06/29 by Ben Quan
Author: Ben Quan
Contributors:
Last update: 2023/06/29 by Ben Quan
Author: Ben Quan
Contributors:
*/

#ifndef ANTICOGGING_PRO_CLIENT_HPP
Expand All @@ -20,68 +20,69 @@

const uint8_t kTypeAnticoggingPro = 79;

class AnticoggingProClient: public ClientAbstract{
public:
AnticoggingProClient(uint8_t obj_idn):
ClientAbstract( kTypeAnticoggingPro, obj_idn),
enabled_(kTypeAnticoggingPro, obj_idn, kSubEnabled),
tau_(kTypeAnticoggingPro, obj_idn, kSubTau),
num_harmonics_(kTypeAnticoggingPro, obj_idn, kSubNumHarmonics),
voltage_(kTypeAnticoggingPro, obj_idn, kSubVoltage),
index_(kTypeAnticoggingPro, obj_idn, kSubIndex),
harmonic_(kTypeAnticoggingPro, obj_idn, kSubHarmonic),
a_(kTypeAnticoggingPro, obj_idn, kSubA),
phase_(kTypeAnticoggingPro, obj_idn, kSubPhase),
phase_total_(kTypeAnticoggingPro, obj_idn, kSubPhaseTotal),
amplitude_(kTypeAnticoggingPro, obj_idn, kSubAmplitude),
max_harmonics_(kTypeAnticoggingPro, obj_idn, kSubMaxHarmonics)
{};
class AnticoggingProClient: public ClientAbstract
{
public:
AnticoggingProClient(uint8_t obj_idn):
ClientAbstract(kTypeAnticoggingPro, obj_idn),
enabled_(kTypeAnticoggingPro, obj_idn, kSubEnabled),
tau_(kTypeAnticoggingPro, obj_idn, kSubTau),
num_harmonics_(kTypeAnticoggingPro, obj_idn, kSubNumHarmonics),
voltage_(kTypeAnticoggingPro, obj_idn, kSubVoltage),
index_(kTypeAnticoggingPro, obj_idn, kSubIndex),
harmonic_(kTypeAnticoggingPro, obj_idn, kSubHarmonic),
a_(kTypeAnticoggingPro, obj_idn, kSubA),
phase_(kTypeAnticoggingPro, obj_idn, kSubPhase),
phase_total_(kTypeAnticoggingPro, obj_idn, kSubPhaseTotal),
amplitude_(kTypeAnticoggingPro, obj_idn, kSubAmplitude),
max_harmonics_(kTypeAnticoggingPro, obj_idn, kSubMaxHarmonics)
{};

// Client Entries
ClientEntry<uint8_t> enabled_;
ClientEntry<float> tau_;
ClientEntry<uint8_t> num_harmonics_;
ClientEntry<float> voltage_;
ClientEntry<uint8_t> index_;
ClientEntry<uint8_t> harmonic_;
ClientEntry<float> a_;
ClientEntry<float> phase_;
ClientEntry<float> phase_total_;
ClientEntry<float> amplitude_;
ClientEntry<uint8_t> max_harmonics_;
// Client Entries
ClientEntry<uint8_t> enabled_;
ClientEntry<float> tau_;
ClientEntry<uint8_t> num_harmonics_;
ClientEntry<float> voltage_;
ClientEntry<uint8_t> index_;
ClientEntry<uint8_t> harmonic_;
ClientEntry<float> a_;
ClientEntry<float> phase_;
ClientEntry<float> phase_total_;
ClientEntry<float> amplitude_;
ClientEntry<uint8_t> max_harmonics_;

void ReadMsg(uint8_t* rx_data, uint8_t rx_length)
{
static const uint8_t kEntryLength = kSubMaxHarmonics+1;
ClientEntryAbstract* entry_array[kEntryLength] = {
&enabled_, // 0
&tau_, // 1
&num_harmonics_, // 2
&voltage_, // 3
&index_, // 4
&harmonic_, // 5
&a_, // 6
&phase_, // 7
&phase_total_, // 8
&amplitude_, // 9
&max_harmonics_ // 10
};
void ReadMsg(uint8_t *rx_data, uint8_t rx_length)
{
static const uint8_t kEntryLength = kSubMaxHarmonics + 1;
ClientEntryAbstract *entry_array[kEntryLength] = {
&enabled_, // 0
&tau_, // 1
&num_harmonics_, // 2
&voltage_, // 3
&index_, // 4
&harmonic_, // 5
&a_, // 6
&phase_, // 7
&phase_total_, // 8
&amplitude_, // 9
&max_harmonics_ // 10
};

ParseMsg(rx_data, rx_length, entry_array, kEntryLength);
}
ParseMsg(rx_data, rx_length, entry_array, kEntryLength);
}

private:
static const uint8_t kSubEnabled = 0;
static const uint8_t kSubTau = 1;
static const uint8_t kSubNumHarmonics = 2;
static const uint8_t kSubVoltage = 3;
static const uint8_t kSubIndex = 4;
static const uint8_t kSubHarmonic = 5;
static const uint8_t kSubA = 6;
static const uint8_t kSubPhase = 7;
static const uint8_t kSubPhaseTotal = 8;
static const uint8_t kSubAmplitude = 9;
static const uint8_t kSubMaxHarmonics = 10;
private:
static const uint8_t kSubEnabled = 0;
static const uint8_t kSubTau = 1;
static const uint8_t kSubNumHarmonics = 2;
static const uint8_t kSubVoltage = 3;
static const uint8_t kSubIndex = 4;
static const uint8_t kSubHarmonic = 5;
static const uint8_t kSubA = 6;
static const uint8_t kSubPhase = 7;
static const uint8_t kSubPhaseTotal = 8;
static const uint8_t kSubAmplitude = 9;
static const uint8_t kSubMaxHarmonics = 10;
};

#endif // ANTICOGGING_PRO_CLIENT_H
Loading