djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nrf5/drivers: Removing one level of module hierarchy in display drivers. Removed epaper, lcd and oled modules, making import of classes happen directly from display module.

Browse Source
This commit is contained in:
Glenn Ruben Bakke 2017-01-05 00:49:21 +01:00
parent 6cddad02a8
commit aaadec99e0
11 changed files with 10 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
nrf5/drivers/display/epaper/moddisplay_epaper.c
View File

@ -1,46 +0,0 @@
/*
* This file is part of the Micro Python project, http://micropython.org/
*
* The MIT License (MIT)
*
* Copyright (c) 2017 Glenn Ruben Bakke
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "epaper_sld00200p_obj.h"
#include "py/obj.h"
#if MICROPY_PY_DISPLAY_EPAPER
STATIC const mp_map_elem_t epaper_module_globals_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_epaper) },
#if MICROPY_PY_DISPLAY_EPAPER_SLD00200P
{ MP_OBJ_NEW_QSTR(MP_QSTR_sld00200p), (mp_obj_t)&epaper_sld00200p_type },
#endif
};
STATIC MP_DEFINE_CONST_DICT(epaper_module_globals, epaper_module_globals_table);
const mp_obj_module_t display_epaper_module = {
.base = { &mp_type_module },
.globals = (mp_obj_dict_t*)&epaper_module_globals,
};
#endif // MICROPY_PY_DISPLAY_EPAPER

32
nrf5/drivers/display/epaper/moddisplay_epaper.h
View File

@ -1,32 +0,0 @@
/*
* This file is part of the Micro Python project, http://micropython.org/
*
* The MIT License (MIT)
*
* Copyright (c) 2017 Glenn Ruben Bakke
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef MODDISPLAY_EPAPER_H__
#define MODDISPLAY_EPAPER_H__
extern const mp_obj_module_t display_epaper_module;
#endif // MODDISPLAY_EPAPER_H__

2
nrf5/drivers/display/epaper/epaper_sld00200p_driver.c → nrf5/drivers/display/epaper_sld00200p_driver.c
View File

@ -24,7 +24,7 @@
* THE SOFTWARE.
*/
#include <epaper/epaper_sld00200p_driver.h>
#include "epaper_sld00200p_driver.h"
#if MICROPY_PY_DISPLAY_EPAPER_SLD00200P

0
nrf5/drivers/display/epaper/epaper_sld00200p_driver.h → nrf5/drivers/display/epaper_sld00200p_driver.h
View File

0
nrf5/drivers/display/epaper/epaper_sld00200p_obj.c → nrf5/drivers/display/epaper_sld00200p_obj.c
View File

0
nrf5/drivers/display/epaper/epaper_sld00200p_obj.h → nrf5/drivers/display/epaper_sld00200p_obj.h
View File

47
nrf5/drivers/display/lcd/moddisplay_lcd.c
View File

@ -1,47 +0,0 @@
/*
* This file is part of the Micro Python project, http://micropython.org/
*
* The MIT License (MIT)
*
* Copyright (c) 2017 Glenn Ruben Bakke
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "py/obj.h"
#if MICROPY_PY_DISPLAY_LCD
STATIC const mp_map_elem_t lcd_module_globals_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_lcd) },
#if 0
{ MP_OBJ_NEW_QSTR(MP_QSTR_sld10261p), (mp_obj_t)&lcd_sld10261p_type },
{ MP_OBJ_NEW_QSTR(MP_QSTR_ssd1289), (mp_obj_t)&lcd_ssd1289_type },
{ MP_OBJ_NEW_QSTR(MP_QSTR_ls027b7dh01), (mp_obj_t)&lcd_ls027b7dh01_type },
#endif
};
STATIC MP_DEFINE_CONST_DICT(lcd_module_globals, lcd_module_globals_table);
const mp_obj_module_t display_lcd_module = {
.base = { &mp_type_module },
.globals = (mp_obj_dict_t*)&lcd_module_globals,
};
#endif // MICROPY_PY_DISPLAY_LCD

32
nrf5/drivers/display/lcd/moddisplay_lcd.h
View File

@ -1,32 +0,0 @@
/*
* This file is part of the Micro Python project, http://micropython.org/
*
* The MIT License (MIT)
*
* Copyright (c) 2017 Glenn Ruben Bakke
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef MODDISPLAY_LCD_H__
#define MODDISPLAY_LCD_H__
extern const mp_obj_module_t display_lcd_module;
#endif // MODDISPLAY_LCD_H__

19
nrf5/drivers/display/moddisplay.c
View File

@ -28,20 +28,19 @@
#if MICROPY_PY_DISPLAY
#include "epaper/moddisplay_epaper.h"
#include "lcd/moddisplay_lcd.h"
#include "oled/moddisplay_oled.h"
#include "epaper_sld00200p_obj.h"
STATIC const mp_map_elem_t mp_module_display_globals_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_display) },
#if MICROPY_PY_DISPLAY_EPAPER
{ MP_OBJ_NEW_QSTR(MP_QSTR_epaper), (mp_obj_t)&display_epaper_module },
#if MICROPY_PY_DISPLAY_EPAPER_SLD00200P
{ MP_OBJ_NEW_QSTR(MP_QSTR_SLD00200P), (mp_obj_t)&epaper_sld00200p_type },
#endif
#if MICROPY_PY_DISPLAY_LCD
{ MP_OBJ_NEW_QSTR(MP_QSTR_lcd), (mp_obj_t)&display_lcd_module},
#endif
#if MICROPY_PY_DISPLAY_OLED
{ MP_OBJ_NEW_QSTR(MP_QSTR_oled), (mp_obj_t)&display_oled_module },
#if 0
{ MP_OBJ_NEW_QSTR(MP_QSTR_SLD10261P), (mp_obj_t)&lcd_sld10261p_type },
{ MP_OBJ_NEW_QSTR(MP_QSTR_SSD1289), (mp_obj_t)&lcd_ssd1289_type },
{ MP_OBJ_NEW_QSTR(MP_QSTR_LS027b7DH01), (mp_obj_t)&lcd_ls027b7dh01_type },
{ MP_OBJ_NEW_QSTR(MP_QSTR_SSD1305), (mp_obj_t)&oled_ssd1305_type },
{ MP_OBJ_NEW_QSTR(MP_QSTR_SSD1306), (mp_obj_t)&oled_ssd1306_type },
#endif
};

46
nrf5/drivers/display/oled/moddisplay_oled.c
View File

@ -1,46 +0,0 @@
/*
* This file is part of the Micro Python project, http://micropython.org/
*
* The MIT License (MIT)
*
* Copyright (c) 2017 Glenn Ruben Bakke
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "py/obj.h"
#if MICROPY_PY_DISPLAY_OLED
STATIC const mp_map_elem_t oled_module_globals_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_oled) },
#if 0
{ MP_OBJ_NEW_QSTR(MP_QSTR_ssd1305), (mp_obj_t)&oled_ssd1305_type },
{ MP_OBJ_NEW_QSTR(MP_QSTR_ssd1306), (mp_obj_t)&oled_ssd1306_type },
#endif
};
STATIC MP_DEFINE_CONST_DICT(oled_module_globals, oled_module_globals_table);
const mp_obj_module_t display_oled_module = {
.base = { &mp_type_module },
.globals = (mp_obj_dict_t*)&oled_module_globals,
};
#endif // MICROPY_PY_DISPLAY_OLED

32
nrf5/drivers/display/oled/moddisplay_oled.h
View File

@ -1,32 +0,0 @@
/*
* This file is part of the Micro Python project, http://micropython.org/
*
* The MIT License (MIT)
*
* Copyright (c) 2017 Glenn Ruben Bakke
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef MODDISPLAY_OLED_H__
#define MODDISPLAY_OLED_H__
extern const mp_obj_module_t display_oled_module;
#endif // MODDISPLAY_OLED_H__