ccc-basel/matemat
6
0
Fork 0
Code Issues Pull requests Releases Activity

Use symbolic message constants in firmware

Browse source
This commit is contained in:
Gregor Riepl 2021-01-19 19:30:56 +01:00
parent 677150f09b
commit 82aefc2a10
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
feedback/firmware/main.c
View file

@ -21,8 +21,8 @@ static void init() {
// Filter for messages addressed to us (RTR on) // Filter for messages addressed to us (RTR on)
can_filter_t us = { can_filter_t us = {
.id = 0x000, .id = CAN_HOSTID_FEEDBACK,
.mask = 0x00f, .mask = CAN_HOSTID_MASK,
.flags = { .flags = {
.rtr = 1, .rtr = 1,
.extended = 0, .extended = 0,
@ -31,8 +31,8 @@ static void init() {
can_set_filter(0, &us); can_set_filter(0, &us);
// Filter for public messages (RTR off) // Filter for public messages (RTR off)
can_filter_t pub = { can_filter_t pub = {
.id = 0x00f, .id = CAN_HOSTID_BROADCAST,
.mask = 0x00f, .mask = CAN_HOSTID_MASK,
.flags = { .flags = {
.rtr = 0, .rtr = 0,
.extended = 0, .extended = 0,
@ -61,7 +61,7 @@ static uint16_t get_status() {
static void send_status(uint16_t status) { static void send_status(uint16_t status) {
if (can_check_free_buffer()) { if (can_check_free_buffer()) {
can_t msg = { can_t msg = {
.id = 0x10, .id = CAN_MSG_FEEDBACK_STATUS,
.flags = { .flags = {
.rtr = 0, .rtr = 0,
}, },
@ -85,10 +85,10 @@ static void loop() {
uint8_t status = can_get_message(&msg); uint8_t status = can_get_message(&msg);
if (status != 0) { if (status != 0) {
switch (msg.id) { switch (msg.id) {
case 0x10: case CAN_MSG_FEEDBACK_STATUS:
send_status(get_status()); send_status(get_status());
break; break;
case 0x4f: case CAN_MSG_AUTO_STATUS:
if (msg.length == 1) { if (msg.length == 1) {
report_change = msg.data[0] ? true : false; report_change = msg.data[0] ? true : false;
} }

16
poweriface/firmware/main.c
View file

@ -20,8 +20,8 @@ static void init() {
// Filter for messages addressed to us (RTR on) // Filter for messages addressed to us (RTR on)
can_filter_t us = { can_filter_t us = {
.id = 0x001, .id = CAN_HOSTID_POWER,
.mask = 0x00f, .mask = CAN_HOSTID_MASK,
.flags = { .flags = {
.rtr = 1, .rtr = 1,
.extended = 0, .extended = 0,
@ -30,8 +30,8 @@ static void init() {
can_set_filter(0, &us); can_set_filter(0, &us);
// Filter for public messages (RTR off) // Filter for public messages (RTR off)
can_filter_t pub = { can_filter_t pub = {
.id = 0x00f, .id = CAN_HOSTID_BROADCAST,
.mask = 0x00f, .mask = CAN_HOSTID_MASK,
.flags = { .flags = {
.rtr = 0, .rtr = 0,
.extended = 0, .extended = 0,
@ -108,7 +108,7 @@ static void send_status() {
if (can_check_free_buffer()) { if (can_check_free_buffer()) {
can_t msg = { can_t msg = {
.id = 0x11, .id = CAN_MSG_POWER_STATUS,
.flags = { .flags = {
.rtr = 0, .rtr = 0,
}, },
@ -137,10 +137,10 @@ static void loop() {
uint8_t status = can_get_message(&msg); uint8_t status = can_get_message(&msg);
if (status != 0) { if (status != 0) {
switch (msg.id) { switch (msg.id) {
case 0x11: case CAN_MSG_POWER_STATUS:
send_status(); send_status();
break; break;
case 0x21: case CAN_MSG_POWER_DISPENSE:
if (msg.length == 1) { if (msg.length == 1) {
// stop (d0 = 0) or fire relay (d0 = 1..5) // stop (d0 = 0) or fire relay (d0 = 1..5)
fire_relay(msg.data[0]); fire_relay(msg.data[0]);
@ -148,7 +148,7 @@ static void loop() {
send_status(); send_status();
} }
break; break;
case 0x4f: case CAN_MSG_AUTO_STATUS:
if (msg.length == 1) { if (msg.length == 1) {
report_change = msg.data[0] ? true : false; report_change = msg.data[0] ? true : false;
} }