patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix code style in Huawei files

Browse Source
This commit is contained in:
Bernhard Kaszt 2023-04-02 10:42:36 +02:00
parent c7ef661db7
commit c86c5133f0
3 changed files with 41 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/Huawei_can.h
View File

@ -89,7 +89,6 @@ private:
MCP_CAN *CAN; MCP_CAN *CAN;
uint8_t _huawei_irq; uint8_t _huawei_irq;
uint8_t _huawei_power; uint8_t _huawei_power;
}; };
extern HuaweiCanClass HuaweiCan; extern HuaweiCanClass HuaweiCan;

69
src/Huawei_can.cpp
View File

@ -14,35 +14,34 @@ HuaweiCanClass HuaweiCan;
void HuaweiCanClass::init(uint8_t huawei_miso, uint8_t huawei_mosi, uint8_t huawei_clk, uint8_t huawei_irq, uint8_t huawei_cs, uint8_t huawei_power) void HuaweiCanClass::init(uint8_t huawei_miso, uint8_t huawei_mosi, uint8_t huawei_clk, uint8_t huawei_irq, uint8_t huawei_cs, uint8_t huawei_power)
{ {
const CONFIG_T& config = Configuration.get();
const CONFIG_T& config = Configuration.get(); if (!config.Huawei_Enabled) {
return;
}
if (!config.Huawei_Enabled) { spi = new SPIClass(VSPI);
return; spi->begin(huawei_clk, huawei_miso, huawei_mosi, huawei_cs);
} pinMode(huawei_cs, OUTPUT);
digitalWrite(huawei_cs, HIGH);
spi = new SPIClass(VSPI);
spi->begin(huawei_clk, huawei_miso, huawei_mosi, huawei_cs);
pinMode(huawei_cs, OUTPUT);
digitalWrite(huawei_cs, HIGH);
pinMode(huawei_irq, INPUT_PULLUP); pinMode(huawei_irq, INPUT_PULLUP);
_huawei_irq = huawei_irq; _huawei_irq = huawei_irq;
CAN = new MCP_CAN(spi, huawei_cs); CAN = new MCP_CAN(spi, huawei_cs);
if(CAN->begin(MCP_ANY, CAN_125KBPS, MCP_8MHZ) == CAN_OK) { if(CAN->begin(MCP_ANY, CAN_125KBPS, MCP_8MHZ) == CAN_OK) {
MessageOutput.println("MCP2515 Initialized Successfully!"); MessageOutput.println("MCP2515 Initialized Successfully!");
} }
else { else {
MessageOutput.println("Error Initializing MCP2515..."); MessageOutput.println("Error Initializing MCP2515...");
} }
CAN->setMode(MCP_NORMAL); // Change to normal mode to allow messages to be transmitted // Change to normal mode to allow messages to be transmitted
CAN->setMode(MCP_NORMAL);
pinMode(huawei_power, OUTPUT);
digitalWrite(huawei_power,HIGH);
_huawei_power = huawei_power;
pinMode(huawei_power, OUTPUT);
digitalWrite(huawei_power, HIGH);
_huawei_power = huawei_power;
} }
RectifierParameters_t * HuaweiCanClass::get() RectifierParameters_t * HuaweiCanClass::get()
@ -60,13 +59,12 @@ uint8_t data[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
void HuaweiCanClass::sendRequest() void HuaweiCanClass::sendRequest()
{ {
if (previousMillis < millis()) { if (previousMillis < millis()) {
// Send extended message // Send extended message
byte sndStat = CAN->sendMsgBuf(0x108040FE, 1, 8, data); byte sndStat = CAN->sendMsgBuf(0x108040FE, 1, 8, data);
if(sndStat == CAN_OK){ if(sndStat == CAN_OK) {
MessageOutput.println("Message Sent Successfully!"); MessageOutput.println("Message Sent Successfully!");
} else { } else {
MessageOutput.println("Error Sending Message..."); MessageOutput.println("Error Sending Message...");
} }
previousMillis += 5000; previousMillis += 5000;
@ -96,7 +94,8 @@ void HuaweiCanClass::onReceive(uint8_t* frame, uint8_t len)
case R48xx_DATA_OUTPUT_POWER: case R48xx_DATA_OUTPUT_POWER:
_rp.output_power = value / 1024.0; _rp.output_power = value / 1024.0;
lastUpdate = millis(); // We'll only update last update on the important params // We'll only update last update on the important params
lastUpdate = millis();
break; break;
case R48xx_DATA_EFFICIENCY: case R48xx_DATA_EFFICIENCY:
@ -159,8 +158,8 @@ void HuaweiCanClass::loop()
return; return;
} }
if(!digitalRead(_huawei_irq)) // If CAN_INT pin is low, read receive buffer if (!digitalRead(_huawei_irq)) {
{ // If CAN_INT pin is low, read receive buffer
CAN->readMsgBuf(&rxId, &len, rxBuf); // Read data: len = data length, buf = data byte(s) CAN->readMsgBuf(&rxId, &len, rxBuf); // Read data: len = data length, buf = data byte(s)
if((rxId & 0x80000000) == 0x80000000) { // Determine if ID is standard (11 bits) or extended (29 bits) if((rxId & 0x80000000) == 0x80000000) { // Determine if ID is standard (11 bits) or extended (29 bits)
@ -191,15 +190,13 @@ void HuaweiCanClass::setValue(float in, uint8_t parameterType)
// Send extended message // Send extended message
byte sndStat = CAN->sendMsgBuf(0x108180FE, 1, 8, data); byte sndStat = CAN->sendMsgBuf(0x108180FE, 1, 8, data);
if(sndStat == CAN_OK){ if (sndStat == CAN_OK) {
MessageOutput.println("Message Sent Successfully!"); MessageOutput.println("Message Sent Successfully!");
} else { } else {
MessageOutput.println("Error Sending Message..."); MessageOutput.println("Error Sending Message...");
} }
} }
void HuaweiCanClass::setPower(bool power) { void HuaweiCanClass::setPower(bool power) {
digitalWrite(_huawei_power, !power); digitalWrite(_huawei_power, !power);
} }

16
src/WebApi_Huawei.cpp
View File

@ -255,14 +255,14 @@ void WebApiHuaweiClass::onAdminPost(AsyncWebServerRequest* request)
const PinMapping_t& pin = PinMapping.get(); const PinMapping_t& pin = PinMapping.get();
if (config.Huawei_Enabled) { if (config.Huawei_Enabled) {
MessageOutput.println(F("Initialize Huawei AC charger interface... ")); MessageOutput.println(F("Initialize Huawei AC charger interface... "));
if (PinMapping.isValidHuaweiConfig()) { if (PinMapping.isValidHuaweiConfig()) {
MessageOutput.printf("Huawei AC-charger miso = %d, mosi = %d, clk = %d, irq = %d, cs = %d, power_pin = %d\r\n", pin.huawei_miso, pin.huawei_mosi, pin.huawei_clk, pin.huawei_irq, pin.huawei_cs, pin.huawei_power); MessageOutput.printf("Huawei AC-charger miso = %d, mosi = %d, clk = %d, irq = %d, cs = %d, power_pin = %d\r\n", pin.huawei_miso, pin.huawei_mosi, pin.huawei_clk, pin.huawei_irq, pin.huawei_cs, pin.huawei_power);
HuaweiCan.init(pin.huawei_miso, pin.huawei_mosi, pin.huawei_clk, pin.huawei_irq, pin.huawei_cs, pin.huawei_power); HuaweiCan.init(pin.huawei_miso, pin.huawei_mosi, pin.huawei_clk, pin.huawei_irq, pin.huawei_cs, pin.huawei_power);
MessageOutput.println(F("done")); MessageOutput.println(F("done"));
} else { } else {
MessageOutput.println(F("Invalid pin config")); MessageOutput.println(F("Invalid pin config"));
} }
} }
HuaweiCan.setPower(config.Huawei_Enabled); HuaweiCan.setPower(config.Huawei_Enabled);