diff --git a/examples/raspberrypi/rp2xxx/src/rp2040_only/spi_host.zig b/examples/raspberrypi/rp2xxx/src/rp2040_only/spi_host.zig index 64afbfc8..5bed8ed5 100644 --- a/examples/raspberrypi/rp2xxx/src/rp2040_only/spi_host.zig +++ b/examples/raspberrypi/rp2xxx/src/rp2040_only/spi_host.zig @@ -11,34 +11,6 @@ const BUF_LEN = 0x100; const spi = rp2xxx.spi.instance.SPI0; // const led = gpio.num(14); -const rtt = @import("rtt"); -const rtt_instance = rtt.RTT(.{}); -var rtt_logger: ?rtt_instance.Writer = null; -pub fn log( - comptime level: std.log.Level, - comptime scope: @TypeOf(.EnumLiteral), - comptime format: []const u8, - args: anytype, -) void { - const level_prefix = comptime "[{}.{:0>6}] " ++ level.asText(); - const prefix = comptime level_prefix ++ switch (scope) { - .default => ": ", - else => " (" ++ @tagName(scope) ++ "): ", - }; - - if (rtt_logger) |writer| { - const current_time = time.get_time_since_boot(); - const seconds = current_time.to_us() / std.time.us_per_s; - const microseconds = current_time.to_us() % std.time.us_per_s; - - writer.print(prefix ++ format ++ "\r\n", .{ seconds, microseconds } ++ args) catch {}; - } -} -pub const microzig_options = .{ - .log_level = .debug, - .logFn = log, -}; - // These will change depending on which GPIO pins you have your SPI device routed to. const CS_PIN = 5; const SCK_PIN = 2; @@ -53,12 +25,6 @@ pub fn main() !void { // led.set_direction(.out); // led.put(1); - // >>RTT logging - rtt_instance.init(); - rtt_logger = rtt_instance.writer(0); - std.log.info("Hello in spi master\n", .{}); - // <>UART logging -// Using the 'default' pins makes it closer to the pico-examples behaviour and thus more one-to-one comparable. const uart = rp2xxx.uart.instance.num(0); const baud_rate = 115200; const uart_tx_pin = gpio.num(0); -const uart_rx_pin = gpio.num(1); -// <2}", .{byte}); - } - std.log.info("\n", .{}); -} - pub fn main() !void { - led.set_function(.sio); - led.set_direction(.out); - led.put(1); - inline for (.{ led_red, led_green, led_blue }) |p| { - p.set_function(.sio); - p.set_direction(.out); - p.put(1); - } - // Set pin functions for CS, SCK, MOSI, MISO - // TODO Should we wait on csn manually + // Set pin functions for CS, SCK, RX const csn = gpio.num(CS_PIN); - // csn.set_function(.sio); - // csn.set_direction(.in); const mosi = gpio.num(RX_PIN); const sck = gpio.num(SCK_PIN); - // inline for (&.{ mosi, miso, sck }) |pin| { - inline for (&.{ csn, mosi, miso, sck }) |pin| { + inline for (&.{ csn, mosi, sck }) |pin| { pin.set_function(.spi); } - // >>UART logging - inline for (&.{ uart_tx_pin, uart_rx_pin }) |pin| { + inline for (&.{uart_tx_pin}) |pin| { switch (chip) { .RP2040 => pin.set_function(.uart), .RP2350 => pin.set_function(.uart_first), @@ -75,54 +46,20 @@ pub fn main() !void { }); rp2xxx.uart.init_logger(uart); - // <