diff --git a/epicardium/modules/ambient.c b/epicardium/modules/ambient.c index e6c1b51b020380083959e006c5c0a92354854320..fe4fc64edb6c7fabd592ce45b408ded9468d2221 100644 --- a/epicardium/modules/ambient.c +++ b/epicardium/modules/ambient.c @@ -5,7 +5,6 @@ #include "adc.h" #include "gpio.h" - #define READ_FREQ 100 static uint16_t last_value; @@ -13,64 +12,63 @@ static TaskHandle_t poll_task; void epic_ambient_init() { - const sys_cfg_adc_t sys_adc_cfg = NULL; /* No system specific configuration needed. */ - if (ADC_Init(0x9, &sys_adc_cfg) != E_NO_ERROR) { - printf("Error Bad Parameter\n"); - while (1); - } - GPIO_Config(&gpio_cfg_adc7); + const sys_cfg_adc_t sys_adc_cfg = + NULL; /* No system specific configuration needed. */ + if (ADC_Init(0x9, &sys_adc_cfg) != E_NO_ERROR) { + printf("Error Bad Parameter\n"); + while (1) + ; + } + GPIO_Config(&gpio_cfg_adc7); } void vReadAdcTask() { - TickType_t last_wake_time; - last_wake_time = xTaskGetTickCount(); - for (;;) - { - vTaskDelayUntil(&last_wake_time, READ_FREQ); + TickType_t last_wake_time; + last_wake_time = xTaskGetTickCount(); + for (;;) { + vTaskDelayUntil(&last_wake_time, READ_FREQ); - ADC_StartConvert(ADC_CH_7, 0, 0); - ADC_GetData(&last_value); - } + ADC_StartConvert(ADC_CH_7, 0, 0); + ADC_GetData(&last_value); + } } void epic_ambient_run() { - if (poll_task) - { - // task is already running - return; - } - epic_ambient_init(); + if (poll_task) { + // task is already running + return; + } + epic_ambient_init(); - BaseType_t xReturned; + BaseType_t xReturned; - xReturned = xTaskCreate( - vReadAdcTask, - "ambientAdc", - configMINIMAL_STACK_SIZE, - NULL, - 1, - &poll_task); + xReturned = xTaskCreate( + vReadAdcTask, + "ambientAdc", + configMINIMAL_STACK_SIZE, + NULL, + 1, + &poll_task + ); - if (xReturned == pdPASS) - { - //TODO: Handle failure - } + if (xReturned == pdPASS) { + //TODO: Handle failure + } } void epic_ambient_stop() { - if (!poll_task) - { - // task isn't running - return; - } - vTaskDelete(poll_task); - poll_task = NULL; + if (!poll_task) { + // task isn't running + return; + } + vTaskDelete(poll_task); + poll_task = NULL; } uint16_t epic_ambient_get() { - return last_value; + return last_value; } diff --git a/pycardium/modules/ambient.c b/pycardium/modules/ambient.c index a66ee198a46e3d7365ade9e08c98a8174bbd0934..6f972a412d4e08ca840b62dfdd8a42f639cec920 100644 --- a/pycardium/modules/ambient.c +++ b/pycardium/modules/ambient.c @@ -5,36 +5,38 @@ STATIC mp_obj_t mp_ambient_start() { - epic_ambient_run(); - return mp_const_none; + epic_ambient_run(); + return mp_const_none; } STATIC MP_DEFINE_CONST_FUN_OBJ_0(ambient_start_obj, mp_ambient_start); STATIC mp_obj_t mp_ambient_get_reading() { - uint16_t last = epic_ambient_get(); - return mp_obj_new_int_from_uint(last); + uint16_t last = epic_ambient_get(); + return mp_obj_new_int_from_uint(last); } STATIC MP_DEFINE_CONST_FUN_OBJ_0(ambient_get_obj, mp_ambient_get_reading); STATIC mp_obj_t mp_ambient_stop() { - epic_ambient_stop(); - return mp_const_none; + epic_ambient_stop(); + return mp_const_none; } STATIC MP_DEFINE_CONST_FUN_OBJ_0(ambient_stop_obj, mp_ambient_stop); STATIC const mp_rom_map_elem_t ambient_module_globals_table[] = { - { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ambient) }, - { MP_ROM_QSTR(MP_QSTR_start), MP_ROM_PTR(&ambient_start_obj) }, - { MP_ROM_QSTR(MP_QSTR_stop), MP_ROM_PTR(&ambient_stop_obj) }, - { MP_ROM_QSTR(MP_QSTR_get_reading), MP_ROM_PTR(&ambient_get_obj) } + { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ambient) }, + { MP_ROM_QSTR(MP_QSTR_start), MP_ROM_PTR(&ambient_start_obj) }, + { MP_ROM_QSTR(MP_QSTR_stop), MP_ROM_PTR(&ambient_stop_obj) }, + { MP_ROM_QSTR(MP_QSTR_get_reading), MP_ROM_PTR(&ambient_get_obj) } }; -STATIC MP_DEFINE_CONST_DICT(ambient_module_globals, ambient_module_globals_table); +STATIC MP_DEFINE_CONST_DICT( + ambient_module_globals, ambient_module_globals_table +); const mp_obj_module_t ambient_module = { - .base = { &mp_type_module }, - .globals = (mp_obj_dict_t *)&ambient_module_globals, + .base = { &mp_type_module }, + .globals = (mp_obj_dict_t *)&ambient_module_globals, }; MP_REGISTER_MODULE(MP_QSTR_ambient, ambient_module, MODULE_AMBIENT_ENABLED);