mirror of
https://github.com/esphome/esphome.git
synced 2025-03-16 07:38:17 +00:00
added mode, clock to mcp2515
This commit is contained in:
parent
12121d0d3f
commit
dd31f92c00
@ -55,7 +55,6 @@ struct can_frame {
|
||||
|
||||
class Canbus : public Component {
|
||||
public:
|
||||
|
||||
Canbus(){};
|
||||
Canbus(const std::string &name){};
|
||||
void setup() override;
|
||||
|
@ -2,25 +2,35 @@ import esphome.codegen as cg
|
||||
import esphome.config_validation as cv
|
||||
from esphome.components import spi, canbus
|
||||
from esphome.const import CONF_ID
|
||||
from esphome.components.canbus import CanbusComponent, CAN_SPEEDS, CONF_BIT_RATE
|
||||
from esphome.components.canbus import CanbusComponent
|
||||
|
||||
AUTO_LOAD = ['canbus']
|
||||
DEPENDENCIES = ['spi']
|
||||
|
||||
CONF_MCP_CLOCK = 'clock'
|
||||
CONF_MCP_MODE = 'mode'
|
||||
|
||||
mcp2515_ns = cg.esphome_ns.namespace('mcp2515')
|
||||
mcp2515 = mcp2515_ns.class_('MCP2515', CanbusComponent, spi.SPIDevice)
|
||||
CanClock = mcp2515_ns.enum('CAN_CLOCK')
|
||||
McpMode = mcp2515_ns.enum('CANCTRL_REQOP_MODE')
|
||||
|
||||
CAN_CLOCK = {
|
||||
'20MHZ': CanClock.MCP_20MHZ,
|
||||
'16MHZ': CanClock.MCP_16MHZ,
|
||||
'8MHZ': CanClock.MCP_8MHZ,
|
||||
}
|
||||
|
||||
MCP_MODE = {
|
||||
'NORMAL': McpMode.CANCTRL_REQOP_NORMAL,
|
||||
'LOOPBACK': McpMode.CANCTRL_REQOP_LOOPBACK,
|
||||
'LISTENONLY': McpMode.CANCTRL_REQOP_LISTENONLY,
|
||||
}
|
||||
|
||||
CONFIG_SCHEMA = canbus.CONFIG_SCHEMA.extend({
|
||||
cv.GenerateID(): cv.declare_id(mcp2515),
|
||||
cv.Optional(CONF_MCP_CLOCK, default='8MHZ'): cv.enum(CAN_CLOCK, upper=True),
|
||||
cv.Optional(CONF_MCP_MODE, default='NORMAL'): cv.enum(MCP_MODE, upper=True),
|
||||
}).extend(spi.SPI_DEVICE_SCHEMA)
|
||||
|
||||
|
||||
@ -28,9 +38,11 @@ def to_code(config):
|
||||
rhs = mcp2515.new()
|
||||
var = cg.Pvariable(config[CONF_ID], rhs)
|
||||
yield canbus.register_canbus(var, config)
|
||||
# canclock = CAN_CLOCK[config[CONF_MCP_CLOCK]]
|
||||
# bitrate = CAN_SPEEDS[config[CONF_BIT_RATE]]
|
||||
# cg.add(var.set_bitrate(bitrate,canclock))
|
||||
if CONF_MCP_CLOCK in config:
|
||||
canclock = CAN_CLOCK[config[CONF_MCP_CLOCK]]
|
||||
cg.add(var.set_mcp_clock(canclock))
|
||||
if CONF_MCP_MODE in config:
|
||||
mode = MCP_MODE[config[CONF_MCP_MODE]]
|
||||
cg.add(var.set_mcp_mode(mode))
|
||||
|
||||
yield spi.register_spi_device(var, config)
|
||||
|
||||
|
@ -19,21 +19,9 @@ bool MCP2515::setup_internal_() {
|
||||
|
||||
if (this->reset_() == canbus::ERROR_FAIL)
|
||||
return false;
|
||||
this->set_bitrate_(this->bit_rate_);
|
||||
this->set_normal_mode_();
|
||||
this->set_bitrate_(this->bit_rate_, this->mcp_clock_);
|
||||
this->set_mode_(this->mcp_mode_);
|
||||
ESP_LOGD(TAG, "setup done send test message");
|
||||
struct canbus::can_frame can_message;
|
||||
can_message.can_id = this->sender_id_;
|
||||
can_message.can_dlc = 8;
|
||||
can_message.data[0] = 0x00;
|
||||
can_message.data[1] = 0x01;
|
||||
can_message.data[2] = 0x02;
|
||||
can_message.data[3] = 0x03;
|
||||
can_message.data[4] = 0x04;
|
||||
can_message.data[5] = 0x05;
|
||||
can_message.data[6] = 0x06;
|
||||
can_message.data[7] = 0x07;
|
||||
this->send_message_(&can_message);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -140,16 +128,6 @@ uint8_t MCP2515::get_status_(void) {
|
||||
return i;
|
||||
}
|
||||
|
||||
canbus::ERROR MCP2515::set_config_mode_() { return set_mode_(CANCTRL_REQOP_CONFIG); }
|
||||
|
||||
canbus::ERROR MCP2515::set_listen_only_() { return set_mode_(CANCTRL_REQOP_LISTENONLY); }
|
||||
|
||||
canbus::ERROR MCP2515::set_sleep_mode_() { return set_mode_(CANCTRL_REQOP_SLEEP); }
|
||||
|
||||
canbus::ERROR MCP2515::set_loop_back_mode_() { return set_mode_(CANCTRL_REQOP_LOOPBACK); }
|
||||
|
||||
canbus::ERROR MCP2515::set_normal_mode_() { return set_mode_(CANCTRL_REQOP_NORMAL); }
|
||||
|
||||
canbus::ERROR MCP2515::set_mode_(const CANCTRL_REQOP_MODE mode) {
|
||||
modify_register_(MCP_CANCTRL, CANCTRL_REQOP, mode);
|
||||
|
||||
@ -210,7 +188,7 @@ void MCP2515::prepare_id_(uint8_t *buffer, const bool ext, const uint32_t id) {
|
||||
}
|
||||
|
||||
canbus::ERROR MCP2515::set_filter_mask_(const MASK mask, const bool ext, const uint32_t ulData) {
|
||||
canbus::ERROR res = set_config_mode_();
|
||||
canbus::ERROR res = set_mode_(CANCTRL_REQOP_CONFIG);
|
||||
if (res != canbus::ERROR_OK) {
|
||||
return res;
|
||||
}
|
||||
@ -236,7 +214,7 @@ canbus::ERROR MCP2515::set_filter_mask_(const MASK mask, const bool ext, const u
|
||||
}
|
||||
|
||||
canbus::ERROR MCP2515::set_filter_(const RXF num, const bool ext, const uint32_t ulData) {
|
||||
canbus::ERROR res = set_config_mode_();
|
||||
canbus::ERROR res = set_mode_(CANCTRL_REQOP_CONFIG);
|
||||
if (res != canbus::ERROR_OK) {
|
||||
return res;
|
||||
}
|
||||
@ -418,7 +396,7 @@ void MCP2515::clearERRIF() {
|
||||
canbus::ERROR MCP2515::set_bitrate_(canbus::CAN_SPEED can_speed) { return this->set_bitrate_(can_speed, MCP_16MHZ); }
|
||||
|
||||
canbus::ERROR MCP2515::set_bitrate_(canbus::CAN_SPEED can_speed, CAN_CLOCK can_clock) {
|
||||
canbus::ERROR error = set_config_mode_();
|
||||
canbus::ERROR error = set_mode_(CANCTRL_REQOP_CONFIG);
|
||||
if (error != canbus::ERROR_OK) {
|
||||
return error;
|
||||
}
|
||||
|
@ -57,7 +57,8 @@ class MCP2515 : public canbus::Canbus,
|
||||
spi::DATA_RATE_8MHZ> {
|
||||
public:
|
||||
MCP2515(){};
|
||||
|
||||
void set_mcp_clock(CAN_CLOCK clock) { this->mcp_clock_ = clock; };
|
||||
void set_mcp_mode(const CANCTRL_REQOP_MODE mode) { this->mcp_mode_ = mode; }
|
||||
static const struct TXBn_REGS {
|
||||
REGISTER CTRL;
|
||||
REGISTER SIDH;
|
||||
@ -72,6 +73,8 @@ class MCP2515 : public canbus::Canbus,
|
||||
} RXB[N_RXBUFFERS];
|
||||
|
||||
protected:
|
||||
CAN_CLOCK mcp_clock_{MCP_8MHZ};
|
||||
CANCTRL_REQOP_MODE mcp_mode_ = CANCTRL_REQOP_NORMAL;
|
||||
bool setup_internal_() override;
|
||||
canbus::ERROR set_mode_(const CANCTRL_REQOP_MODE mode);
|
||||
|
||||
@ -83,11 +86,6 @@ class MCP2515 : public canbus::Canbus,
|
||||
|
||||
void prepare_id_(uint8_t *buffer, const bool ext, const uint32_t id);
|
||||
canbus::ERROR reset_(void);
|
||||
canbus::ERROR set_config_mode_();
|
||||
canbus::ERROR set_listen_only_();
|
||||
canbus::ERROR set_sleep_mode_();
|
||||
canbus::ERROR set_loop_back_mode_();
|
||||
canbus::ERROR set_normal_mode_();
|
||||
canbus::ERROR set_clk_out_(const CAN_CLKOUT divisor);
|
||||
canbus::ERROR set_bitrate_(canbus::CAN_SPEED can_speed);
|
||||
canbus::ERROR set_bitrate_(canbus::CAN_SPEED can_speed, const CAN_CLOCK can_clock);
|
||||
|
Loading…
x
Reference in New Issue
Block a user