From 395be23d7479bc0fc5cb48d7fd9bd2cf15aa6ae7 Mon Sep 17 00:00:00 2001
From: Gregor Riepl <onitake@gmail.com>
Date: Mon, 18 Jan 2021 20:25:01 +0100
Subject: [PATCH] Implement firmware support for auto-report

---
 feedback/firmware/main.c   | 27 ++++++++++++++++++++++-----
 poweriface/firmware/main.c | 26 +++++++++++++++++---------
 2 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/feedback/firmware/main.c b/feedback/firmware/main.c
index f741c9d..50fe70f 100644
--- a/feedback/firmware/main.c
+++ b/feedback/firmware/main.c
@@ -4,6 +4,8 @@
 #include <util/delay.h>
 #include <can.h>
 
+static bool report_change = false;
+
 static void init() {
 	// Set PB as input, pull-up off
 	DDRB = 0;
@@ -15,16 +17,26 @@ static void init() {
 	// Regular receive/transmit mode
 	can_set_mode(NORMAL_MODE);
 
-	// Filter for status requests
-	can_filter_t filter = {
-		.id = 0x10,
-		.mask = 0x7ff,
+	// Filter for messages addressed to us (RTR on)
+	can_filter_t us = {
+		.id = 0x000,
+		.mask = 0x00f,
 		.flags = {
 			.rtr = 1,
 			.extended = 0,
 		},
 	};
-	can_set_filter(0, &filter);
+	can_set_filter(0, &us);
+	// Filter for public messages (RTR off)
+	can_filter_t pub = {
+		.id = 0x00f,
+		.mask = 0x00f,
+		.flags = {
+			.rtr = 0,
+			.extended = 0,
+		},
+	};
+	can_set_filter(1, &pub);
 
 	// Enable interrupts to start reception
 	sei();
@@ -65,6 +77,11 @@ static void loop() {
 				if (msg.flags.rtr) {
 					send_status();
 				}
+			case 0x4f:
+				if (msg.length == 1) {
+					report_change = msg.data[0] ? true : false;
+				}
+				break;
 			}
 		}
 	}
diff --git a/poweriface/firmware/main.c b/poweriface/firmware/main.c
index eba790e..317da88 100644
--- a/poweriface/firmware/main.c
+++ b/poweriface/firmware/main.c
@@ -4,6 +4,8 @@
 #include <util/delay.h>
 #include <can.h>
 
+static bool report_change = false;
+
 static void init() {
 	// Enable GPIO: PB2, PB3, PB4 output, low; PB5 input, pull-up on
  	PORTB = (PORTB & ~(_BV(PB2) | _BV(PB3) | _BV(PB4))) | _BV(PB5);
@@ -14,25 +16,26 @@ static void init() {
 	// Regular receive/transmit mode
 	can_set_mode(NORMAL_MODE);
 
-	// Filter for status requests and dispense commands
-	can_filter_t filter = {
-		.id = 0x11,
-		.mask = 0x7ff,
+	// Filter for messages addressed to us (RTR on)
+	can_filter_t us = {
+		.id = 0x001,
+		.mask = 0x00f,
 		.flags = {
 			.rtr = 1,
 			.extended = 0,
 		},
 	};
-	can_set_filter(0, &filter);
-	can_filter_t disp = {
-		.id = 0x21,
-		.mask = 0x7ff,
+	can_set_filter(0, &us);
+	// Filter for public messages (RTR off)
+	can_filter_t pub = {
+		.id = 0x00f,
+		.mask = 0x00f,
 		.flags = {
 			.rtr = 0,
 			.extended = 0,
 		},
 	};
-	can_set_filter(1, &disp);
+	can_set_filter(1, &pub);
 
 	// Enable interrupts to start reception
 	sei();
@@ -141,6 +144,11 @@ static void loop() {
 					// also send out the current status
 					send_status();
 				}
+			case 0x4f:
+				if (msg.length == 1) {
+					report_change = msg.data[0] ? true : false;
+				}
+				break;
 			}
 		}
 	}