diff --git a/cfgs/CALIBRATION.cfg b/cfgs/CALIBRATION.cfg
index 73895c7..468c704 100644
--- a/cfgs/CALIBRATION.cfg
+++ b/cfgs/CALIBRATION.cfg
@@ -1,21 +1,27 @@
 [gcode_macro PID_TEST_BED]
 gcode:
+    # Parameters
+    {% set TARGETTEMP = params.TEMP|default(70)|int %}
+    
     {% set max_x = printer.configfile.config["stepper_x"]["position_max"]|float %}
     {% set max_y = printer.configfile.config["stepper_y"]["position_max"]|float %}
     G28
     G90
     G1 X{max_x/2} Y{max_y/2} Z40 F6000
-    PID_CALIBRATE HEATER=heater_bed TARGET=70
+    PID_CALIBRATE HEATER=heater_bed TARGET={TARGETTEMP}
 
 [gcode_macro PID_TEST_HOTEND]
 gcode:
+    # Parameters
+    {% set TARGETTEMP = params.TEMP|default(245)|int %}
+    
     {% set max_x = printer.configfile.config["stepper_x"]["position_max"]|float %}
     {% set max_y = printer.configfile.config["stepper_y"]["position_max"]|float %}
     G28
     G90
     G1 X{max_x/2} Y{max_y/2} Z10 F6000
     M106 S64
-    PID_CALIBRATE HEATER=extruder TARGET=245
+    PID_CALIBRATE HEATER=extruder TARGET={TARGETTEMP}
 
 # TODO test this
 [gcode_macro PID_TEST_ALL]
diff --git a/cfgs/misc-macros.cfg b/cfgs/misc-macros.cfg
index 96421fe..0a696df 100644
--- a/cfgs/misc-macros.cfg
+++ b/cfgs/misc-macros.cfg
@@ -5,7 +5,7 @@ enable_force_move: True
 [temperature_sensor raspberry_pi]
 sensor_type: temperature_host
 
-# NOTE If you're using a an Orange Pi, you can uncomment the next 2 lines, optionally.
+# NOTE If you're using a an Orange Pi, you can uncomment the next 3 lines, optionally.
 # [temperature_sensor Orange_Pi]
 # sensor_type: temperature_host
 # sensor_path: /sys/class/thermal/thermal_zone0/temp