diff --git a/headers.mk b/headers.mk index ac32a8e..dee807a 100644 --- a/headers.mk +++ b/headers.mk @@ -47,6 +47,15 @@ maple/maple_bus_commands.hpp: regs/maple_bus_commands.csv regs/gen/maple_bus_com maple/maple_bus_bits.hpp: regs/maple_bus_bits.csv regs/gen/core_bits.py python regs/gen/core_bits.py $< > $@ +maple/maple_bus_ft0.hpp: regs/maple_bus_ft0.csv regs/gen/maple_data_format.py + python regs/gen/maple_data_format.py $< > $@ + +maple/maple_bus_ft6.hpp: regs/maple_bus_ft6.csv regs/gen/maple_data_format.py + python regs/gen/maple_data_format.py $< > $@ + +maple/maple_bus_ft8.hpp: regs/maple_bus_ft8.csv regs/gen/maple_data_format.py + python regs/gen/maple_data_format.py $< > $@ + # AICA aica/aica_channel.hpp: regs/aica_channel_data.csv regs/gen/aica.py diff --git a/maple/maple_bus_ft0.hpp b/maple/maple_bus_ft0.hpp index 3da1db6..4d81c15 100644 --- a/maple/maple_bus_ft0.hpp +++ b/maple/maple_bus_ft0.hpp @@ -3,54 +3,54 @@ namespace ft0 { namespace digital_button { constexpr uint32_t ra() { return 0b1 << 7; } constexpr uint32_t ra(uint32_t reg) { return (reg >> 7) & 0b1; } - + constexpr uint32_t la() { return 0b1 << 6; } constexpr uint32_t la(uint32_t reg) { return (reg >> 6) & 0b1; } - + constexpr uint32_t da() { return 0b1 << 5; } constexpr uint32_t da(uint32_t reg) { return (reg >> 5) & 0b1; } - + constexpr uint32_t ua() { return 0b1 << 4; } constexpr uint32_t ua(uint32_t reg) { return (reg >> 4) & 0b1; } - + constexpr uint32_t start() { return 0b1 << 3; } constexpr uint32_t start(uint32_t reg) { return (reg >> 3) & 0b1; } - + constexpr uint32_t a() { return 0b1 << 2; } constexpr uint32_t a(uint32_t reg) { return (reg >> 2) & 0b1; } - + constexpr uint32_t b() { return 0b1 << 1; } constexpr uint32_t b(uint32_t reg) { return (reg >> 1) & 0b1; } - + constexpr uint32_t c() { return 0b1 << 0; } constexpr uint32_t c(uint32_t reg) { return (reg >> 0) & 0b1; } - + constexpr uint32_t rb() { return 0b1 << 15; } constexpr uint32_t rb(uint32_t reg) { return (reg >> 15) & 0b1; } - + constexpr uint32_t lb() { return 0b1 << 14; } constexpr uint32_t lb(uint32_t reg) { return (reg >> 14) & 0b1; } - + constexpr uint32_t db() { return 0b1 << 13; } constexpr uint32_t db(uint32_t reg) { return (reg >> 13) & 0b1; } - + constexpr uint32_t ub() { return 0b1 << 12; } constexpr uint32_t ub(uint32_t reg) { return (reg >> 12) & 0b1; } - + constexpr uint32_t d() { return 0b1 << 11; } constexpr uint32_t d(uint32_t reg) { return (reg >> 11) & 0b1; } - + constexpr uint32_t x() { return 0b1 << 10; } constexpr uint32_t x(uint32_t reg) { return (reg >> 10) & 0b1; } - + constexpr uint32_t y() { return 0b1 << 9; } constexpr uint32_t y(uint32_t reg) { return (reg >> 9) & 0b1; } - + constexpr uint32_t z() { return 0b1 << 8; } constexpr uint32_t z(uint32_t reg) { return (reg >> 8) & 0b1; } - + } - + struct data_format { uint16_t digital_button; uint8_t analog_axis_1; @@ -62,5 +62,6 @@ namespace ft0 { }; static_assert((sizeof (struct data_format)) == 8); } + } diff --git a/maple/maple_bus_ft8.hpp b/maple/maple_bus_ft8.hpp index 0be21b9..481ea68 100644 --- a/maple/maple_bus_ft8.hpp +++ b/maple/maple_bus_ft8.hpp @@ -3,30 +3,30 @@ namespace ft8 { namespace vset { constexpr uint32_t vn() { return 0b1111 << 4; } constexpr uint32_t vn(uint32_t reg) { return (reg >> 4) & 0b1111; } - + constexpr uint32_t vp() { return 0b11 << 2; } constexpr uint32_t vp(uint32_t reg) { return (reg >> 2) & 0b11; } - + constexpr uint32_t vd() { return 0b11 << 0; } constexpr uint32_t vd(uint32_t reg) { return (reg >> 0) & 0b11; } - + constexpr uint32_t pf() { return 0b1 << 15; } constexpr uint32_t pf(uint32_t reg) { return (reg >> 15) & 0b1; } - + constexpr uint32_t cv() { return 0b1 << 14; } constexpr uint32_t cv(uint32_t reg) { return (reg >> 14) & 0b1; } - + constexpr uint32_t pd() { return 0b1 << 13; } constexpr uint32_t pd(uint32_t reg) { return (reg >> 13) & 0b1; } - + constexpr uint32_t owf() { return 0b1 << 12; } constexpr uint32_t owf(uint32_t reg) { return (reg >> 12) & 0b1; } - + constexpr uint32_t va() { return 0b1111 << 8; } constexpr uint32_t va(uint32_t reg) { return (reg >> 8) & 0b1111; } - + } - + struct data_format { uint16_t vset; uint8_t fm0; @@ -34,7 +34,7 @@ namespace ft8 { }; static_assert((sizeof (struct data_format)) == 4); } - + namespace set_condition { struct data_format { uint8_t ctrl; @@ -44,6 +44,6 @@ namespace ft8 { }; static_assert((sizeof (struct data_format)) == 4); } - + }