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

Feature: battery interface: use HW serial 0 on ESP32-C3 or S3 (#933)

Browse Source 
this allows to use two VE.Direct interfaces, as there is no conflict
regarding HW serial port 2 after making the battery interfaces use
serial port 0 on devices with USB CDC. on those chips HW serial 0 is
free to be used since serial messages are written through the USB
interface directly.
This commit is contained in:
Bernhard Kirchen 2024-04-29 20:43:35 +02:00 committed by GitHub
parent 64738a6246
commit 4e36c8c9ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/JkBmsController.h
View File

@ -19,7 +19,9 @@ class Controller : public BatteryProvider {
void deinit() final; void deinit() final;
void loop() final; void loop() final;
std::shared_ptr<BatteryStats> getStats() const final { return _stats; } std::shared_ptr<BatteryStats> getStats() const final { return _stats; }
bool usesHwPort2() const final { return true; } bool usesHwPort2() const final {
return ARDUINO_USB_CDC_ON_BOOT != 1;
}
private: private:
enum class Status : unsigned { enum class Status : unsigned {

4
include/VictronSmartShunt.h
View File

@ -9,7 +9,9 @@ public:
void deinit() final { } void deinit() final { }
void loop() final; void loop() final;
std::shared_ptr<BatteryStats> getStats() const final { return _stats; } std::shared_ptr<BatteryStats> getStats() const final { return _stats; }
bool usesHwPort2() const final { return true; } bool usesHwPort2() const final {
return ARDUINO_USB_CDC_ON_BOOT != 1;
}
private: private:
uint32_t _lastUpdate = 0; uint32_t _lastUpdate = 0;

1
lib/VeDirectFrameHandler/VeDirectFrameHandler.cpp
View File

@ -65,6 +65,7 @@ template<typename T>
void VeDirectFrameHandler<T>::init(char const* who, int8_t rx, int8_t tx, Print* msgOut, bool verboseLogging, uint16_t hwSerialPort) void VeDirectFrameHandler<T>::init(char const* who, int8_t rx, int8_t tx, Print* msgOut, bool verboseLogging, uint16_t hwSerialPort)
{ {
_vedirectSerial = std::make_unique<HardwareSerial>(hwSerialPort); _vedirectSerial = std::make_unique<HardwareSerial>(hwSerialPort);
_vedirectSerial->end(); // make sure the UART will be re-initialized
_vedirectSerial->begin(19200, SERIAL_8N1, rx, tx); _vedirectSerial->begin(19200, SERIAL_8N1, rx, tx);
_vedirectSerial->flush(); _vedirectSerial->flush();
_canSend = (tx != -1); _canSend = (tx != -1);

3
lib/VeDirectFrameHandler/VeDirectShuntController.cpp
View File

@ -5,7 +5,8 @@ VeDirectShuntController VeDirectShunt;
void VeDirectShuntController::init(int8_t rx, int8_t tx, Print* msgOut, bool verboseLogging) void VeDirectShuntController::init(int8_t rx, int8_t tx, Print* msgOut, bool verboseLogging)
{ {
VeDirectFrameHandler::init("SmartShunt", rx, tx, msgOut, verboseLogging, 2); VeDirectFrameHandler::init("SmartShunt", rx, tx, msgOut, verboseLogging,
((ARDUINO_USB_CDC_ON_BOOT != 1)?2:0));
} }
bool VeDirectShuntController::processTextDataDerived(std::string const& name, std::string const& value) bool VeDirectShuntController::processTextDataDerived(std::string const& name, std::string const& value)

3
src/JkBmsController.cpp
View File

@ -198,7 +198,7 @@ class DummySerial {
}; };
DummySerial HwSerial; DummySerial HwSerial;
#else #else
HardwareSerial HwSerial(2); HardwareSerial HwSerial((ARDUINO_USB_CDC_ON_BOOT != 1)?2:0);
#endif #endif
namespace JkBms { namespace JkBms {
@ -220,6 +220,7 @@ bool Controller::init(bool verboseLogging)
return false; return false;
} }
HwSerial.end(); // make sure the UART will be re-initialized
HwSerial.begin(115200, SERIAL_8N1, pin.battery_rx, pin.battery_tx); HwSerial.begin(115200, SERIAL_8N1, pin.battery_rx, pin.battery_tx);
HwSerial.flush(); HwSerial.flush();