Skip to content

Commit 18f4066

Browse files
vintagepcvintagepc
committed
- Additional Misc fixes
 - Add XL OTP data for board version - Fix thermistor table
1 parent aa59f8d commit 18f4066

File tree

5 files changed

+60
-306
lines changed

5 files changed

+60
-306
lines changed

‎hw/arm/prusa/parts/74HC4052.c

+10-9
Original file line numberDiff line numberDiff line change
@@ -66,29 +66,32 @@ static void hc4052_reset(DeviceState *dev)
6666
static void hc4052_ch1_in(void *opaque, int n, int level){
6767
HC4052State *s = HC4052(opaque);
6868
s->levels[0][n] = level;
69+
if (n == s->channel)
70+
{
71+
qemu_set_irq(s->irq[0], level);
72+
}
6973
// printf("Ch1 %d changed to %d\n",n,level);
7074
}
7175

7276
static void hc4052_ch2_in(void *opaque, int n, int level){
7377
HC4052State *s = HC4052(opaque);
7478
s->levels[1][n] = level;
79+
if (n == s->channel)
80+
{
81+
qemu_set_irq(s->irq[1], level);
82+
}
7583
// printf("Ch2 %d changed to %d\n",n,level);
7684
}
7785

78-
static void hc4052_ch1_read_request(void *opaque, int n, int level)
79-
{
80-
HC4052State *s = HC4052(opaque);
81-
qemu_irq_raise(s->mux_read[n][s->channel]);
82-
qemu_set_irq(s->irq[n], s->levels[n][s->channel]);
83-
}
84-
8586
static void hc4052_select(void *opaque, int n, int level){
8687
HC4052State *s = HC4052(opaque);
8788
if (n==0) {
8889
s->channel = (s->channel& 0x02) | (level & 0x1);
8990
} else {
9091
s->channel = (s->channel& 0x01) | ((level & 0x1)<<1);
9192
}
93+
qemu_set_irq(s->irq[0], s->levels[0][s->channel]);
94+
qemu_set_irq(s->irq[1], s->levels[1][s->channel]);
9295
}
9396

9497
static void hc4052_init(Object *obj)
@@ -100,8 +103,6 @@ static void hc4052_init(Object *obj)
100103
qdev_init_gpio_in_named(DEVICE(obj),hc4052_select,"select",2);// S1, S2
101104
qdev_init_gpio_in_named(DEVICE(obj),hc4052_ch1_in,"1Y",4);// 1Y
102105
qdev_init_gpio_in_named(DEVICE(obj),hc4052_ch2_in,"2Y",4);// 2Y
103-
qdev_init_gpio_in_named(DEVICE(obj),hc4052_ch1_read_request,"adc_read_request",2);
104-
105106
}
106107

107108
static const VMStateDescription vmstate_hc4052 = {

‎hw/arm/prusa/parts/thermistortables.h

+20-291
Original file line numberDiff line numberDiff line change
@@ -1506,297 +1506,26 @@ const short temptable_2006[][2] = {
15061506

15071507

15081508
const short temptable_2007[][2] = {
1509-
{OVERSAMPLENR* 0 , 290 },
1510-
{OVERSAMPLENR* 1405 , 289 },
1511-
{OVERSAMPLENR* 1411 , 288 },
1512-
{OVERSAMPLENR* 1417 , 287 },
1513-
{OVERSAMPLENR* 1423 , 286 },
1514-
{OVERSAMPLENR* 1429 , 285 },
1515-
{OVERSAMPLENR* 1435 , 284 },
1516-
{OVERSAMPLENR* 1441 , 283 },
1517-
{OVERSAMPLENR* 1447 , 282 },
1518-
{OVERSAMPLENR* 1454 , 281 },
1519-
{OVERSAMPLENR* 1460 , 280 },
1520-
{OVERSAMPLENR* 1466 , 279 },
1521-
{OVERSAMPLENR* 1473 , 278 },
1522-
{OVERSAMPLENR* 1480 , 277 },
1523-
{OVERSAMPLENR* 1486 , 276 },
1524-
{OVERSAMPLENR* 1493 , 275 },
1525-
{OVERSAMPLENR* 1500 , 274 },
1526-
{OVERSAMPLENR* 1507 , 273 },
1527-
{OVERSAMPLENR* 1513 , 272 },
1528-
{OVERSAMPLENR* 1520 , 271 },
1529-
{OVERSAMPLENR* 1527 , 270 },
1530-
{OVERSAMPLENR* 1534 , 269 },
1531-
{OVERSAMPLENR* 1542 , 268 },
1532-
{OVERSAMPLENR* 1549 , 267 },
1533-
{OVERSAMPLENR* 1557 , 266 },
1534-
{OVERSAMPLENR* 1565 , 265 },
1535-
{OVERSAMPLENR* 1572 , 264 },
1536-
{OVERSAMPLENR* 1580 , 263 },
1537-
{OVERSAMPLENR* 1587 , 262 },
1538-
{OVERSAMPLENR* 1595 , 261 },
1539-
{OVERSAMPLENR* 1602 , 260 },
1540-
{OVERSAMPLENR* 1611 , 259 },
1541-
{OVERSAMPLENR* 1619 , 258 },
1542-
{OVERSAMPLENR* 1628 , 257 },
1543-
{OVERSAMPLENR* 1636 , 256 },
1544-
{OVERSAMPLENR* 1645 , 255 },
1545-
{OVERSAMPLENR* 1653 , 254 },
1546-
{OVERSAMPLENR* 1662 , 253 },
1547-
{OVERSAMPLENR* 1670 , 252 },
1548-
{OVERSAMPLENR* 1679 , 251 },
1549-
{OVERSAMPLENR* 1687 , 250 },
1550-
{OVERSAMPLENR* 1698 , 249 },
1551-
{OVERSAMPLENR* 1708 , 248 },
1552-
{OVERSAMPLENR* 1719 , 247 },
1553-
{OVERSAMPLENR* 1729 , 246 },
1554-
{OVERSAMPLENR* 1740 , 245 },
1555-
{OVERSAMPLENR* 1750 , 244 },
1556-
{OVERSAMPLENR* 1760 , 243 },
1557-
{OVERSAMPLENR* 1771 , 242 },
1558-
{OVERSAMPLENR* 1781 , 241 },
1559-
{OVERSAMPLENR* 1792 , 240 },
1560-
{OVERSAMPLENR* 1803 , 239 },
1561-
{OVERSAMPLENR* 1813 , 238 },
1562-
{OVERSAMPLENR* 1824 , 237 },
1563-
{OVERSAMPLENR* 1835 , 236 },
1564-
{OVERSAMPLENR* 1846 , 235 },
1565-
{OVERSAMPLENR* 1856 , 234 },
1566-
{OVERSAMPLENR* 1867 , 233 },
1567-
{OVERSAMPLENR* 1878 , 232 },
1568-
{OVERSAMPLENR* 1889 , 231 },
1569-
{OVERSAMPLENR* 1900 , 230 },
1570-
{OVERSAMPLENR* 1912 , 229 },
1571-
{OVERSAMPLENR* 1924 , 228 },
1572-
{OVERSAMPLENR* 1936 , 227 },
1573-
{OVERSAMPLENR* 1948 , 226 },
1574-
{OVERSAMPLENR* 1961 , 225 },
1575-
{OVERSAMPLENR* 1973 , 224 },
1576-
{OVERSAMPLENR* 1985 , 223 },
1577-
{OVERSAMPLENR* 1997 , 222 },
1578-
{OVERSAMPLENR* 2010 , 221 },
1579-
{OVERSAMPLENR* 2022 , 220 },
1580-
{OVERSAMPLENR* 2035 , 219 },
1581-
{OVERSAMPLENR* 2049 , 218 },
1582-
{OVERSAMPLENR* 2062 , 217 },
1583-
{OVERSAMPLENR* 2075 , 216 },
1584-
{OVERSAMPLENR* 2089 , 215 },
1585-
{OVERSAMPLENR* 2102 , 214 },
1586-
{OVERSAMPLENR* 2115 , 213 },
1587-
{OVERSAMPLENR* 2129 , 212 },
1588-
{OVERSAMPLENR* 2142 , 211 },
1589-
{OVERSAMPLENR* 2155 , 210 },
1590-
{OVERSAMPLENR* 2170 , 209 },
1591-
{OVERSAMPLENR* 2184 , 208 },
1592-
{OVERSAMPLENR* 2199 , 207 },
1593-
{OVERSAMPLENR* 2214 , 206 },
1594-
{OVERSAMPLENR* 2228 , 205 },
1595-
{OVERSAMPLENR* 2243 , 204 },
1596-
{OVERSAMPLENR* 2257 , 203 },
1597-
{OVERSAMPLENR* 2272 , 202 },
1598-
{OVERSAMPLENR* 2286 , 201 },
1599-
{OVERSAMPLENR* 2301 , 200 },
1600-
{OVERSAMPLENR* 2317 , 199 },
1601-
{OVERSAMPLENR* 2333 , 198 },
1602-
{OVERSAMPLENR* 2349 , 197 },
1603-
{OVERSAMPLENR* 2365 , 196 },
1604-
{OVERSAMPLENR* 2380 , 195 },
1605-
{OVERSAMPLENR* 2396 , 194 },
1606-
{OVERSAMPLENR* 2412 , 193 },
1607-
{OVERSAMPLENR* 2428 , 192 },
1608-
{OVERSAMPLENR* 2444 , 191 },
1609-
{OVERSAMPLENR* 2460 , 190 },
1610-
{OVERSAMPLENR* 2478 , 189 },
1611-
{OVERSAMPLENR* 2495 , 188 },
1612-
{OVERSAMPLENR* 2513 , 187 },
1613-
{OVERSAMPLENR* 2530 , 186 },
1614-
{OVERSAMPLENR* 2548 , 185 },
1615-
{OVERSAMPLENR* 2566 , 184 },
1616-
{OVERSAMPLENR* 2583 , 183 },
1617-
{OVERSAMPLENR* 2601 , 182 },
1618-
{OVERSAMPLENR* 2618 , 181 },
1619-
{OVERSAMPLENR* 2636 , 180 },
1620-
{OVERSAMPLENR* 2654 , 179 },
1621-
{OVERSAMPLENR* 2671 , 178 },
1622-
{OVERSAMPLENR* 2689 , 177 },
1623-
{OVERSAMPLENR* 2707 , 176 },
1624-
{OVERSAMPLENR* 2725 , 175 },
1625-
{OVERSAMPLENR* 2742 , 174 },
1626-
{OVERSAMPLENR* 2760 , 173 },
1627-
{OVERSAMPLENR* 2778 , 172 },
1628-
{OVERSAMPLENR* 2796 , 171 },
1629-
{OVERSAMPLENR* 2813 , 170 },
1630-
{OVERSAMPLENR* 2830 , 169 },
1631-
{OVERSAMPLENR* 2847 , 168 },
1632-
{OVERSAMPLENR* 2864 , 167 },
1633-
{OVERSAMPLENR* 2881 , 166 },
1634-
{OVERSAMPLENR* 2898 , 165 },
1635-
{OVERSAMPLENR* 2915 , 164 },
1636-
{OVERSAMPLENR* 2933 , 163 },
1637-
{OVERSAMPLENR* 2950 , 162 },
1638-
{OVERSAMPLENR* 2967 , 161 },
1639-
{OVERSAMPLENR* 2984 , 160 },
1640-
{OVERSAMPLENR* 3001 , 159 },
1641-
{OVERSAMPLENR* 3018 , 158 },
1642-
{OVERSAMPLENR* 3035 , 157 },
1643-
{OVERSAMPLENR* 3052 , 156 },
1644-
{OVERSAMPLENR* 3069 , 155 },
1645-
{OVERSAMPLENR* 3086 , 154 },
1646-
{OVERSAMPLENR* 3103 , 153 },
1647-
{OVERSAMPLENR* 3120 , 152 },
1648-
{OVERSAMPLENR* 3137 , 151 },
1649-
{OVERSAMPLENR* 3154 , 150 },
1650-
{OVERSAMPLENR* 3170 , 149 },
1651-
{OVERSAMPLENR* 3187 , 148 },
1652-
{OVERSAMPLENR* 3203 , 147 },
1653-
{OVERSAMPLENR* 3219 , 146 },
1654-
{OVERSAMPLENR* 3235 , 145 },
1655-
{OVERSAMPLENR* 3251 , 144 },
1656-
{OVERSAMPLENR* 3267 , 143 },
1657-
{OVERSAMPLENR* 3283 , 142 },
1658-
{OVERSAMPLENR* 3299 , 141 },
1659-
{OVERSAMPLENR* 3315 , 140 },
1660-
{OVERSAMPLENR* 3330 , 139 },
1661-
{OVERSAMPLENR* 3345 , 138 },
1662-
{OVERSAMPLENR* 3360 , 137 },
1663-
{OVERSAMPLENR* 3375 , 136 },
1664-
{OVERSAMPLENR* 3390 , 135 },
1665-
{OVERSAMPLENR* 3404 , 134 },
1666-
{OVERSAMPLENR* 3419 , 133 },
1667-
{OVERSAMPLENR* 3434 , 132 },
1668-
{OVERSAMPLENR* 3449 , 131 },
1669-
{OVERSAMPLENR* 3464 , 130 },
1670-
{OVERSAMPLENR* 3477 , 129 },
1671-
{OVERSAMPLENR* 3490 , 128 },
1672-
{OVERSAMPLENR* 3503 , 127 },
1673-
{OVERSAMPLENR* 3516 , 126 },
1674-
{OVERSAMPLENR* 3529 , 125 },
1675-
{OVERSAMPLENR* 3542 , 124 },
1676-
{OVERSAMPLENR* 3555 , 123 },
1677-
{OVERSAMPLENR* 3569 , 122 },
1678-
{OVERSAMPLENR* 3582 , 121 },
1679-
{OVERSAMPLENR* 3595 , 120 },
1680-
{OVERSAMPLENR* 3606 , 119 },
1681-
{OVERSAMPLENR* 3618 , 118 },
1682-
{OVERSAMPLENR* 3629 , 117 },
1683-
{OVERSAMPLENR* 3641 , 116 },
1684-
{OVERSAMPLENR* 3652 , 115 },
1685-
{OVERSAMPLENR* 3664 , 114 },
1686-
{OVERSAMPLENR* 3675 , 113 },
1687-
{OVERSAMPLENR* 3687 , 112 },
1688-
{OVERSAMPLENR* 3698 , 111 },
1689-
{OVERSAMPLENR* 3710 , 110 },
1690-
{OVERSAMPLENR* 3719 , 109 },
1691-
{OVERSAMPLENR* 3728 , 108 },
1692-
{OVERSAMPLENR* 3737 , 107 },
1693-
{OVERSAMPLENR* 3746 , 106 },
1694-
{OVERSAMPLENR* 3755 , 105 },
1695-
{OVERSAMPLENR* 3764 , 104 },
1696-
{OVERSAMPLENR* 3773 , 103 },
1697-
{OVERSAMPLENR* 3782 , 102 },
1698-
{OVERSAMPLENR* 3791 , 101 },
1699-
{OVERSAMPLENR* 3800 , 100 },
1700-
{OVERSAMPLENR* 3808 , 99 },
1701-
{OVERSAMPLENR* 3816 , 98 },
1702-
{OVERSAMPLENR* 3824 , 97 },
1703-
{OVERSAMPLENR* 3832 , 96 },
1704-
{OVERSAMPLENR* 3840 , 95 },
1705-
{OVERSAMPLENR* 3848 , 94 },
1706-
{OVERSAMPLENR* 3856 , 93 },
1707-
{OVERSAMPLENR* 3864 , 92 },
1708-
{OVERSAMPLENR* 3872 , 91 },
1709-
{OVERSAMPLENR* 3880 , 90 },
1710-
{OVERSAMPLENR* 3886 , 89 },
1711-
{OVERSAMPLENR* 3892 , 88 },
1712-
{OVERSAMPLENR* 3899 , 87 },
1713-
{OVERSAMPLENR* 3905 , 86 },
1714-
{OVERSAMPLENR* 3911 , 85 },
1715-
{OVERSAMPLENR* 3917 , 84 },
1716-
{OVERSAMPLENR* 3923 , 83 },
1717-
{OVERSAMPLENR* 3930 , 82 },
1718-
{OVERSAMPLENR* 3936 , 81 },
1719-
{OVERSAMPLENR* 3942 , 80 },
1720-
{OVERSAMPLENR* 3946 , 79 },
1721-
{OVERSAMPLENR* 3951 , 78 },
1722-
{OVERSAMPLENR* 3956 , 77 },
1723-
{OVERSAMPLENR* 3960 , 76 },
1724-
{OVERSAMPLENR* 3965 , 75 },
1725-
{OVERSAMPLENR* 3969 , 74 },
1726-
{OVERSAMPLENR* 3974 , 73 },
1727-
{OVERSAMPLENR* 3978 , 72 },
1728-
{OVERSAMPLENR* 3983 , 71 },
1729-
{OVERSAMPLENR* 3987 , 70 },
1730-
{OVERSAMPLENR* 3990 , 69 },
1731-
{OVERSAMPLENR* 3993 , 68 },
1732-
{OVERSAMPLENR* 3996 , 67 },
1733-
{OVERSAMPLENR* 3999 , 66 },
1734-
{OVERSAMPLENR* 4002 , 65 },
1735-
{OVERSAMPLENR* 4005 , 64 },
1736-
{OVERSAMPLENR* 4008 , 63 },
1737-
{OVERSAMPLENR* 4011 , 62 },
1738-
{OVERSAMPLENR* 4014 , 61 },
1739-
{OVERSAMPLENR* 4016 , 60 },
1740-
{OVERSAMPLENR* 4020 , 59 },
1741-
{OVERSAMPLENR* 4023 , 58 },
1742-
{OVERSAMPLENR* 4027 , 57 },
1743-
{OVERSAMPLENR* 4030 , 56 },
1744-
{OVERSAMPLENR* 4033 , 55 },
1745-
{OVERSAMPLENR* 4035 , 54 },
1746-
{OVERSAMPLENR* 4037 , 53 },
1747-
{OVERSAMPLENR* 4039 , 52 },
1748-
{OVERSAMPLENR* 4041 , 51 },
1749-
{OVERSAMPLENR* 4043 , 50 },
1750-
{OVERSAMPLENR* 4044 , 49 },
1751-
{OVERSAMPLENR* 4046 , 48 },
1752-
{OVERSAMPLENR* 4047 , 47 },
1753-
{OVERSAMPLENR* 4049 , 46 },
1754-
{OVERSAMPLENR* 4051 , 45 },
1755-
{OVERSAMPLENR* 4053 , 44 },
1756-
{OVERSAMPLENR* 4055 , 43 },
1757-
{OVERSAMPLENR* 4057 , 42 },
1758-
{OVERSAMPLENR* 4059 , 41 },
1759-
{OVERSAMPLENR* 4061 , 40 },
1760-
{OVERSAMPLENR* 4062 , 39 },
1761-
{OVERSAMPLENR* 4064 , 38 },
1762-
{OVERSAMPLENR* 4066 , 37 },
1763-
{OVERSAMPLENR* 4067 , 36 },
1764-
{OVERSAMPLENR* 4069 , 35 },
1765-
{OVERSAMPLENR* 4070 , 34 },
1766-
{OVERSAMPLENR* 4072 , 33 },
1767-
{OVERSAMPLENR* 4074 , 32 },
1768-
{OVERSAMPLENR* 4075 , 31 },
1769-
{OVERSAMPLENR* 4077 , 30 },
1770-
{OVERSAMPLENR* 4078 , 29 },
1771-
{OVERSAMPLENR* 4079 , 28 },
1772-
{OVERSAMPLENR* 4080 , 27 },
1773-
{OVERSAMPLENR* 4081 , 26 },
1774-
{OVERSAMPLENR* 4082 , 25 },
1775-
{OVERSAMPLENR* 4083 , 24 },
1776-
{OVERSAMPLENR* 4084 , 23 },
1777-
{OVERSAMPLENR* 4084 , 22 },
1778-
{OVERSAMPLENR* 4084 , 21 },
1779-
{OVERSAMPLENR* 4084 , 20 },
1780-
{OVERSAMPLENR* 4085 , 19 },
1781-
{OVERSAMPLENR* 4085 , 18 },
1782-
{OVERSAMPLENR* 4085 , 17 },
1783-
{OVERSAMPLENR* 4085 , 16 },
1784-
{OVERSAMPLENR* 4086 , 15 },
1785-
{OVERSAMPLENR* 4086 , 14 },
1786-
{OVERSAMPLENR* 4086 , 13 },
1787-
{OVERSAMPLENR* 4086 , 12 },
1788-
{OVERSAMPLENR* 4087 , 11 },
1789-
{OVERSAMPLENR* 4087 , 10 },
1790-
{OVERSAMPLENR* 4087 , 9 },
1791-
{OVERSAMPLENR* 4087 , 8 },
1792-
{OVERSAMPLENR* 4087 , 7 },
1793-
{OVERSAMPLENR* 4088 , 6 },
1794-
{OVERSAMPLENR* 4088 , 5 },
1795-
{OVERSAMPLENR* 4088 , 4 },
1796-
{OVERSAMPLENR* 4088 , 3 },
1797-
{OVERSAMPLENR* 4089 , 2 },
1798-
{OVERSAMPLENR* 4089 , 1 },
1799-
{OVERSAMPLENR* 4089 , 0 },
1509+
{ OVERSAMPLENR*(90), 320 }, // Projected value just to trigger error on short circuit
1510+
{ OVERSAMPLENR*(120), 300 },
1511+
{ OVERSAMPLENR*(155), 280 },
1512+
{ OVERSAMPLENR*(200), 260 },
1513+
{ OVERSAMPLENR*(259), 240 },
1514+
{ OVERSAMPLENR*(335), 220 },
1515+
{ OVERSAMPLENR*(428), 200 },
1516+
{ OVERSAMPLENR*(535), 180 },
1517+
{ OVERSAMPLENR*(649), 160 },
1518+
{ OVERSAMPLENR*(758), 140 },
1519+
{ OVERSAMPLENR*(851), 120 },
1520+
{ OVERSAMPLENR*(921), 100 },
1521+
{ OVERSAMPLENR*(958), 85 },
1522+
{ OVERSAMPLENR*(967), 80 },
1523+
{ OVERSAMPLENR*(996), 60 },
1524+
{ OVERSAMPLENR*(1004), 50 },
1525+
{ OVERSAMPLENR*(1011), 40 },
1526+
{ OVERSAMPLENR*(1017), 25 },
1527+
{ OVERSAMPLENR*(1020), 10 },
1528+
{ OVERSAMPLENR*(1021), 0 },
18001529
};
18011530

18021531
const short temptable_2008[][2] = {

‎hw/arm/prusa/prusa-xl-bed.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ static void prusa_xl_bed_init(MachineState *machine, int hw_type)
220220
for (int i=0; i<2; i++)
221221
{
222222
sysbus_realize_and_unref(SYS_BUS_DEVICE(current_sense[i]), &error_fatal);
223-
// qdev_connect_gpio_out_named(stm32_soc_get_periph(dev_soc, STM32_P_ADC1),"adc_read", current_adcs[i], qdev_get_gpio_in_named(current_sense[i], "adc_read_request",0));
223+
qdev_connect_gpio_out_named(stm32_soc_get_periph(dev_soc, STM32_P_ADC1),"adc_read", current_adcs[i], qdev_get_gpio_in_named(current_sense[i], "adc_read_request",0));
224224
qdev_connect_gpio_out_named(current_sense[i], "adc_out", 0, qdev_get_gpio_in_named(stm32_soc_get_periph(dev_soc, STM32_P_ADC1),"adc_data_in",current_adcs[i]));
225225
}
226226

0 commit comments

Comments
 (0)