Crash_Override/ESP32_ChinaDieselHeater_Control
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

CProtocol now, not CFrame

Browse source
This commit is contained in:
rljonesau 2018-09-23 19:15:49 +10:00
parent 961c5b8b29
commit 5c1f68369a
5 changed files with 43 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
Arduino/SenderTrial2/Protocol.cpp
View file

@ -2,7 +2,7 @@
#include "Protocol.h"
unsigned short
CFrame::CalcCRC(int len)
CProtocol::CalcCRC(int len)
{
// calculate a CRC-16/MODBUS checksum using the first 22 bytes of the data array
unsigned short wCRCWord = 0xFFFF;
@ -20,13 +20,13 @@ CFrame::CalcCRC(int len)
}
void
CFrame::setCRC()
CProtocol::setCRC()
{
setCRC(CalcCRC(22));
}
void
CFrame::setCRC(unsigned short CRC)
CProtocol::setCRC(unsigned short CRC)
{
Data[22] = (CRC >> 8) & 0xff; // MSB of CRC in Data[22]
Data[23] = (CRC >> 0) & 0xff; // LSB of CRC in Data[23]
@ -34,7 +34,7 @@ CFrame::setCRC(unsigned short CRC)
unsigned short
CFrame::getCRC()
CProtocol::getCRC()
{
unsigned short CRC;
CRC = Data[22]; // MSB of CRC in Data[22]
@ -44,27 +44,27 @@ CFrame::getCRC()
// return true for CRC match
bool
CFrame::verifyCRC()
CProtocol::verifyCRC()
{
unsigned short CRC = CalcCRC(22); // calculate CRC based on first 22 bytes
return (getCRC() == CRC); // does it match the stored values?
}
CFrame&
CFrame::operator=(const CFrame& rhs)
CProtocol&
CProtocol::operator=(const CProtocol& rhs)
{
memcpy(Data, rhs.Data, 24);
return *this;
}
int
CFrame::getCommand()
CProtocol::getCommand()
{
return Controller.Command;
}
void
CFrame::setCommand(int cmd)
CProtocol::setCommand(int cmd)
{
Controller.Command = cmd;
}
@ -74,7 +74,7 @@ CFrame::setCommand(int cmd)
void
CFrame::setFan_Min(short Speed)
CProtocol::setFan_Min(short Speed)
{
// Minimum speed set
Controller.MinFanRPM_MSB = (Speed >> 8) & 0xff;
@ -82,7 +82,7 @@ CFrame::setFan_Min(short Speed)
}
void
CFrame::setFan_Max(short Speed)
CProtocol::setFan_Max(short Speed)
{
// Minimum speed set
Controller.MaxFanRPM_MSB = (Speed >> 8) & 0xff;
@ -90,7 +90,7 @@ CFrame::setFan_Max(short Speed)
}
short
CFrame::getFan_Min()
CProtocol::getFan_Min()
{
short retval;
// Minimum speed get
@ -101,7 +101,7 @@ CFrame::getFan_Min()
}
short
CFrame::getFan_Max()
CProtocol::getFan_Max()
{
short retval;
// Maximum speed get
@ -112,7 +112,7 @@ CFrame::getFan_Max()
}
short
CFrame::getFan_Actual()
CProtocol::getFan_Actual()
{
// Rx side, actual
short retval;
@ -123,7 +123,7 @@ CFrame::getFan_Actual()
}
void
CFrame::setFan_Actual(short Speed) // Heater side, actual
CProtocol::setFan_Actual(short Speed) // Heater side, actual
{
// actual speed set
Heater.FanRPM_MSB = (Speed >> 8) & 0xff;
@ -131,7 +131,7 @@ CFrame::setFan_Actual(short Speed) // Heater side, actual
}
short
CFrame::getGlowPlug_Current() // glow plug current
CProtocol::getGlowPlug_Current() // glow plug current
{
short retval;
retval = Heater.GlowPlugCurrent_MSB;
@ -141,14 +141,14 @@ CFrame::getGlowPlug_Current() // glow plug current
}
void
CFrame::setGlowPlug_Current(short ampsx100) // glow plug current
CProtocol::setGlowPlug_Current(short ampsx100) // glow plug current
{
Heater.GlowPlugCurrent_MSB = (ampsx100 >> 8) & 0xff;
Heater.GlowPlugCurrent_LSB = (ampsx100 >> 0) & 0xff;
}
short
CFrame::getGlowPlug_Voltage() // glow plug voltage
CProtocol::getGlowPlug_Voltage() // glow plug voltage
{
short retval;
retval = Heater.GlowPlugVoltage_MSB;
@ -159,14 +159,14 @@ CFrame::getGlowPlug_Voltage() // glow plug voltage
void
CFrame::setGlowPlug_Voltage(short voltsx10) // glow plug voltage
CProtocol::setGlowPlug_Voltage(short voltsx10) // glow plug voltage
{
Heater.GlowPlugVoltage_MSB = (voltsx10 >> 8) & 0xff;
Heater.GlowPlugVoltage_LSB = (voltsx10 >> 0) & 0xff;
}
short
CFrame::getTemperature_HeatExchg() // temperature of heat exchanger
CProtocol::getTemperature_HeatExchg() // temperature of heat exchanger
{
short retval;
retval = Heater.HeatExchgTemp_MSB;
@ -176,14 +176,14 @@ CFrame::getTemperature_HeatExchg() // temperature of heat exchanger
}
void
CFrame::setTemperature_HeatExchg(short degC) // temperature of heat exchanger
CProtocol::setTemperature_HeatExchg(short degC) // temperature of heat exchanger
{
Heater.HeatExchgTemp_MSB = (degC >> 8) & 0xff;
Heater.HeatExchgTemp_LSB = (degC >> 0) & 0xff;
}
short
CFrame::getFan_Voltage() // temperature near inlet
CProtocol::getFan_Voltage() // temperature near inlet
{
short retval;
retval = Heater.FanVoltage_MSB;
@ -193,21 +193,21 @@ CFrame::getFan_Voltage() // temperature near inlet
}
void
CFrame::setFan_Voltage(short voltsx10) // temperature near inlet
CProtocol::setFan_Voltage(short voltsx10) // temperature near inlet
{
Heater.FanVoltage_MSB = (voltsx10 >> 8) & 0xff;
Heater.FanVoltage_LSB = (voltsx10 >> 0) & 0xff;
}
void
CFrame::setVoltage_Supply(short voltsx10)
CProtocol::setVoltage_Supply(short voltsx10)
{
Heater.SupplyV_MSB = (voltsx10 >> 8) & 0xff;
Heater.SupplyV_LSB = (voltsx10 >> 0) & 0xff;
}
short
CFrame::getVoltage_Supply()
CProtocol::getVoltage_Supply()
{
short retval = 0;
retval = Heater.SupplyV_MSB & 0xff;
@ -216,7 +216,7 @@ CFrame::getVoltage_Supply()
}
void
CFrame::Init(int FrameMode)
CProtocol::Init(int FrameMode)
{
if(FrameMode == CtrlMode) {
Controller.Byte0 = 0x76;

15
Arduino/SenderTrial2/Protocol.h
View file

@ -1,7 +1,8 @@
#ifndef _CFRAME_H_
#define _CFRAME_H_
class CFrame {
#ifndef _CPROTOCOL_H_
#define _CPROTOCOL_H_
/*"output": "c:\\Users\\ray\\AppData\\Local\\Arduino\\"
}*/
class CProtocol {
public:
union {
unsigned char Data[24];
@ -96,8 +97,8 @@ public:
};
public:
CFrame() { Init(0); };
CFrame(int TxMode) { Init(TxMode); };
CProtocol() { Init(0); };
CProtocol(int TxMode) { Init(TxMode); };
void Init(int Txmode);
// CRC handlers
unsigned short CalcCRC(int len); // calculate and set the CRC upon len bytes
@ -151,7 +152,7 @@ public:
short getTemperature_HeatExchg(); // temperature of heat exchanger
void setTemperature_HeatExchg(short degC); // temperature of heat exchanger
CFrame& operator=(const CFrame& rhs);
CProtocol& operator=(const CProtocol& rhs);
};

8
Arduino/SenderTrial2/SenderTrial2.ino
View file

@ -90,10 +90,10 @@ UARTClass& BlueTooth(Serial2);
const int TxEnbPin = 20;
CommStates CommState;
CTxManage TxManage(TxEnbPin, Serial1);
CFrame Controller; // most recent data packet received from OEM controller found on blue wire
CFrame Heater1; // data packet received from heater in response to OEM controller packet
CFrame Heater2; // data packet received from heater in response to our packet
CFrame SelfParams(CFrame::CtrlMode); // holds our local parameters, used in case on no OEM controller
CProtocol Controller; // most recent data packet received from OEM controller found on blue wire
CProtocol Heater1; // data packet received from heater in response to OEM controller packet
CProtocol Heater2; // data packet received from heater in response to our packet
CProtocol SelfParams(CProtocol::CtrlMode); // holds our local parameters, used in case on no OEM controller
long lastRxTime; // used to observe inter character delays

4
Arduino/SenderTrial2/TxManage.cpp
View file

@ -5,7 +5,7 @@ extern void SerialReport(const char* hdr, const unsigned char* pData, const char
CTxManage::CTxManage(int TxEnbPin, USARTClass& serial) :
m_Serial(serial),
m_Frame(CFrame::CtrlMode)
m_Frame(CProtocol::CtrlMode)
{
m_bOnReq = false;
m_bOffReq = false;
@ -33,7 +33,7 @@ CTxManage::RequestOff()
}
void
CTxManage::Start(const CFrame& ref, unsigned long timenow, bool self)
CTxManage::Start(const CProtocol& ref, unsigned long timenow, bool self)
{
m_Frame = ref;
// 0x78 prevents the controller showing bum information when we parrot the OEM controller

6
Arduino/SenderTrial2/TxManage.h
View file

@ -1,5 +1,5 @@
#include <Arduino.h>
#include "CFrame.h"
#include "Protocol.h"
class CTxManage
{
@ -11,13 +11,13 @@ public:
CTxManage(int TxEnbPin, USARTClass& serial);
void RequestOn();
void RequestOff();
void Start(const CFrame& ref, unsigned long timenow, bool self);
void Start(const CProtocol& ref, unsigned long timenow, bool self);
bool CheckTx(unsigned long timenow);
void Report();
void begin();
private:
CFrame m_Frame;
CProtocol m_Frame;
bool m_bOnReq;
bool m_bOffReq;
bool m_bTxPending;