Skip to content

Commit 7a7e845

Browse files
hs0225yichoi
authored andcommitted
Fix invalid jval_destory function call in stm32f4dis module (#945)
IoT.js-DCO-1.0-Signed-off-by: Hosung Kim [email protected]
1 parent 7be6444 commit 7a7e845

File tree

1 file changed

+19
-10
lines changed

1 file changed

+19
-10
lines changed

src/platform/nuttx/iotjs_module_stm32f4dis-nuttx.c

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -128,38 +128,47 @@ static void iotjs_pin_initialize_pwm(const iotjs_jval_t* jobj) {
128128

129129
#define SET_GPIO_CONSTANT_TIM_1(timer) \
130130
SET_GPIO_CONSTANT_TIM(timer); \
131-
SET_GPIO_CONSTANT_CHANNEL(timer, 1); \
132-
iotjs_jval_destroy(&jtim##timer);
131+
SET_GPIO_CONSTANT_CHANNEL(timer, 1);
133132

134133
#define SET_GPIO_CONSTANT_TIM_2(timer) \
135134
SET_GPIO_CONSTANT_TIM(timer); \
136135
SET_GPIO_CONSTANT_CHANNEL(timer, 1); \
137-
SET_GPIO_CONSTANT_CHANNEL(timer, 2); \
138-
iotjs_jval_destroy(&jtim##timer);
136+
SET_GPIO_CONSTANT_CHANNEL(timer, 2);
139137

140138
#define SET_GPIO_CONSTANT_TIM_4(timer) \
141139
SET_GPIO_CONSTANT_TIM(timer); \
142140
SET_GPIO_CONSTANT_CHANNEL(timer, 1); \
143141
SET_GPIO_CONSTANT_CHANNEL(timer, 2); \
144142
SET_GPIO_CONSTANT_CHANNEL(timer, 3); \
145-
SET_GPIO_CONSTANT_CHANNEL(timer, 4); \
146-
iotjs_jval_destroy(&jtim##timer);
143+
SET_GPIO_CONSTANT_CHANNEL(timer, 4);
147144

148145
SET_GPIO_CONSTANT_TIM_4(1); // PA8, PE9, PA9, PE11, PA10, PE13, PA11, PE14
146+
iotjs_jval_destroy(&jtim1);
149147
SET_GPIO_CONSTANT_TIM_4(2); // PA0, PA15, PA1, PB3, PA2, PB10, PA3, PB11
150148
iotjs_jval_set_property_number(&jtim2, "CH1_3", GPIO_TIM2_CH1OUT_3); // PA5
149+
iotjs_jval_destroy(&jtim2);
151150
SET_GPIO_CONSTANT_TIM_4(3); // PA6, PB4, PA7, PB5, PB0, PC8, PB1, PC9
152151
iotjs_jval_set_property_number(&jtim3, "CH1_3", GPIO_TIM3_CH1OUT_3); // PC6
153152
iotjs_jval_set_property_number(&jtim3, "CH2_3", GPIO_TIM3_CH2OUT_3); // PC7
154-
SET_GPIO_CONSTANT_TIM_4(4); // PB6, PD12, PB7, PD13, PB8, PD14, PB9, PD15
155-
SET_GPIO_CONSTANT_TIM_4(5); // PA0, PH10, PA1, PH11, PA2, PH12, PA3, PI0
156-
SET_GPIO_CONSTANT_TIM_4(8); // PC6, PI5, PC7, PI6, PC8, PI7, PC9, PI2
157-
SET_GPIO_CONSTANT_TIM_2(9); // PA2, PE5, PA3, PE6
153+
iotjs_jval_destroy(&jtim3);
154+
SET_GPIO_CONSTANT_TIM_4(4); // PB6, PD12, PB7, PD13, PB8, PD14, PB9, PD15
155+
iotjs_jval_destroy(&jtim4);
156+
SET_GPIO_CONSTANT_TIM_4(5); // PA0, PH10, PA1, PH11, PA2, PH12, PA3, PI0
157+
iotjs_jval_destroy(&jtim5);
158+
SET_GPIO_CONSTANT_TIM_4(8); // PC6, PI5, PC7, PI6, PC8, PI7, PC9, PI2
159+
iotjs_jval_destroy(&jtim8);
160+
SET_GPIO_CONSTANT_TIM_2(9); // PA2, PE5, PA3, PE6
161+
iotjs_jval_destroy(&jtim9);
158162
SET_GPIO_CONSTANT_TIM_1(10); // PB8, PF6
163+
iotjs_jval_destroy(&jtim10);
159164
SET_GPIO_CONSTANT_TIM_1(11); // PB9, PF7
165+
iotjs_jval_destroy(&jtim11);
160166
SET_GPIO_CONSTANT_TIM_2(12); // PH6, PB14, PB15, PH9
167+
iotjs_jval_destroy(&jtim12);
161168
SET_GPIO_CONSTANT_TIM_1(13); // PA6, PF8
169+
iotjs_jval_destroy(&jtim13);
162170
SET_GPIO_CONSTANT_TIM_1(14); // PA7, PF9
171+
iotjs_jval_destroy(&jtim14);
163172

164173
#undef SET_GPIO_CONSTANT_TIM_4
165174
#undef SET_GPIO_CONSTANT_TIM_2

0 commit comments

Comments
 (0)