aboutsummaryrefslogtreecommitdiff
path: root/main/i2c.c
diff options
context:
space:
mode:
Diffstat (limited to 'main/i2c.c')
-rw-r--r--main/i2c.c25
1 files changed, 19 insertions, 6 deletions
diff --git a/main/i2c.c b/main/i2c.c
index f366793..2237b4d 100644
--- a/main/i2c.c
+++ b/main/i2c.c
@@ -8,14 +8,31 @@
#include "i2c.h"
#include "pb-mod.h"
-#include "pbdrv.h"
#include "config.h"
#include "pb-buf.h"
#include "pb-send.h"
+// stolen from lib/pico-sdk/src/rp2_common/hardware_i2c/i2c.c
+#define i2c_reserved_addr(addr) (((addr) & 0x78) == 0 || ((addr) & 0x78) == 0x78)
+
i2c_addr_t modules[CFG_PB_MOD_MAX];
size_t modules_size = 0;
+static void bus_scan() {
+ pb_buf_t buf = pb_send_magic_req();
+
+ // check for all 7-bit addresses
+ uint16_t addr_max = 1 << 7;
+ for (uint16_t addr = 0x00; addr < addr_max; addr++) {
+ if (i2c_reserved_addr(addr)) continue;
+ if (addr == PB_MOD_ADDR) continue;
+
+ pb_i2c_send(addr, (uint8_t *) buf.data, buf.size);
+ }
+
+ pb_buf_free(&buf);
+}
+
static void state_exchange() {
for (size_t i = 0; i < modules_size; i++) {
pb_buf_t buf = pb_send_state_req();
@@ -28,16 +45,12 @@ void bus_task() {
// do a scan of the bus
bus_scan();
- // FIXME: this should be removed (see handover: RP2040 I2C limitations)
- // wait for 5 seconds until all handshake responses are received
- pb_mod_blocking_delay_ms(5e3);
-
while(1) {
// send my state to all puzzle modules
state_exchange();
// wait 1 second
- pb_mod_blocking_delay_ms(1e3);
+ vTaskDelay(1e3 / portTICK_PERIOD_MS);
}
}