From 5a8253c01997d18a5b74f4f087465492d84d1b1c Mon Sep 17 00:00:00 2001 From: Cabia Rangris Date: Tue, 6 May 2025 00:05:47 +0400 Subject: [PATCH] klipper: 0.12.0-unstable-2025-03-25 -> 0.13.0-unstable-2025-05-02 Bumped genconf as well Co-Authored-By: r-ryantm --- pkgs/servers/klipper/default.nix | 6 +++--- pkgs/servers/klipper/simulator.cfg | 23 +++++++++++++++++------ 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 2f87a3e928ad..34ec693f0fa5 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "0.12.0-unstable-2025-03-25"; + version = "0.13.0-unstable-2025-05-02"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "68dbbc8d411d0d4961fd0837b00244a6bba1eefd"; - sha256 = "sha256-H9zoytYqmQmKevAiE8Y/gFcfIcC/zypBF8bH6yEi8m0="; + rev = "1cc63980747b80516f8fc4f022eedf18ae739086"; + sha256 = "sha256-0VKlbCdfVE8XxGoKZQd5Gab5Aq3oq4EHdtCh3tEkgwI="; }; sourceRoot = "${src.name}/klippy"; diff --git a/pkgs/servers/klipper/simulator.cfg b/pkgs/servers/klipper/simulator.cfg index 11e8d77b03c3..adabf7f95afc 100644 --- a/pkgs/servers/klipper/simulator.cfg +++ b/pkgs/servers/klipper/simulator.cfg @@ -5,7 +5,7 @@ # CONFIG_MACH_LPC176X is not set # CONFIG_MACH_STM32 is not set # CONFIG_MACH_HC32F460 is not set -# CONFIG_MACH_RP2040 is not set +# CONFIG_MACH_RPXXXX is not set # CONFIG_MACH_PRU is not set # CONFIG_MACH_AR100 is not set # CONFIG_MACH_LINUX is not set @@ -18,15 +18,26 @@ CONFIG_SERIAL_BAUD=250000 CONFIG_USB_VENDOR_ID=0x1d50 CONFIG_USB_DEVICE_ID=0x614e CONFIG_USB_SERIAL_NUMBER="12345" -CONFIG_WANT_GPIO_BITBANGING=y -CONFIG_WANT_DISPLAYS=y -CONFIG_WANT_SENSORS=y -CONFIG_WANT_LIS2DW=y +CONFIG_WANT_ADC=y +CONFIG_WANT_SPI=y CONFIG_WANT_SOFTWARE_SPI=y +CONFIG_WANT_HARD_PWM=y +CONFIG_WANT_BUTTONS=y +CONFIG_WANT_TMCUART=y +CONFIG_WANT_NEOPIXEL=y +CONFIG_WANT_PULSE_COUNTER=y +CONFIG_WANT_ST7920=y +CONFIG_WANT_HD44780=y +CONFIG_WANT_ADXL345=y +CONFIG_WANT_LIS2DW=y +CONFIG_WANT_THERMOCOUPLE=y +CONFIG_WANT_HX71X=y +CONFIG_WANT_ADS1220=y +CONFIG_WANT_SENSOR_ANGLE=y CONFIG_NEED_SENSOR_BULK=y CONFIG_CANBUS_FREQUENCY=1000000 +CONFIG_INLINE_STEPPER_HACK=y CONFIG_HAVE_GPIO=y CONFIG_HAVE_GPIO_ADC=y CONFIG_HAVE_GPIO_SPI=y CONFIG_HAVE_GPIO_HARD_PWM=y -CONFIG_INLINE_STEPPER_HACK=y