Skip to content

Commit

Permalink
Merge pull request #20 from iq-motion-control/development
Browse files Browse the repository at this point in the history 
Development
  • Loading branch information
@Vertiq-Ben
Vertiq-Ben authored May 26, 2023
2 parents 23d3b2c + 1f743a1 commit 86efcfd
Showing 1 changed file with 108 additions and 86 deletions.
194 changes: 108 additions & 86 deletions src/system_control_client.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2019 IQinetics Technologies, Inc support@iq-control.com
Copyright 2023 IQinetics Technologies, Inc support@iq-control.com
This file is part of the IQ C++ API.
Expand All @@ -8,9 +8,9 @@

/*
Name: system_control_client.hpp
Last update: 3/7/2019 by Raphael Van Hoffelen
Last update: 2023/05/25 by Ben Quan
Author: Matthew Piccoli
Contributors: Raphael Van Hoffelen
Contributors: Ben Quan, Raphael Van Hoffelen
*/

#ifndef SYSTEM_CONTROL_CLIENT_H
Expand All @@ -20,104 +20,126 @@

const uint8_t kTypeSystemControl = 5;

class SystemControlClient: public ClientAbstract{
public:
SystemControlClient(uint8_t obj_idn):
ClientAbstract( kTypeSystemControl, obj_idn),
reboot_program_( kTypeSystemControl, obj_idn,kSubRebootProgram),
reboot_boot_loader_( kTypeSystemControl, obj_idn,kSubRebootBootLoader),
dev_id_( kTypeSystemControl, obj_idn, kSubDevId),
rev_id_( kTypeSystemControl, obj_idn, kSubRevId),
uid1_( kTypeSystemControl, obj_idn, kSubUid1),
uid2_( kTypeSystemControl, obj_idn, kSubUid2),
uid3_( kTypeSystemControl, obj_idn, kSubUid3),
mem_size_( kTypeSystemControl, obj_idn, kSubMemSize),
build_year_( kTypeSystemControl, obj_idn, kSubBuildYear),
build_month_( kTypeSystemControl, obj_idn, kSubBuildMonth),
build_day_( kTypeSystemControl, obj_idn, kSubBuildDay),
build_hour_( kTypeSystemControl, obj_idn, kSubBuildHour),
build_minute_( kTypeSystemControl, obj_idn, kSubBuildMinuite),
build_second_( kTypeSystemControl, obj_idn, kSubBuildSecond),
module_id_( kTypeSystemControl, obj_idn, kSubModuleId),
time_( kTypeSystemControl, obj_idn, kSubTime),
firmware_version_( kTypeSystemControl, obj_idn, kSubFirmwareVersion),
hardware_version_( kTypeSystemControl, obj_idn, kSubHardwareVersion),
electronics_version_( kTypeSystemControl, obj_idn, kSubElectronicsVersion),
firmware_valid_( kTypeSystemControl, obj_idn, kSubFirmwareValid)
{};
class SystemControlClient : public ClientAbstract {
public:
SystemControlClient(uint8_t obj_idn)
: ClientAbstract(kTypeSystemControl, obj_idn),
reboot_program_(kTypeSystemControl, obj_idn, kSubRebootProgram),
reboot_boot_loader_(kTypeSystemControl, obj_idn, kSubRebootBootLoader),
dev_id_(kTypeSystemControl, obj_idn, kSubDevId),
rev_id_(kTypeSystemControl, obj_idn, kSubRevId),
uid1_(kTypeSystemControl, obj_idn, kSubUid1),
uid2_(kTypeSystemControl, obj_idn, kSubUid2),
uid3_(kTypeSystemControl, obj_idn, kSubUid3),
mem_size_(kTypeSystemControl, obj_idn, kSubMemSize),
build_year_(kTypeSystemControl, obj_idn, kSubBuildYear),
build_month_(kTypeSystemControl, obj_idn, kSubBuildMonth),
build_day_(kTypeSystemControl, obj_idn, kSubBuildDay),
build_hour_(kTypeSystemControl, obj_idn, kSubBuildHour),
build_minute_(kTypeSystemControl, obj_idn, kSubBuildMinuite),
build_second_(kTypeSystemControl, obj_idn, kSubBuildSecond),
module_id_(kTypeSystemControl, obj_idn, kSubModuleId),
time_(kTypeSystemControl, obj_idn, kSubTime),
firmware_version_(kTypeSystemControl, obj_idn, kSubFirmwareVersion),
hardware_version_(kTypeSystemControl, obj_idn, kSubHardwareVersion),
electronics_version_(kTypeSystemControl, obj_idn, kSubElectronicsVersion),
firmware_valid_(kTypeSystemControl, obj_idn, kSubFirmwareValid),
applications_present_(kTypeSystemControl, obj_idn_, kSubApplicationsPresent),
bootloader_version_(kTypeSystemControl, obj_idn_, kSubApplicationsPresent),
upgrade_version_(kTypeSystemControl, obj_idn_, kSubUpgradeVersion),
system_clock_(kTypeSystemControl, obj_idn_, kSubSystemClock),
control_flags_(kTypeSystemControl, obj_idn_, kSubControlFlags),
pcb_version_(kTypeSystemControl, obj_idn_, kSubPcbVersion){};

// Client Entries
ClientEntryVoid reboot_program_;
ClientEntryVoid reboot_boot_loader_;
ClientEntryVoid reboot_program_;
ClientEntryVoid reboot_boot_loader_;
ClientEntry<uint16_t> dev_id_;
ClientEntry<uint16_t> rev_id_;
ClientEntry<uint32_t> uid1_;
ClientEntry<uint32_t> uid2_;
ClientEntry<uint32_t> uid3_;
ClientEntry<uint16_t> mem_size_;
ClientEntry<uint16_t> build_year_;
ClientEntry<uint8_t> build_month_;
ClientEntry<uint8_t> build_day_;
ClientEntry<uint8_t> build_hour_;
ClientEntry<uint8_t> build_minute_;
ClientEntry<uint8_t> build_second_;
ClientEntry<uint8_t> module_id_;
ClientEntry<float> time_;
ClientEntry<uint8_t> build_month_;
ClientEntry<uint8_t> build_day_;
ClientEntry<uint8_t> build_hour_;
ClientEntry<uint8_t> build_minute_;
ClientEntry<uint8_t> build_second_;
ClientEntry<uint8_t> module_id_;
ClientEntry<float> time_;
ClientEntry<uint32_t> firmware_version_;
ClientEntry<uint32_t> hardware_version_;
ClientEntry<uint32_t> electronics_version_;
ClientEntry<uint8_t> firmware_valid_;
ClientEntry<uint8_t> firmware_valid_;
ClientEntry<uint8_t> applications_present_;
ClientEntry<uint32_t> bootloader_version_;
ClientEntry<uint32_t> upgrade_version_;
ClientEntry<uint32_t> system_clock_;
ClientEntry<uint32_t> control_flags_;
ClientEntry<uint32_t> pcb_version_;

void ReadMsg(uint8_t* rx_data, uint8_t rx_length)
{
static const uint8_t kEntryLength = kSubFirmwareValid+1;
ClientEntryAbstract* entry_array[kEntryLength] = {
&reboot_program_, // 0
&reboot_boot_loader_, // 1
&dev_id_, // 2
&rev_id_, // 3
&uid1_, // 4
&uid2_, // 5
&uid3_, // 6
&mem_size_, // 7
&build_year_, // 8
&build_month_, // 9
&build_day_, // 10
&build_hour_, // 11
&build_minute_, // 12
&build_second_, // 13
&module_id_, // 14
&time_, // 15
&firmware_version_, // 16
&hardware_version_, // 17
&electronics_version_,// 18
&firmware_valid_ // 19
};
void ReadMsg(uint8_t* rx_data, uint8_t rx_length) {
static const uint8_t kEntryLength = kSubPcbVersion + 1;
ClientEntryAbstract* entry_array[kEntryLength] = {
&reboot_program_, // 0
&reboot_boot_loader_, // 1
&dev_id_, // 2
&rev_id_, // 3
&uid1_, // 4
&uid2_, // 5
&uid3_, // 6
&mem_size_, // 7
&build_year_, // 8
&build_month_, // 9
&build_day_, // 10
&build_hour_, // 11
&build_minute_, // 12
&build_second_, // 13
&module_id_, // 14
&time_, // 15
&firmware_version_, // 16
&hardware_version_, // 17
&electronics_version_, // 18
&firmware_valid_, // 19
&applications_present_, // 20
&bootloader_version_, // 21
&upgrade_version_, // 22
&system_clock_, // 23
&control_flags_, // 24
&pcb_version_ // 25
};

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

private:
static const uint8_t kSubRebootProgram = 0;
static const uint8_t kSubRebootBootLoader = 1;
static const uint8_t kSubDevId = 2;
static const uint8_t kSubRevId = 3;
static const uint8_t kSubUid1 = 4;
static const uint8_t kSubUid2 = 5;
static const uint8_t kSubUid3 = 6;
static const uint8_t kSubMemSize = 7;
static const uint8_t kSubBuildYear = 8;
static const uint8_t kSubBuildMonth = 9;
static const uint8_t kSubBuildDay = 10;
static const uint8_t kSubBuildHour = 11;
static const uint8_t kSubBuildMinuite = 12;
static const uint8_t kSubBuildSecond = 13;
static const uint8_t kSubModuleId = 14;
static const uint8_t kSubTime = 15;
static const uint8_t kSubFirmwareVersion = 16;
static const uint8_t kSubHardwareVersion = 17;
static const uint8_t kSubElectronicsVersion = 18;
static const uint8_t kSubFirmwareValid = 19;
private:
static const uint8_t kSubRebootProgram = 0;
static const uint8_t kSubRebootBootLoader = 1;
static const uint8_t kSubDevId = 2;
static const uint8_t kSubRevId = 3;
static const uint8_t kSubUid1 = 4;
static const uint8_t kSubUid2 = 5;
static const uint8_t kSubUid3 = 6;
static const uint8_t kSubMemSize = 7;
static const uint8_t kSubBuildYear = 8;
static const uint8_t kSubBuildMonth = 9;
static const uint8_t kSubBuildDay = 10;
static const uint8_t kSubBuildHour = 11;
static const uint8_t kSubBuildMinuite = 12;
static const uint8_t kSubBuildSecond = 13;
static const uint8_t kSubModuleId = 14;
static const uint8_t kSubTime = 15;
static const uint8_t kSubFirmwareVersion = 16;
static const uint8_t kSubHardwareVersion = 17;
static const uint8_t kSubElectronicsVersion = 18;
static const uint8_t kSubFirmwareValid = 19;
static const uint8_t kSubApplicationsPresent = 20;
static const uint8_t kSubBootloaderVersion = 21;
static const uint8_t kSubUpgradeVersion = 22;
static const uint8_t kSubSystemClock = 23;
static const uint8_t kSubControlFlags = 24;
static const uint8_t kSubPcbVersion = 25;
};

#endif // SYSTEM_CONTROL_CLIENT_H
#endif // SYSTEM_CONTROL_CLIENT_H

0 comments on commit 86efcfd

Please sign in to comment.