Second round of expanding test coverage (#144)

* Add HX717 tests

* - Test for SN74cbt mux
- Fix bug in mux implementation

* Add test for 74hc4052

* add encoder test case

* Add test case for ws281x

* dwarf input test case

* add fan test case

Author: vintagepc

hw/arm/prusa/parts/74CBTLV3257.c

@@ -83,7 +83,7 @@ static void cbtl3257_select(void *opaque, int n, int level){
 	{
 		if (s->levels[old_sel][i] != s->levels[s->select][i])
 		{
-			qemu_set_irq(s->irq[n],s->levels[s->select][i]);
+			qemu_set_irq(s->irq[i],s->levels[s->select][i]);
 		}
 	}
 }
@@ -95,11 +95,11 @@ static void cbtl3257_nOE(void *opaque, int n, int level){
 	{
 		if (s->oe)
 		{
-			qemu_set_irq(s->irq[n],s->levels[s->select][i]);
+			qemu_set_irq(s->irq[i],s->levels[s->select][i]);
 		}
 		else
 		{
-			qemu_irq_lower(s->irq[n]);
+			qemu_irq_lower(s->irq[i]);
 		}
 	}
 }

hw/arm/prusa/parts/encoder_input.c

@@ -46,8 +46,7 @@ struct InputState {
     /*< private >*/
     /*< public >*/
     qemu_irq irq_enc_button;
-    qemu_irq irq_enc_a;
-    qemu_irq irq_enc_b;
+    qemu_irq irq_enc[2];
     qemu_irq irq_rst;
 	qemu_irq cursor_xy[2];
 	qemu_irq tap;
@@ -114,8 +113,8 @@ static void encoder_input_timer_expire(void *opaque)
         s->phase+=3;
     }
     s->phase = s->phase%4;
-    qemu_set_irq(s->irq_enc_a, (encoder_input_phases[s->phase]&0xF0)>0);
-    qemu_set_irq(s->irq_enc_b, (encoder_input_phases[s->phase]&0x0F)>0);
+    qemu_set_irq(s->irq_enc[0], (encoder_input_phases[s->phase]&0xF0)>0);
+    qemu_set_irq(s->irq_enc[1], (encoder_input_phases[s->phase]&0x0F)>0);
     s->encoder_ticks--;
 
     if (s->encoder_ticks>0)
@@ -171,8 +170,9 @@ static void encoder_input_reset(DeviceState *dev)
     InputState *s = ENCODER_INPUT(dev);
     s->last_state = 0;
     s->phase = 0;
-    qemu_irq_lower(s->irq_enc_a);
-    qemu_irq_lower(s->irq_enc_b);
+    qemu_irq_raise(s->irq_enc_button);
+    qemu_irq_raise(s->irq_enc[0]);
+    qemu_irq_raise(s->irq_enc[1]);
 }
 
 static int encoder_input_process_action(P404ScriptIF *obj, unsigned int action, script_args args)
@@ -204,8 +204,7 @@ static void encoder_input_init(Object *obj)
 {
     InputState *s = ENCODER_INPUT(obj);
     qdev_init_gpio_out_named(DEVICE(obj), &s->irq_enc_button, "encoder-button", 1);
-    qdev_init_gpio_out_named(DEVICE(obj), &s->irq_enc_a, "encoder-a", 1);
-    qdev_init_gpio_out_named(DEVICE(obj), &s->irq_enc_b, "encoder-b", 1);
+    qdev_init_gpio_out_named(DEVICE(obj), s->irq_enc, "encoder-ab", 2);
     qdev_init_gpio_out_named(DEVICE(obj), s->cursor_xy, "cursor_xy", 2);
 	qdev_init_gpio_out_named(DEVICE(obj), &s->tap, "touch", 1);
     qemu_add_mouse_event_handler(&encoder_input_mouseevent,ENCODER_INPUT(obj),false, "encoder-mouse");

hw/arm/prusa/parts/ws281x.c

@@ -70,6 +70,13 @@ struct WS281xState {
 
 };
 
+#define T0H_NS 350
+#define T1H_NS 700
+#define T0L_NS 800
+#define T1L_NS 600
+#define THRESH_NS 150
+#define RESET_NS 50000
+
 OBJECT_DEFINE_TYPE_SIMPLE_WITH_INTERFACES(WS281xState, ws281x, WS281X, SYS_BUS_DEVICE, {NULL} );
 
 // handler for chaining via din/dout - so only the first LED on the SPI bus needs to decode the bitpattern.
@@ -109,8 +116,8 @@ static void ws281x_gpio(void* opaque, int n, int level)
 	}
 	if (level)
 	{
-		s->last_highc = icount_get_raw();
-		if (s->last_highc - s->last_lowc >15000)
+		s->last_highc = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); //icount_get_raw();
+		if (s->last_highc - s->last_lowc >= RESET_NS)
 		{
 			s->bit_count = 0;
 			s->current_colour.raw = 0;
@@ -120,15 +127,15 @@ static void ws281x_gpio(void* opaque, int n, int level)
 	}
 	else
 	{
-		s->last_lowc = icount_get_raw();
+		s->last_lowc =  qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); // icount_get_raw();
 		if (s->last_lowc == 0)
 		{
-			printf("ERR: WS281x detected '-icount ' is not set. LED will not function without accurate timing!\n");
-			s->disabled = true;
+			// printf("ERR: WS281x detected '-icount ' is not set. LED will not function without accurate timing!\n");
+			//s->disabled = true;
 		}
 		s->current_colour.raw <<= 1;
-		s->current_colour.raw |= (s->last_lowc - s->last_highc) > 22; // This value is highly dependent on the value of icount. Tested with -icount 2 gets ns values close to correct in real ns
-		// printf("last high: %d\n",(s->last_lowc - s->last_highc));
+		s->current_colour.raw |= abs((s->last_lowc - s->last_highc) - T1H_NS) <= THRESH_NS; // This value is highly dependent on the value of icount. Tested with -icount 2 gets ns values close to correct in real ns
+		// printf("last high: %ld\n",(s->last_lowc - s->last_highc));
 		s->bit_count++;
         if (s->bit_count == 24)
         {

hw/arm/prusa/prusa-mini.c

@@ -8,7 +8,7 @@
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * furnished to do so, subject to the following conditions:d
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
@@ -343,6 +343,7 @@ static void prusa_mini_init(MachineState *machine, const mini_config_t* cfg)
     for (int i=0; i<2; i++)
     {
         dev = qdev_new("fan");
+        object_property_add_child(OBJECT(periphs), g_strdup_printf("fan-%c",fan_labels[i]), OBJECT(dev));
         qdev_prop_set_uint8(dev,"label",fan_labels[i]);
         qdev_prop_set_uint32(dev, "max_rpm",fan_max_rpms[i]);
         qdev_prop_set_bit(dev, "is_nonlinear", i); // E is nonlinear.
@@ -359,10 +360,11 @@ static void prusa_mini_init(MachineState *machine, const mini_config_t* cfg)
     }
 
     dev = qdev_new("encoder-input");
+    object_property_add_child(periphs, "encoder-input", OBJECT(dev));
     sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
     qdev_connect_gpio_out_named(dev, "encoder-button",	0, 	qdev_get_gpio_in(stm32_soc_get_periph(dev_soc, STM32_P_GPIOE),12));
-    qdev_connect_gpio_out_named(dev, "encoder-a",		0, 	qdev_get_gpio_in(stm32_soc_get_periph(dev_soc, STM32_P_GPIOE),15));
-    qdev_connect_gpio_out_named(dev, "encoder-b",		0,  qdev_get_gpio_in(stm32_soc_get_periph(dev_soc, STM32_P_GPIOE),13));
+    qdev_connect_gpio_out_named(dev, "encoder-ab",		0, 	qdev_get_gpio_in(stm32_soc_get_periph(dev_soc, STM32_P_GPIOE),15));
+    qdev_connect_gpio_out_named(dev, "encoder-ab",		1,  qdev_get_gpio_in(stm32_soc_get_periph(dev_soc, STM32_P_GPIOE),13));
 
     // Needs to come last because it has the scripting engine setup.
     dev = qdev_new("p404-scriptcon");

hw/arm/prusa/prusa-mk4.c

@@ -783,8 +783,8 @@ static void mk4_init(MachineState *machine)
     DeviceState* encoder = qdev_new("encoder-input");
     sysbus_realize(SYS_BUS_DEVICE(encoder), &error_fatal);
     qdev_connect_gpio_out_named(encoder, "encoder-button",  0,  qdev_get_gpio_in(stm32_soc_get_periph(dev_soc, BANK(cfg.enc_btn)), PIN(cfg.enc_btn)));
-    qdev_connect_gpio_out_named(encoder, "encoder-a",       0,  qdev_get_gpio_in(stm32_soc_get_periph(dev_soc, BANK(cfg.enc_a)),   PIN(cfg.enc_a)));
-    qdev_connect_gpio_out_named(encoder, "encoder-b",       0,  qdev_get_gpio_in(stm32_soc_get_periph(dev_soc, BANK(cfg.enc_b)),   PIN(cfg.enc_b)));
+    qdev_connect_gpio_out_named(encoder, "encoder-ab",       0,  qdev_get_gpio_in(stm32_soc_get_periph(dev_soc, BANK(cfg.enc_a)),   PIN(cfg.enc_a)));
+    qdev_connect_gpio_out_named(encoder, "encoder-ab",       1,  qdev_get_gpio_in(stm32_soc_get_periph(dev_soc, BANK(cfg.enc_b)),   PIN(cfg.enc_b)));
 
 	bus = qdev_get_child_bus(
 		stm32_soc_get_periph(dev_soc, STM32_P_I2C3),

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

@@ -63,6 +63,8 @@ static void prusa_xl_bed_init(MachineState *machine, int hw_type)
 {
     DeviceState *dev;
 
+    Object* periphs = container_get(OBJECT(machine), "/peripheral");
+
     dev = qdev_new(TYPE_STM32G070xB_SOC);
 	hwaddr FLASH_SIZE = stm32_soc_get_flash_size(dev);
 
@@ -154,6 +156,7 @@ static void prusa_xl_bed_init(MachineState *machine, int hw_type)
 			break;
 	}
 	DeviceState* mux = qdev_new("hc4052");
+    object_property_add_child(periphs, "mux", OBJECT(mux));
 	qdev_prop_set_uint8(mux, "start_channel",1);
 
     sysbus_realize(SYS_BUS_DEVICE(mux), &error_fatal);

hw/arm/prusa/prusa-xl-extruder.c

@@ -100,6 +100,8 @@ static void _prusa_xl_extruder_init(MachineState *machine, int index, int type)
 {
     DeviceState *dev;
 
+    Object* periphs = container_get(OBJECT(machine), "/peripheral");
+
 	const prusa_xl_e_cfg_t* cfg = extruder_cfg_map[type];
 
 	dev = qdev_new(TYPE_STM32G070xB_SOC);
@@ -187,11 +189,13 @@ static void _prusa_xl_extruder_init(MachineState *machine, int index, int type)
 
 	qdev_connect_gpio_out(stm32_soc_get_periph(dev_soc, STM32_P_GPIOC),11,qdev_get_gpio_in_named(dashboard, "led-digital",1));
 	dev = qdev_new("dwarf-input");
+    object_property_add_child(periphs, "dwarf-input", OBJECT(dev));
 	sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
 	qdev_connect_gpio_out(dev,0,qdev_get_gpio_in(stm32_soc_get_periph(dev_soc, STM32_P_GPIOA),15));
 	qdev_connect_gpio_out(dev,1,qdev_get_gpio_in(stm32_soc_get_periph(dev_soc, STM32_P_GPIOC),10));
 
 	dev = qdev_new("ws281x");
+    object_property_add_child(periphs, "ws281x", OBJECT(dev));
 	sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
 	qdev_connect_gpio_out(stm32_soc_get_periph(dev_soc, STM32_P_GPIOB),6,qdev_get_gpio_in(dev,0));
 	qdev_connect_gpio_out_named(dev,"colour",0,qdev_get_gpio_in_named(dashboard, "led-rgb",0));
@@ -274,6 +278,7 @@ static void _prusa_xl_extruder_init(MachineState *machine, int index, int type)
 	qdev_connect_gpio_out(lc,0, qdev_get_gpio_in_named(dev,"input_x1000",0));
 
 	DeviceState* mux = qdev_new("cbtl3257");
+    object_property_add_child(periphs, "mux", OBJECT(mux));
 	sysbus_realize_and_unref(SYS_BUS_DEVICE(mux), &error_fatal);
 	qdev_connect_gpio_out(stm32_soc_get_periph(dev_soc, STM32_P_GPIOD), 4,qdev_get_gpio_in_named(mux,"select",0));
 	qdev_connect_gpio_out(stm32_soc_get_periph(dev_soc, STM32_P_GPIOD), 0,qdev_get_gpio_in_named(mux,"B1",0));

hw/arm/prusa/prusa-xl.c

@@ -645,8 +645,8 @@ static void xl_init(MachineState *machine, xl_cfg_t cfg)
     DeviceState* encoder = qdev_new("encoder-input");
     sysbus_realize(SYS_BUS_DEVICE(encoder), &error_fatal);
     qdev_connect_gpio_out_named(encoder, "encoder-button",  0,  qdev_get_gpio_in(stm32_soc_get_periph(dev_soc, BANK(cfg.enc_btn)), PIN(cfg.enc_btn)));
-    qdev_connect_gpio_out_named(encoder, "encoder-a",       0,  qdev_get_gpio_in(stm32_soc_get_periph(dev_soc, BANK(cfg.enc_a)),   PIN(cfg.enc_a)));
-    qdev_connect_gpio_out_named(encoder, "encoder-b",       0,  qdev_get_gpio_in(stm32_soc_get_periph(dev_soc, BANK(cfg.enc_b)),   PIN(cfg.enc_b)));
+    qdev_connect_gpio_out_named(encoder, "encoder-ab",       0,  qdev_get_gpio_in(stm32_soc_get_periph(dev_soc, BANK(cfg.enc_a)),   PIN(cfg.enc_a)));
+    qdev_connect_gpio_out_named(encoder, "encoder-ab",       1,  qdev_get_gpio_in(stm32_soc_get_periph(dev_soc, BANK(cfg.enc_b)),   PIN(cfg.enc_b)));
 
 	bus = qdev_get_child_bus(
 		stm32_soc_get_periph(dev_soc, STM32_P_I2C3),

hw/arm/prusa/stm32_tests/meson.build

@@ -1,8 +1,15 @@
 qtests_buddy = [
+    'prusa/stm32_tests/mini404_dwarf_input_test',
+    'prusa/stm32_tests/mini404_encoder_test',
+    'prusa/stm32_tests/mini404_fan_test',
     'prusa/stm32_tests/mini404_irsensor_test',
+    'prusa/stm32_tests/mini404_hx717_test',
     'prusa/stm32_tests/mini404_hallsensor_test',
     'prusa/stm32_tests/mini404_mmu_bridge_test',
     'prusa/stm32_tests/mini404_pinda_test',
+    'prusa/stm32_tests/mini404_sn74cbt_test',
+    'prusa/stm32_tests/mini404_sn74hc4052_test',
+    'prusa/stm32_tests/mini404_ws281x_test',
     'prusa/stm32_tests/stm32_adc-test',
     'prusa/stm32_tests/stm32_dbg-test',
     'prusa/stm32_tests/stm32_crc-test',

hw/arm/prusa/stm32_tests/mini404_dwarf_input_test.c

@@ -0,0 +1,103 @@
+/* 
+    mini404_dwarf_input_test.c - Test cases for the dwarf input peripheral.
+
+    Copyright (C) 2024 VintagePC <https://github.com/vintagepc>
+
+    This file is part of Mini404.
+
+    Mini404 is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	Mini404 is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with Mini404.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "qemu/osdep.h"
+#include "libqtest-single.h"
+
+#define QOM_PATH "/machine/peripheral/dwarf-input"
+#define TEST_PREFIX "/mini404/parts/dward-input/"
+#define MACHINE "prusa-xl-extruder-040-0"
+
+static void test_key_control(void)
+{
+    /* Test code goes here */
+	QTestState *ts = qtest_init("-machine " MACHINE);
+	qtest_irq_intercept_out(ts, QOM_PATH);
+    /* Assertions and other test logic */
+
+    g_free(qtest_hmp(ts, "system_reset"));
+
+    // Check start state
+    g_assert_true(qtest_get_irq(ts, 0));
+    g_assert_true(qtest_get_irq(ts, 1));
+
+    g_free(qtest_hmp(ts, "sendkey w"));
+    g_assert_false(qtest_get_irq(ts, 0));
+    g_assert_true(qtest_get_irq(ts, 1));
+
+    qtest_clock_step(ts, 101 * 1E6); // 100ms default hold-time
+    g_assert_true(qtest_get_irq(ts, 0));
+    g_assert_true(qtest_get_irq(ts, 1));
+
+    g_free(qtest_hmp(ts, "sendkey s"));
+
+    g_assert_true(qtest_get_irq(ts, 0));
+    g_assert_false(qtest_get_irq(ts, 1));
+
+    qtest_clock_step(ts, 100 * 1E6); // 100ms default hold-time
+
+    g_assert_true(qtest_get_irq(ts, 0));
+    g_assert_true(qtest_get_irq(ts, 1));
+
+    qtest_quit(ts);
+}
+
+static void test_reset(void)
+{
+    /* Test code goes here */
+	QTestState *ts = qtest_init("-machine " MACHINE);
+	qtest_irq_intercept_out(ts, QOM_PATH);
+    /* Assertions and other test logic */
+
+    g_free(qtest_hmp(ts, "sendkey w"));
+    g_assert_false(qtest_get_irq(ts, 0));
+
+    g_free(qtest_hmp(ts, "system_reset"));
+
+    g_assert_true(qtest_get_irq(ts, 0));
+    g_assert_true(qtest_get_irq(ts, 1));
+    // Apparently HMP can't send multiple keys at once, delay until it's cleared.
+    qtest_clock_step_next(ts);
+    qtest_clock_step_next(ts);
+    qtest_clock_step_next(ts);
+    g_free(qtest_hmp(ts, "sendkey s"));
+
+    g_assert_false(qtest_get_irq(ts, 1));
+
+    g_free(qtest_hmp(ts, "system_reset"));
+
+    g_assert_true(qtest_get_irq(ts, 1));
+
+    qtest_quit(ts);
+}
+
+int main(int argc, char **argv)
+{
+    g_test_init(&argc, &argv, NULL);
+    g_test_set_nonfatal_assertions();
+
+    /* Add your test case to the test suite */
+    qtest_add_func(TEST_PREFIX "keys", test_key_control);
+    qtest_add_func(TEST_PREFIX "reset", test_reset);
+
+    /* Run the tests */
+    return g_test_run();
+}