esp32: Replace exception raising with corresponding mp_raise_XXX funcs.

candeira · dpgeorge · commit 22ec5323d33a · 2017-08-09T20:45:49.000+10:00
diff --git a/esp32/machine_adc.c b/esp32/machine_adc.c
@@ -68,7 +68,7 @@ STATIC mp_obj_t madc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     for (int i = 0; i < MP_ARRAY_SIZE(madc_obj); i++) {
         if (pin_id == madc_obj[i].gpio_id) { self = &madc_obj[i]; break; }
     }
-    if (!self) nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "invalid Pin for ADC"));
+    if (!self) mp_raise_ValueError("invalid Pin for ADC");
     esp_err_t err = adc1_config_channel_atten(self->adc1_id, ADC_ATTEN_0db);
     if (err == ESP_OK) return MP_OBJ_FROM_PTR(self);
     mp_raise_ValueError("Parameter Error");
diff --git a/esp32/machine_dac.c b/esp32/machine_dac.c
@@ -56,7 +56,7 @@ STATIC mp_obj_t mdac_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     for (int i = 0; i < MP_ARRAY_SIZE(mdac_obj); i++) {
         if (pin_id == mdac_obj[i].gpio_id) { self = &mdac_obj[i]; break; }
     }
-    if (!self) nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "invalid Pin for DAC"));
+    if (!self) mp_raise_ValueError("invalid Pin for DAC");
 
     esp_err_t err = dac_output_enable(self->dac_id);
     if (err == ESP_OK) {
diff --git a/esp32/machine_pin.c b/esp32/machine_pin.c
@@ -173,7 +173,7 @@ mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
         self = (machine_pin_obj_t*)&machine_pin_obj[wanted_pin];
     }
     if (self == NULL || self->base.type == NULL) {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "invalid pin"));
+        mp_raise_ValueError("invalid pin");
     }
 
     if (n_args > 1 || n_kw > 0) {
diff --git a/esp32/machine_touchpad.c b/esp32/machine_touchpad.c
@@ -64,7 +64,7 @@ STATIC mp_obj_t mtp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
     for (int i = 0; i < MP_ARRAY_SIZE(touchpad_obj); i++) {
         if (pin_id == touchpad_obj[i].gpio_id) { self = &touchpad_obj[i]; break; }
     }
-    if (!self) nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "invalid pin for touchpad"));
+    if (!self) mp_raise_ValueError("invalid pin for touchpad");
 
     static int initialized = 0;
     if (!initialized) {
diff --git a/esp32/machine_uart.c b/esp32/machine_uart.c
@@ -126,7 +126,7 @@ STATIC void machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, co
             self->bits = 8;
             break;
         default:
-            nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "invalid data bits"));
+            mp_raise_ValueError("invalid data bits");
             break;
     }
 
@@ -161,7 +161,7 @@ STATIC void machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, co
             self->stop = 2;
             break;
         default:
-            nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "invalid stop bits"));
+            mp_raise_ValueError("invalid stop bits");
             break;
     }
 
diff --git a/esp32/modmachine.c b/esp32/modmachine.c
@@ -54,8 +54,7 @@ STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
         // set
         mp_int_t freq = mp_obj_get_int(args[0]) / 1000000;
         if (freq != 80 && freq != 160 && freq != 240) {
-            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
-                "frequency can only be either 80Mhz, 160MHz or 240MHz"));
+            mp_raise_ValueError("frequency can only be either 80Mhz, 160MHz or 240MHz");
         }
         /*
         system_update_cpu_freq(freq);
diff --git a/esp32/modnetwork.c b/esp32/modnetwork.c
@@ -180,7 +180,7 @@ STATIC mp_obj_t get_wlan(size_t n_args, const mp_obj_t *args) {
     } else if (idx == WIFI_IF_AP) {
         return MP_OBJ_FROM_PTR(&wlan_ap_obj);
     } else {
-        mp_raise_msg(&mp_type_ValueError, "invalid WLAN interface identifier");
+        mp_raise_ValueError("invalid WLAN interface identifier");
     }
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(get_wlan_obj, 0, 1, get_wlan);
@@ -368,8 +368,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_ifconfig_obj, 1, 2, esp_ifconfig)
 
 STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
     if (n_args != 1 && kwargs->used != 0) {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError,
-            "either pos or kw args are allowed"));
+        mp_raise_TypeError("either pos or kw args are allowed");
     }
 
     wlan_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
@@ -390,8 +389,7 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
                         mp_buffer_info_t bufinfo;
                         mp_get_buffer_raise(kwargs->table[i].value, &bufinfo, MP_BUFFER_READ);
                         if (bufinfo.len != 6) {
-                            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
-                                "invalid buffer length"));
+                            mp_raise_ValueError("invalid buffer length");
                         }
                         ESP_EXCEPTIONS(esp_wifi_set_mac(self->if_id, bufinfo.buf));
                         break;
@@ -449,8 +447,7 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
     // Get config
 
     if (n_args != 2) {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError,
-            "can query only one param"));
+        mp_raise_TypeError("can query only one param");
     }
 
     int req_if = -1;
@@ -492,8 +489,7 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
     return val;
 
 unknown:
-    nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
-        "unknown config param"));
+    mp_raise_ValueError("unknown config param");
 }
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(esp_config_obj, 1, esp_config);

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ STATIC mp_obj_t madc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n`
`68`	`68`	`for (int i = 0; i < MP_ARRAY_SIZE(madc_obj); i++) {`
`69`	`69`	`if (pin_id == madc_obj[i].gpio_id) { self = &madc_obj[i]; break; }`
`70`	`70`	`}`
`71`		`- if (!self) nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "invalid Pin for ADC"));`
	`71`	`+ if (!self) mp_raise_ValueError("invalid Pin for ADC");`
`72`	`72`	`esp_err_t err = adc1_config_channel_atten(self->adc1_id, ADC_ATTEN_0db);`
`73`	`73`	`if (err == ESP_OK) return MP_OBJ_FROM_PTR(self);`
`74`	`74`	`mp_raise_ValueError("Parameter Error");`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ STATIC mp_obj_t mdac_make_new(const mp_obj_type_t *type, size_t n_args, size_t n`
`56`	`56`	`for (int i = 0; i < MP_ARRAY_SIZE(mdac_obj); i++) {`
`57`	`57`	`if (pin_id == mdac_obj[i].gpio_id) { self = &mdac_obj[i]; break; }`
`58`	`58`	`}`
`59`		`- if (!self) nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "invalid Pin for DAC"));`
	`59`	`+ if (!self) mp_raise_ValueError("invalid Pin for DAC");`
`60`	`60`
`61`	`61`	`esp_err_t err = dac_output_enable(self->dac_id);`
`62`	`62`	`if (err == ESP_OK) {`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,`
`173`	`173`	`self = (machine_pin_obj_t*)&machine_pin_obj[wanted_pin];`
`174`	`174`	`}`
`175`	`175`	`if (self == NULL \|\| self->base.type == NULL) {`
`176`		`- nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "invalid pin"));`
	`176`	`+ mp_raise_ValueError("invalid pin");`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`if (n_args > 1 \|\| n_kw > 0) {`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ STATIC mp_obj_t mtp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_`
`64`	`64`	`for (int i = 0; i < MP_ARRAY_SIZE(touchpad_obj); i++) {`
`65`	`65`	`if (pin_id == touchpad_obj[i].gpio_id) { self = &touchpad_obj[i]; break; }`
`66`	`66`	`}`
`67`		`- if (!self) nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "invalid pin for touchpad"));`
	`67`	`+ if (!self) mp_raise_ValueError("invalid pin for touchpad");`
`68`	`68`
`69`	`69`	`static int initialized = 0;`
`70`	`70`	`if (!initialized) {`