Skip to content

Commit 3b2ece9

Browse files
committed
fixing chamber temperature
1 parent 44cee4f commit 3b2ece9

File tree

5 files changed

+22
-17
lines changed

5 files changed

+22
-17
lines changed

Marlin/Configuration.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@
419419
#define TEMP_SENSOR_5 0
420420
//@
421421
#define TEMP_SENSOR_BED 1
422-
#define TEMP_SENSOR_CHAMBER 0
422+
#define TEMP_SENSOR_CHAMBER 5
423423

424424
// Dummy thermistor constant temperature readings, for use with 998 and 999
425425
#define DUMMY_THERMISTOR_998_VALUE 25
@@ -596,7 +596,7 @@
596596

597597
#define THERMAL_PROTECTION_HOTENDS // Enable thermal protection for all extruders
598598
#define THERMAL_PROTECTION_BED // Enable thermal protection for the heated bed
599-
#define THERMAL_PROTECTION_CHAMBER // Enable thermal protection for the heated chamber
599+
//#define THERMAL_PROTECTION_CHAMBER // Enable thermal protection for the heated chamber
600600

601601
//===========================================================================
602602
//============================= Mechanical Settings =========================
@@ -1127,7 +1127,7 @@
11271127
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
11281128
#define NUM_RUNOUT_SENSORS 1 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.
11291129
#define FIL_RUNOUT_INVERTING false // Set to true to invert the logic of the sensor.
1130-
#define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins.
1130+
//#define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins.
11311131
//#define FIL_RUNOUT_PULLDOWN // Use internal pulldown for filament runout pins.
11321132

11331133
// Set one or more commands to execute on filament runout.

Marlin/Configuration_adv.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2789,7 +2789,7 @@
27892789
/**
27902790
* M43 - display pin status, watch pins for changes, watch endstops & toggle LED, Z servo probe test, toggle pins
27912791
*/
2792-
//#define PINS_DEBUGGING
2792+
#define PINS_DEBUGGING
27932793

27942794
// Enable Marlin dev mode which adds some special commands
27952795
//#define MARLIN_DEV_MODE

Marlin/src/HAL/HAL_STM32F1/HAL.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ const uint8_t adc_pins[] = {
100100
#if HAS_HEATED_BED
101101
TEMP_BED_PIN,
102102
#endif
103-
#if HAS_HEATED_CHAMBER
103+
#if HAS_TEMP_CHAMBER
104104
TEMP_CHAMBER_PIN,
105105
#endif
106106
#if HAS_TEMP_ADC_1
@@ -139,7 +139,7 @@ enum TEMP_PINS : char {
139139
#if HAS_HEATED_BED
140140
TEMP_BED,
141141
#endif
142-
#if HAS_HEATED_CHAMBER
142+
#if HAS_TEMP_CHAMBER
143143
TEMP_CHAMBER,
144144
#endif
145145
#if HAS_TEMP_ADC_1
@@ -322,7 +322,7 @@ void HAL_adc_start_conversion(const uint8_t adc_pin) {
322322
#if HAS_HEATED_BED
323323
case TEMP_BED_PIN: pin_index = TEMP_BED; break;
324324
#endif
325-
#if HAS_HEATED_CHAMBER
325+
#if HAS_TEMP_CHAMBER
326326
case TEMP_CHAMBER_PIN: pin_index = TEMP_CHAMBER; break;
327327
#endif
328328
#if HAS_TEMP_ADC_1

Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h

+12-9
Original file line numberDiff line numberDiff line change
@@ -74,22 +74,25 @@
7474
#define E0_STEP_PIN PD6
7575
#define E0_DIR_PIN PD3
7676

77-
#define E1_ENABLE_PIN PA3
78-
#define E1_STEP_PIN PA6
79-
#define E1_DIR_PIN PA1
77+
//#define E1_ENABLE_PIN PA3
78+
//#define E1_STEP_PIN PA6
79+
//#define E1_DIR_PIN PA1
8080

8181
//
8282
// Temperature Sensors
8383
//
84-
#define TEMP_0_PIN PC1 // TH1
85-
#define TEMP_1_PIN PC2 // TH2
86-
#define TEMP_BED_PIN PC0 // TB1
84+
#define TEMP_0_PIN PC1 // TH1
85+
#define TEMP_CHAMBER_PIN PC2 // TH2
86+
87+
//#define TEMP_1_PIN PC2 // TH2
88+
89+
#define TEMP_BED_PIN PC0 // TB1
8790

8891
//
8992
// Heaters / Fans
9093
//
9194
#define HEATER_0_PIN PC3 // HEATER1
92-
#define HEATER_1_PIN PB0 // HEATER2
95+
//#define HEATER_1_PIN PB0 // HEATER2
9396
#define HEATER_BED_PIN PA0 // HOT BED
9497

9598
#define FAN_PIN PB1 // FAN
@@ -127,7 +130,7 @@
127130
#define FSMC_CS_PIN PD7 // NE4
128131
#define FSMC_RS_PIN PD11 // A0
129132

130-
#define LCD_USE_DMA_FSMC // DMA transfer to TFT?
133+
#define LCD_USE_DMA_FSMC //
131134
#define FSMC_DMA_DEV DMA2
132135
#define FSMC_DMA_CHANNEL DMA_CH5
133136

@@ -139,7 +142,7 @@
139142
#if ENABLED(TOUCH_BUTTONS)
140143
//@
141144
#define TOUCH_CS_PIN PA7
142-
#define TOUCH_SCK_PIN PB13 // ? complete SPI pins
145+
#define TOUCH_SCK_PIN PB13
143146
#define TOUCH_MOSI_PIN PB15
144147
#define TOUCH_MISO_PIN PB14
145148
#endif

buildroot/share/PlatformIO/scripts/mks_robin_nano.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ def encrypt(source, target, env):
2222
byte = firmware.read(1)
2323
if position >= 320 and position < 31040:
2424
byte = chr(ord(byte) ^ key[position & 31])
25-
robin.write(byte)
25+
robin.write(byte.encode('charmap'))
26+
else:
27+
robin.write(byte)
2628
position += 1
2729
finally:
2830
firmware.close()

0 commit comments

Comments
 (0)