diff --git a/nrf5/drivers/display/epaper/moddisplay_epaper.c b/nrf5/drivers/display/epaper/moddisplay_epaper.c deleted file mode 100644 index fb481429ad..0000000000 --- a/nrf5/drivers/display/epaper/moddisplay_epaper.c +++ /dev/null @@ -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 diff --git a/nrf5/drivers/display/epaper/moddisplay_epaper.h b/nrf5/drivers/display/epaper/moddisplay_epaper.h deleted file mode 100644 index 5a90a001fa..0000000000 --- a/nrf5/drivers/display/epaper/moddisplay_epaper.h +++ /dev/null @@ -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__ diff --git a/nrf5/drivers/display/epaper/epaper_sld00200p_driver.c b/nrf5/drivers/display/epaper_sld00200p_driver.c similarity index 96% rename from nrf5/drivers/display/epaper/epaper_sld00200p_driver.c rename to nrf5/drivers/display/epaper_sld00200p_driver.c index 7442e8a3e3..3deef46ecd 100644 --- a/nrf5/drivers/display/epaper/epaper_sld00200p_driver.c +++ b/nrf5/drivers/display/epaper_sld00200p_driver.c @@ -24,7 +24,7 @@ * THE SOFTWARE. */ -#include +#include "epaper_sld00200p_driver.h" #if MICROPY_PY_DISPLAY_EPAPER_SLD00200P diff --git a/nrf5/drivers/display/epaper/epaper_sld00200p_driver.h b/nrf5/drivers/display/epaper_sld00200p_driver.h similarity index 100% rename from nrf5/drivers/display/epaper/epaper_sld00200p_driver.h rename to nrf5/drivers/display/epaper_sld00200p_driver.h diff --git a/nrf5/drivers/display/epaper/epaper_sld00200p_obj.c b/nrf5/drivers/display/epaper_sld00200p_obj.c similarity index 100% rename from nrf5/drivers/display/epaper/epaper_sld00200p_obj.c rename to nrf5/drivers/display/epaper_sld00200p_obj.c diff --git a/nrf5/drivers/display/epaper/epaper_sld00200p_obj.h b/nrf5/drivers/display/epaper_sld00200p_obj.h similarity index 100% rename from nrf5/drivers/display/epaper/epaper_sld00200p_obj.h rename to nrf5/drivers/display/epaper_sld00200p_obj.h diff --git a/nrf5/drivers/display/lcd/moddisplay_lcd.c b/nrf5/drivers/display/lcd/moddisplay_lcd.c deleted file mode 100644 index 7b871521ec..0000000000 --- a/nrf5/drivers/display/lcd/moddisplay_lcd.c +++ /dev/null @@ -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 diff --git a/nrf5/drivers/display/lcd/moddisplay_lcd.h b/nrf5/drivers/display/lcd/moddisplay_lcd.h deleted file mode 100644 index 8646316f53..0000000000 --- a/nrf5/drivers/display/lcd/moddisplay_lcd.h +++ /dev/null @@ -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__ diff --git a/nrf5/drivers/display/moddisplay.c b/nrf5/drivers/display/moddisplay.c index f53e121794..2de89bb967 100644 --- a/nrf5/drivers/display/moddisplay.c +++ b/nrf5/drivers/display/moddisplay.c @@ -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 }; diff --git a/nrf5/drivers/display/oled/moddisplay_oled.c b/nrf5/drivers/display/oled/moddisplay_oled.c deleted file mode 100644 index bb39d46f6f..0000000000 --- a/nrf5/drivers/display/oled/moddisplay_oled.c +++ /dev/null @@ -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 diff --git a/nrf5/drivers/display/oled/moddisplay_oled.h b/nrf5/drivers/display/oled/moddisplay_oled.h deleted file mode 100644 index 9a37e4b715..0000000000 --- a/nrf5/drivers/display/oled/moddisplay_oled.h +++ /dev/null @@ -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__