{"header":{"message":"ddc refactoring","description":null,"timestamp":"2025-07-14T21:06:05.461685Z","authors":[{}]},"hash":"TXSGLYOVYQ77EG23PAVW62MBJRHS2WTVAVNQ3NYVBDGKNMSYS7DAC","authors":[{"login":"voroskoi","key":"AcgH6gDBg6fhR9owSrWM4ozJCWBYfPb3HJuh5QT4dzuT"}],"deps":{"hashes":[["TXSGLYOVYQ77EG23PAVW62MBJRHS2WTVAVNQ3NYVBDGKNMSYS7DAC","ddc refactoring"],["AA",null],["IPLSYOCQIAQLB6HXL6YBJ5ZKKESCSRO7S7P5SF6I367M6HEJJRNQC","work-work"],["SSUJKHR6YUZAHDFNJ6I5YYYOFDD2WNQ26ESMUCBC3X3UE6XEKXKAC","add packet fifo"],["QV2QX6JBHGTRCSTNG4VEW6TMX6ACGBTBUBAX6GJ6J4O4OTJBFA2QC","add some CV stuff"]],"deps":["IPLSYOCQIAQLB6HXL6YBJ5ZKKESCSRO7S7P5SF6I367M6HEJJRNQC","SSUJKHR6YUZAHDFNJ6I5YYYOFDD2WNQ26ESMUCBC3X3UE6XEKXKAC","QV2QX6JBHGTRCSTNG4VEW6TMX6ACGBTBUBAX6GJ6J4O4OTJBFA2QC"],"known":[]},"hunks":[{"Edit":{"inode":{"change":2,"pos":50},"path":"src/main.zig","line":8,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":270}],"down_context":[{"change":2,"pos":270}],"flag":"BLOCK","start":0,"end":33,"inode":{"change":2,"pos":50}}},"contents":[{"Add":""},{"Add":"const DDC = @import(\"ddc.zig\");"}]}},{"Replacement":{"inode":{"change":2,"pos":50},"path":"src/main.zig","line":12,"ins":{"up_context":[{"change":2,"pos":297}],"down_context":[{"change":2,"pos":340}],"flag":"BLOCK","start":34,"end":78,"inode":{"change":2,"pos":50}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":297},"to":{"change":2,"start":297,"end":340},"introduced_by":2}],"inode":{"change":2,"pos":50}},"ins_contents":[{"Add":"const UART_DEV = 1;"},{"Add":"const UART_TX_GPIO = 4;"}],"del_contents":[{"Del":"const UART_DEV = 0;\nconst UART_TX_PIN = 0;\n"}]}},{"Replacement":{"inode":{"change":2,"pos":50},"path":"src/main.zig","line":16,"ins":{"up_context":[{"change":2,"pos":388}],"down_context":[{"change":2,"pos":436}],"flag":"BLOCK","start":79,"end":128,"inode":{"change":2,"pos":50}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":388},"to":{"change":2,"start":388,"end":436},"introduced_by":2}],"inode":{"change":2,"pos":50}},"ins_contents":[{"Add":"const uart_tx_pin = pico.gpio.num(UART_TX_GPIO);"}],"del_contents":[{"Del":"const uart_tx_pin = pico.gpio.num(UART_TX_PIN);\n"}]}},{"Edit":{"inode":{"change":2,"pos":50},"path":"src/main.zig","line":29,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":709},"to":{"change":4,"start":0,"end":45},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":45},"to":{"change":2,"start":709,"end":771},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":709},"to":{"change":2,"start":709,"end":771},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":771},"to":{"change":3,"start":0,"end":63},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":63},"to":{"change":2,"start":806,"end":1367},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":806},"to":{"change":2,"start":806,"end":1367},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1367},"to":{"change":3,"start":64,"end":339},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":339},"to":{"change":2,"start":1367,"end":1368},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1367},"to":{"change":2,"start":1367,"end":1368},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1368},"to":{"change":3,"start":340,"end":464},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":464},"to":{"change":4,"start":46,"end":129},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":129},"to":{"change":3,"start":464,"end":698},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":464},"to":{"change":3,"start":464,"end":698},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":698},"to":{"change":4,"start":130,"end":412},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":412},"to":{"change":3,"start":698,"end":800},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":698},"to":{"change":3,"start":698,"end":800},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":800},"to":{"change":4,"start":413,"end":445},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":445},"to":{"change":3,"start":849,"end":888},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":849},"to":{"change":3,"start":849,"end":888},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":888},"to":{"change":2,"start":1403,"end":1446},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1403},"to":{"change":2,"start":1403,"end":1446},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1446},"to":{"change":3,"start":889,"end":920},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":920},"to":{"change":2,"start":1482,"end":1565},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1482},"to":{"change":2,"start":1482,"end":1565},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1565},"to":{"change":3,"start":921,"end":957},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":957},"to":{"change":2,"start":1605,"end":1694},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1605},"to":{"change":2,"start":1605,"end":1694},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1694},"to":{"change":3,"start":958,"end":1073},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1073},"to":{"change":2,"start":1694,"end":1695},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1694},"to":{"change":2,"start":1694,"end":1695},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1695},"to":{"change":3,"start":1074,"end":1132},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1132},"to":{"change":2,"start":1758,"end":1834},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1758},"to":{"change":2,"start":1758,"end":1834},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1834},"to":{"change":3,"start":1133,"end":1233},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1233},"to":{"change":4,"start":446,"end":593},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":593},"to":{"change":2,"start":1834,"end":2706},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1233},"to":{"change":2,"start":1834,"end":2706},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1834},"to":{"change":2,"start":1834,"end":2706},"introduced_by":2}],"inode":{"change":2,"pos":50}}},"contents":[{"Del":"// TODO: extended address byte support (2.3)\n"},{"Del":"const DDC = struct {\n const PREAMBLE_MASK = 0b11111111110;\n"},{"Del":" const TIME_ONEMAX = 87 * 1000; // XXX: doble check these!\n\n"},{"Del":" // zig fmt: off\n const MASK_3BYTES = 0b1111111111_1_00000000_1_00000000_1_00000000_1;\n const COMPARE_3BYTES = 0b1111111111_0_00000000_0_00000000_0_00000000_1;\n const MASK_4BYTES = 0b1111111111_1_00000000_1_00000000_1_00000000_1_00000000_1;\n const COMPARE_4BYTES = 0b1111111111_0_00000000_0_00000000_0_00000000_0_00000000_1;\n const MASK_5BYTES = 0b1111111111_1_00000000_1_00000000_1_00000000_1_00000000_1_00000000_1;\n const COMPARE_5BYTES = 0b1111111111_0_00000000_0_00000000_0_00000000_0_00000000_0_00000000_1;\n // zig fmt: on\n"},{"Del":"\n const Speed = enum(u5) { stop, stopi, estop, estopi, step1, step2, step3, step4, step5, step6, step7, step8, step9, step10, step11, step12, step13, step14, step15, step16, step17, step18, step19, step20, step21, step22, step23, step24, step25, step26, step27, step28 };\n"},{"Del":"\n"},{"Del":" const Packet = struct {\n address: u8,\n instruction: Instruction,\n\n fn speed(self: @This()) Speed {\n"},{"Del":" // TODO: Based on CV29 we should add support for 14 step speed control\n"},{"Del":" var ret: u5 = self.instruction.speed << 1;\n ret |= self.instruction.headlight;\n return @enumFromInt(ret);\n }\n };\n\n const Direction = enum(u1) {\n backward,\n forward,\n };\n\n"},{"Del":" /// Defined in S-9.2.1, Chapter 2.3\n const InstructionType = enum(u3) {\n decoder_control,\n advanced_operating,\n speed_reverse,\n speed_forward,\n function_group1,\n function_group2,\n feature_expansion,\n cv_access,\n };\n\n"},{"Del":" const Instruction = packed struct(u8) {\n speed: u4,\n headlight: u1, // lsb of speed\n"},{"Del":" itype: InstructionType,\n"},{"Del":" };\n\n const ParserState = enum {\n"},{"Del":" preamble,\n package,\n };\n\n"},{"Del":" const BitType = enum(u1) {\n"},{"Del":" zero,\n one,\n };\n\n const BUFFER_TYPE = u32; // 10+1 + 5x(8+1)\n\n"},{"Del":" state: ParserState = .preamble,\n"},{"Del":" time: microzig.drivers.time.Absolute = @enumFromInt(0),\n buffer: BUFFER_TYPE = 0,\n"},{"Del":" packets: std.fifo.LinearFifo(Packet, .{ .Static = 8 }) = std.fifo.LinearFifo(Packet, .{ .Static = 8 }).init(),\n"},{"Del":"\n"},{"Del":" fn writeToBuffer(self: *@This(), bit: BitType) void {\n"},{"Del":" self.buffer <<= 1;\n self.buffer |= @intFromEnum(bit);\n }\n\n"},{"Del":" fn reset(self: *@This()) void {\n self.buffer = 0;\n self.state = .preamble;\n }\n\n"},{"Del":" fn listen(self: @This(), cv: *const CV) void {\n // TODO: S-9.2: handle decoder idle and reset!\n _ = self;\n _ = cv;\n }\n\n"},{"Del":" const Test = struct {\n fn sendOne() void {\n peripherals.IO_BANK0.PROC0_INTF1.modify(.{ .GPIO15_EDGE_HIGH = 1 });\n pico.time.sleep_us(DDC.TIME_ONEMAX / 2);\n peripherals.IO_BANK0.PROC0_INTF1.modify(.{ .GPIO15_EDGE_LOW = 1 });\n }\n fn sendZero() void {\n peripherals.IO_BANK0.PROC0_INTF1.modify(.{ .GPIO15_EDGE_HIGH = 1 });\n pico.time.sleep_us(DDC.TIME_ONEMAX * 2);\n peripherals.IO_BANK0.PROC0_INTF1.modify(.{ .GPIO15_EDGE_LOW = 1 });\n }\n fn sendByte(bits: u8) void {\n for (0..8) |i| {\n const msb = bits >> (7 - @as(u3, @intCast(i)));\n if (@as(u1, @truncate(msb)) == 0) {\n sendZero();\n } else {\n sendOne();\n }\n }\n }\n };\n};\n\nvar ddc = DDC{};\n\n"}]}},{"Edit":{"inode":{"change":2,"pos":50},"path":"src/main.zig","line":63,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":3837},"to":{"change":2,"start":3837,"end":3862},"introduced_by":2}],"inode":{"change":2,"pos":50}}},"contents":[{"Del":" // rising DDC signal\n"}]}},{"Replacement":{"inode":{"change":2,"pos":50},"path":"src/main.zig","line":64,"ins":{"up_context":[{"change":2,"pos":3901}],"down_context":[{"change":2,"pos":3969}],"flag":"BLOCK","start":129,"end":231,"inode":{"change":2,"pos":50}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":3901},"to":{"change":2,"start":3901,"end":3969},"introduced_by":2}],"inode":{"change":2,"pos":50}},"ins_contents":[{"Add":" ddc.signalRising();"},{"Add":" } else if (state.GPIO15_EDGE_LOW == 1) {"},{"Add":" ddc.signalFalling();"}],"del_contents":[{"Del":" ddc.time = pico.time.get_time_since_boot();\n return;\n"}]}},{"Edit":{"inode":{"change":2,"pos":50},"path":"src/main.zig","line":68,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":3975},"to":{"change":2,"start":3975,"end":4144},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4144},"to":{"change":3,"start":1234,"end":1335},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1335},"to":{"change":2,"start":4250,"end":5123},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4250},"to":{"change":2,"start":4250,"end":5123},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":5123},"to":{"change":3,"start":1336,"end":1452},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1452},"to":{"change":2,"start":5188,"end":5405},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":5188},"to":{"change":2,"start":5188,"end":5405},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":5405},"to":{"change":3,"start":1453,"end":2474},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2474},"to":{"change":2,"start":5405,"end":5454},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":5405},"to":{"change":2,"start":5405,"end":5454},"introduced_by":2}],"inode":{"change":2,"pos":50}}},"contents":[{"Del":"\n // falling DDC signal\n if (state.GPIO15_EDGE_LOW == 1) {\n const time_end = pico.time.get_time_since_boot();\n const diff = time_end.diff(ddc.time);\n"},{"Del":" const bit: DDC.BitType = if (diff.less_than(@enumFromInt(DDC.TIME_ONEMAX))) .one else .zero;\n"},{"Del":" switch (ddc.state) {\n .preamble => {\n switch (bit) {\n .one => {\n ddc.writeToBuffer(bit);\n },\n .zero => {\n ddc.writeToBuffer(bit);\n std.log.debug(\"DDC buffer: {b}\", .{ddc.buffer});\n if (ddc.buffer & DDC.PREAMBLE_MASK == DDC.PREAMBLE_MASK) {\n ddc.state = .package;\n std.log.debug(\"DDC state switched to: {}\", .{ddc.state});\n } else {\n std.log.info(\"DDC preamble is invalid: {b}\", .{ddc.buffer});\n ddc.buffer = 0;\n }\n },\n }\n },\n .package => {\n ddc.writeToBuffer(bit);\n"},{"Del":" // std.log.debug(\"DDC buffer: {b}\", .{ddc.buffer});\n\n // check for valid DCC packets\n"},{"Del":" if (ddc.buffer & @as(DDC.BUFFER_TYPE, @truncate(DDC.MASK_3BYTES)) == @as(DDC.BUFFER_TYPE, @truncate(DDC.COMPARE_3BYTES))) {\n std.log.debug(\"3 byte long DCC package detected!\", .{});\n"},{"Del":" defer ddc.reset();\n\n const address: u8 = @truncate(ddc.buffer >> (2 * (8 + 1) + 1));\n const instruction: u8 = @truncate(ddc.buffer >> (8 + 1) + 1);\n const checksum: u8 = @truncate(ddc.buffer >> 1);\n\n if (address ^ instruction == checksum) {\n std.log.debug(\"DDC packet passed the validation\", .{});\n\n const packet = DDC.Packet{\n .address = @bitCast(address),\n .instruction = @bitCast(instruction),\n };\n ddc.packets.writeItem(packet) catch {\n std.log.err(\"DDC packet FIFO full, dropping packet\", .{});\n return;\n };\n std.log.debug(\"DCC packet added to FIFO\", .{});\n } else {\n std.log.debug(\"DDC packet invalid\", .{});\n }\n"},{"Del":" }\n },\n }\n }\n"}]}},{"Edit":{"inode":{"change":2,"pos":50},"path":"src/main.zig","line":77,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":5787}],"down_context":[{"change":2,"pos":5787}],"flag":"BLOCK","start":232,"end":257,"inode":{"change":2,"pos":50}}},"contents":[{"Add":""},{"Add":"var ddc = DDC.Parser{};"}]}},{"Replacement":{"inode":{"change":2,"pos":50},"path":"src/main.zig","line":127,"ins":{"up_context":[{"change":4,"pos":595}],"down_context":[{"change":4,"pos":622}],"flag":"BLOCK","start":258,"end":289,"inode":{"change":2,"pos":50}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":595},"to":{"change":4,"start":595,"end":622},"introduced_by":4}],"inode":{"change":2,"pos":50}},"ins_contents":[{"Add":" const cv = DDC.CV.default;"}],"del_contents":[{"Del":" const cv = CV.default;\n"}]}},{"Replacement":{"inode":{"change":2,"pos":50},"path":"src/main.zig","line":130,"ins":{"up_context":[{"change":4,"pos":642}],"down_context":[{"change":4,"pos":718}],"flag":"BLOCK","start":290,"end":394,"inode":{"change":2,"pos":50}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":642},"to":{"change":4,"start":642,"end":718},"introduced_by":4}],"inode":{"change":2,"pos":50}},"ins_contents":[{"Add":" std.log.debug(\"vstart CV: {d} name: {d}\", .{ cv.getCV(2 - 1), cv.vstart }); //XXX: expected to be 8"}],"del_contents":[{"Del":" std.log.debug(\"vmin: {d}\", .{cv.getCV(2 - 1)}); //XXX: expected to be 8\n"}]}},{"Edit":{"inode":{"change":2,"pos":50},"path":"src/main.zig","line":134,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":6940},"to":{"change":4,"start":741,"end":4547},"introduced_by":4}],"inode":{"change":2,"pos":50}}},"contents":[{"Del":"\nconst CV = packed struct {\n primary_address: u8,\n vstart: u8,\n acceleration_rate: u8 = 0,\n deceleration_rate: u8 = 0,\n vhigh: u8,\n vmid: u8,\n manufacturer_version: u8 = 0,\n manufacturer_id: u8 = 13,\n PWM_period: u8,\n EMF_feedback_cutout: u8, // CV10\n packet_timeout: u8,\n power_source_conversion: u8,\n AMFS_F1_F8: u8 = 0,\n AMFS_FL_F9_F12: u8 = 0,\n decoder_lock: u16 = 0,\n extended_address: u16,\n consist_address: u8 = 0,\n NMRA_reserved20: u8 = 0, // CV20\n consist_F1_F8: u8 = 0,\n consist_FL_F9_F12: u8 = 0,\n acceleration_adjustment: u8 = 0,\n deceleration_adjustment: u8 = 0,\n speed_table_select: u8 = 0, // TODO: not sure it worth the effort if speed PID is working...\n NMRA_reserved26: u8 = 0,\n decoder_automatic_stopping: u8 = 0, // TODO: disable setting these values if not implemented\n bidir_comm_config: u8 = 0, // TODO: disable setting these values if not implemented\n configuration_data: Configuration,\n error_information: u8 = 0, // CV30\n index_high_byte: u8,\n index_low_byte: u8,\n output_loc: u112 = 0, // 33..46 => 14*8=112\n manufacturer_unique47_64: u144 = 0, // 47..64 => 18*8=144\n kick_start: u8 = 0,\n forward_trim: u8 = 0,\n speed_table: u224 = 0, // 67..94 => 28*8=224\n reverse_trim: u8 = 0,\n NMRA_reserved96_104: u72 = 0, // 96..104 => 9*8=72\n user_identifier1: u8 = 0,\n user_identifier2: u8 = 0,\n NMRA_reserved107_111: u40 = 0, // 107..111 => 5*8=40\n manufacturer_unique112_256: u1160 = 0, // 112..256 => 145*8=1160\n\n /// Normally the CV table is 1024*8=8192 bits, but this part is unimplemented\n /// anyway, so we can just drop it for now for quarter size\n\n // indexed_area: u2048 = 0, // 257..512 => 256*8=2048\n // NMRA_reserved513_879: u2936 = 0, // 513..879 => 367*8=2936\n // NMRA_reserved880_891: u96 = 0, // 880..891 => 12*8=96\n // decoder_load: u8 = 0,\n // dynamic_flags: u8 = 0,\n // fuel_coal: u8 = 0,\n // water: u8 = 0,\n // SUSI: u1032 = 0, // 896..1024 => 129*8=1032\n\n const Configuration = packed struct {\n accessory_decoder: bool,\n reserved: u1 = 0,\n extended_addressing: bool,\n speed_table: u1,\n bidirectional_communication: bool,\n power_source_conversion: bool,\n FL_location: u1,\n direction: u1,\n };\n\n const default: CV = .{\n .primary_address = 3,\n .vstart = 8,\n .vhigh = 0, // not used yet\n .vmid = 0, // not used yet\n .PWM_period = 0b10010110,\n .EMF_feedback_cutout = 1,\n .packet_timeout = 0, // TODO: S-9.2.4 Section C recommends 20 seconds, not implemented yet\n .power_source_conversion = 0, // TODO Go to analog mode when CV1==0\n .extended_address = 0b1100001111101000,\n .index_high_byte = 0b00010000,\n .index_low_byte = 0b00000000,\n .configuration_data = .{\n .accessory_decoder = false,\n .extended_addressing = false,\n .speed_table = 0, // vstart-vmid-vhigh\n .bidirectional_communication = false,\n .power_source_conversion = false,\n .FL_location = 0, // TODO not implemented\n .direction = 0, // TODO not implemented\n },\n };\n\n /// Expects [0..1023], so for CV29 `cv` should be 28\n /// XXX: We cut the CVs, so actually it is [0..255]\n fn getCV(self: @This(), cv: u8) u8 {\n return @truncate(@as(u2048, @bitCast(self)) >> (@sizeOf(CV) - 1 - cv));\n }\n\n fn validate(self: @This()) void {\n std.debug.assert(self.primary_address < 128);\n std.debug.assert(self.extended_address >> 8 >= 11000000 and self.extended_address >> 8 <= 11100111);\n std.debug.assert(self.index_high_byte > 0b00001111); // 0b00000000..0b00001111 reserved by NMRA\n }\n};\n"}]}},{"FileAdd":{"meta":{"basename":"ddc.zig","metadata":0},"context":[{"change":2,"pos":15}],"contents":[{"Add":"//! DDC support"},{"Add":""},{"Add":"const std = @import(\"std\");"},{"Add":""},{"Add":"const microzig = @import(\"microzig\");"},{"Add":"const pico = microzig.hal;"},{"Add":"const peripherals = microzig.chip.peripherals;"},{"Add":""},{"Add":"// TODO: extended address byte support (2.3)"},{"Add":"pub const Parser = struct {"},{"Add":" const PREAMBLE_MASK = 0b11111111110;"},{"Add":" pub const TIME_ONEMAX = 87 * 1000; // XXX: doble check these!"},{"Add":""},{"Add":" // zig fmt: off"},{"Add":" const MASK_3BYTES = 0b1111111111_1_00000000_1_00000000_1_00000000_1;"},{"Add":" const COMPARE_3BYTES = 0b1111111111_0_00000000_0_00000000_0_00000000_1;"},{"Add":" const MASK_4BYTES = 0b1111111111_1_00000000_1_00000000_1_00000000_1_00000000_1;"},{"Add":" const COMPARE_4BYTES = 0b1111111111_0_00000000_0_00000000_0_00000000_0_00000000_1;"},{"Add":" const MASK_5BYTES = 0b1111111111_1_00000000_1_00000000_1_00000000_1_00000000_1_00000000_1;"},{"Add":" const COMPARE_5BYTES = 0b1111111111_0_00000000_0_00000000_0_00000000_0_00000000_0_00000000_1;"},{"Add":" // zig fmt: on"},{"Add":""},{"Add":" const Speed = enum(u5) { stop, stopi, estop, estopi, step1, step2, step3, step4, step5, step6, step7, step8, step9, step10, step11, step12, step13, step14, step15, step16, step17, step18, step19, step20, step21, step22, step23, step24, step25, step26, step27, step28 };"},{"Add":""},{"Add":" const Packet = struct {"},{"Add":" address: u8,"},{"Add":" instruction: Instruction,"},{"Add":""},{"Add":" pub fn speed(self: @This()) Speed {"},{"Add":" // TODO: Based on CV29 we should add support for 14 step speed control"},{"Add":" var ret: u5 = self.instruction.speed << 1;"},{"Add":" ret |= self.instruction.headlight;"},{"Add":" return @enumFromInt(ret);"},{"Add":" }"},{"Add":" };"},{"Add":""},{"Add":" const Direction = enum(u1) {"},{"Add":" backward,"},{"Add":" forward,"},{"Add":" };"},{"Add":""},{"Add":" /// Defined in S-9.2.1, Chapter 2.3"},{"Add":" const InstructionType = enum(u3) {"},{"Add":" decoder_control,"},{"Add":" advanced_operating,"},{"Add":" speed_reverse,"},{"Add":" speed_forward,"},{"Add":" function_group1,"},{"Add":" function_group2,"},{"Add":" feature_expansion,"},{"Add":" cv_access,"},{"Add":" };"},{"Add":""},{"Add":" const Instruction = packed struct(u8) {"},{"Add":" speed: u4,"},{"Add":" headlight: u1, // lsb of speed"},{"Add":" itype: InstructionType,"},{"Add":" };"},{"Add":""},{"Add":" const ParserState = enum {"},{"Add":" preamble,"},{"Add":" package,"},{"Add":" };"},{"Add":""},{"Add":" const BitType = enum(u1) {"},{"Add":" zero,"},{"Add":" one,"},{"Add":" };"},{"Add":""},{"Add":" const BUFFER_TYPE = u32; // 10+1 + 5x(8+1)"},{"Add":""},{"Add":" state: ParserState = .preamble,"},{"Add":" time: microzig.drivers.time.Absolute = @enumFromInt(0),"},{"Add":" buffer: BUFFER_TYPE = 0,"},{"Add":" packets: std.fifo.LinearFifo(Packet, .{ .Static = 8 }) = std.fifo.LinearFifo(Packet, .{ .Static = 8 }).init(),"},{"Add":""},{"Add":" pub fn listen(self: @This(), cv: *const CV) void {"},{"Add":" // TODO: S-9.2: handle decoder idle and reset!"},{"Add":" _ = self;"},{"Add":" _ = cv;"},{"Add":" }"},{"Add":""},{"Add":" pub fn signalRising(self: *@This()) void {"},{"Add":" self.time = pico.time.get_time_since_boot();"},{"Add":" }"},{"Add":""},{"Add":" pub fn signalFalling(self: *@This()) void {"},{"Add":" const time_end = pico.time.get_time_since_boot();"},{"Add":" const diff = time_end.diff(self.time);"},{"Add":" const bit: BitType = if (diff.less_than(@enumFromInt(TIME_ONEMAX))) .one else .zero;"},{"Add":" switch (self.state) {"},{"Add":" .preamble => {"},{"Add":" switch (bit) {"},{"Add":" .one => {"},{"Add":" self.writeToBuffer(bit);"},{"Add":" },"},{"Add":" .zero => {"},{"Add":" self.writeToBuffer(bit);"},{"Add":" std.log.debug(\"DDC buffer: {b}\", .{self.buffer});"},{"Add":" if (self.buffer & PREAMBLE_MASK == PREAMBLE_MASK) {"},{"Add":" self.state = .package;"},{"Add":" std.log.debug(\"DDC state switched to: {}\", .{self.state});"},{"Add":" } else {"},{"Add":" std.log.info(\"DDC preamble is invalid: {b}\", .{self.buffer});"},{"Add":" self.buffer = 0;"},{"Add":" }"},{"Add":" },"},{"Add":" }"},{"Add":" },"},{"Add":" .package => {"},{"Add":" self.writeToBuffer(bit);"},{"Add":" // std.log.debug(\"DDC buffer: {b}\", .{ddc.buffer});"},{"Add":""},{"Add":" // check for valid DCC packets"},{"Add":" if (self.buffer & @as(BUFFER_TYPE, @truncate(MASK_3BYTES)) =="},{"Add":" @as(BUFFER_TYPE, @truncate(COMPARE_3BYTES)))"},{"Add":" {"},{"Add":" std.log.debug(\"3 byte long DCC package detected!\", .{});"},{"Add":" defer self.reset();"},{"Add":""},{"Add":" const address: u8 = @truncate(self.buffer >> (2 * (8 + 1) + 1));"},{"Add":" const instruction: u8 = @truncate(self.buffer >> (8 + 1) + 1);"},{"Add":" const checksum: u8 = @truncate(self.buffer >> 1);"},{"Add":""},{"Add":" if (address ^ instruction == checksum) {"},{"Add":" std.log.debug(\"DDC packet passed the validation\", .{});"},{"Add":""},{"Add":" const packet = Packet{"},{"Add":" .address = @bitCast(address),"},{"Add":" .instruction = @bitCast(instruction),"},{"Add":" };"},{"Add":" self.packets.writeItem(packet) catch {"},{"Add":" std.log.err(\"DDC packet FIFO full, dropping packet\", .{});"},{"Add":" return;"},{"Add":" };"},{"Add":" std.log.debug(\"DCC packet added to FIFO\", .{});"},{"Add":" } else {"},{"Add":" std.log.debug(\"DDC packet invalid\", .{});"},{"Add":" }"},{"Add":" }"},{"Add":" },"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" fn writeToBuffer(self: *@This(), bit: BitType) void {"},{"Add":" self.buffer <<= 1;"},{"Add":" self.buffer |= @intFromEnum(bit);"},{"Add":" }"},{"Add":""},{"Add":" fn reset(self: *@This()) void {"},{"Add":" self.buffer = 0;"},{"Add":" self.state = .preamble;"},{"Add":" }"},{"Add":"};"},{"Add":""},{"Add":"/// Helper functions for testing the DDC parser"},{"Add":"pub const Test = struct {"},{"Add":" pub fn sendOne() void {"},{"Add":" peripherals.IO_BANK0.PROC0_INTF1.modify(.{ .GPIO15_EDGE_HIGH = 1 });"},{"Add":" pico.time.sleep_us(Parser.TIME_ONEMAX / 2);"},{"Add":" peripherals.IO_BANK0.PROC0_INTF1.modify(.{ .GPIO15_EDGE_LOW = 1 });"},{"Add":" }"},{"Add":" pub fn sendZero() void {"},{"Add":" peripherals.IO_BANK0.PROC0_INTF1.modify(.{ .GPIO15_EDGE_HIGH = 1 });"},{"Add":" pico.time.sleep_us(Parser.TIME_ONEMAX * 2);"},{"Add":" peripherals.IO_BANK0.PROC0_INTF1.modify(.{ .GPIO15_EDGE_LOW = 1 });"},{"Add":" }"},{"Add":" pub fn sendByte(bits: u8) void {"},{"Add":" for (0..8) |i| {"},{"Add":" const msb = bits >> (7 - @as(u3, @intCast(i)));"},{"Add":" if (@as(u1, @truncate(msb)) == 0) {"},{"Add":" sendZero();"},{"Add":" } else {"},{"Add":" sendOne();"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":"};"},{"Add":""},{"Add":"pub const CV = packed struct {"},{"Add":" primary_address: u8,"},{"Add":" vstart: u8,"},{"Add":" acceleration_rate: u8 = 0,"},{"Add":" deceleration_rate: u8 = 0,"},{"Add":" vhigh: u8,"},{"Add":" vmid: u8,"},{"Add":" manufacturer_version: u8 = 0,"},{"Add":" manufacturer_id: u8 = 13,"},{"Add":" PWM_period: u8,"},{"Add":" EMF_feedback_cutout: u8, // CV10"},{"Add":" packet_timeout: u8,"},{"Add":" power_source_conversion: u8,"},{"Add":" AMFS_F1_F8: u8 = 0,"},{"Add":" AMFS_FL_F9_F12: u8 = 0,"},{"Add":" decoder_lock: u16 = 0,"},{"Add":" extended_address: u16,"},{"Add":" consist_address: u8 = 0,"},{"Add":" NMRA_reserved20: u8 = 0, // CV20"},{"Add":" consist_F1_F8: u8 = 0,"},{"Add":" consist_FL_F9_F12: u8 = 0,"},{"Add":" acceleration_adjustment: u8 = 0,"},{"Add":" deceleration_adjustment: u8 = 0,"},{"Add":" speed_table_select: u8 = 0, // TODO: not sure it worth the effort if speed PID is working..."},{"Add":" NMRA_reserved26: u8 = 0,"},{"Add":" decoder_automatic_stopping: u8 = 0, // TODO: disable setting these values if not implemented"},{"Add":" bidir_comm_config: u8 = 0, // TODO: disable setting these values if not implemented"},{"Add":" configuration_data: Configuration,"},{"Add":" error_information: u8 = 0, // CV30"},{"Add":" index_high_byte: u8,"},{"Add":" index_low_byte: u8,"},{"Add":" output_loc: u112 = 0, // 33..46 => 14*8=112"},{"Add":" manufacturer_unique47_64: u144 = 0, // 47..64 => 18*8=144"},{"Add":" kick_start: u8 = 0,"},{"Add":" forward_trim: u8 = 0,"},{"Add":" speed_table: u224 = 0, // 67..94 => 28*8=224"},{"Add":" reverse_trim: u8 = 0,"},{"Add":" NMRA_reserved96_104: u72 = 0, // 96..104 => 9*8=72"},{"Add":" user_identifier1: u8 = 0,"},{"Add":" user_identifier2: u8 = 0,"},{"Add":" NMRA_reserved107_111: u40 = 0, // 107..111 => 5*8=40"},{"Add":" manufacturer_unique112_256: u1160 = 0, // 112..256 => 145*8=1160"},{"Add":""},{"Add":" /// Normally the CV table is 1024*8=8192 bits, but this part is unimplemented"},{"Add":" /// anyway, so we can just drop it for now for quarter size"},{"Add":""},{"Add":" // indexed_area: u2048 = 0, // 257..512 => 256*8=2048"},{"Add":" // NMRA_reserved513_879: u2936 = 0, // 513..879 => 367*8=2936"},{"Add":" // NMRA_reserved880_891: u96 = 0, // 880..891 => 12*8=96"},{"Add":" // decoder_load: u8 = 0,"},{"Add":" // dynamic_flags: u8 = 0,"},{"Add":" // fuel_coal: u8 = 0,"},{"Add":" // water: u8 = 0,"},{"Add":" // SUSI: u1032 = 0, // 896..1024 => 129*8=1032"},{"Add":""},{"Add":" const Configuration = packed struct {"},{"Add":" accessory_decoder: bool,"},{"Add":" reserved: u1 = 0,"},{"Add":" extended_addressing: bool,"},{"Add":" speed_table: u1,"},{"Add":" bidirectional_communication: bool,"},{"Add":" power_source_conversion: bool,"},{"Add":" FL_location: u1,"},{"Add":" direction: u1,"},{"Add":" };"},{"Add":""},{"Add":" pub const default: CV = .{"},{"Add":" .primary_address = 3,"},{"Add":" .vstart = 8,"},{"Add":" .vhigh = 0, // not used yet"},{"Add":" .vmid = 0, // not used yet"},{"Add":" .PWM_period = 0b10010110,"},{"Add":" .EMF_feedback_cutout = 1,"},{"Add":" .packet_timeout = 0, // TODO: S-9.2.4 Section C recommends 20 seconds, not implemented yet"},{"Add":" .power_source_conversion = 0, // TODO Go to analog mode when CV1==0"},{"Add":" .extended_address = 0b11000011_11101000,"},{"Add":" .index_high_byte = 0b00010000,"},{"Add":" .index_low_byte = 0b00000000,"},{"Add":" .configuration_data = .{"},{"Add":" .accessory_decoder = false,"},{"Add":" .extended_addressing = false,"},{"Add":" .speed_table = 0, // vstart-vmid-vhigh"},{"Add":" .bidirectional_communication = false,"},{"Add":" .power_source_conversion = false,"},{"Add":" .FL_location = 0, // TODO not implemented"},{"Add":" .direction = 0, // TODO not implemented"},{"Add":" },"},{"Add":" };"},{"Add":""},{"Add":" /// Expects [0..1023], so for CV29 `cv` should be 28"},{"Add":" /// XXX: We cut the CVs, so actually it is [0..255]"},{"Add":" pub fn getCV(self: @This(), cv: u8) u8 {"},{"Add":" std.debug.assert(@bitSizeOf(CV) == 2048);"},{"Add":" std.debug.assert(@sizeOf(CV) == 256);"},{"Add":" return @truncate(@as(u2048, @bitCast(self)) >> cv * 8);"},{"Add":" }"},{"Add":""},{"Add":" pub fn validate(self: @This()) void {"},{"Add":" std.debug.assert(self.primary_address < 128);"},{"Add":""},{"Add":" std.debug.assert(self.extended_address >> 8 >= 0b11000000 and self.extended_address >> 8 <= 0b11100111);"},{"Add":""},{"Add":" // 0b00000000..0b00001111 reserved by NMRA"},{"Add":" std.debug.assert(self.index_high_byte > 0b00001111);"},{"Add":" }"},{"Add":"};"}]}}],"owner":"voroskoi","repo":"RP2040-decoder","token":"jEtokEx6NyRiy60vCgDbdfjk8TQ32w27ELF5y/wd3Zo=","login":null}

…

Dependencies

Change contents