Commit 8bc3fc20 authored by Paul Sokolovsky's avatar Paul Sokolovsky
Browse files

esp8266: Rename "machine" module implementation to use contemporary naming.

Previously they used historical "pyb" affix causing confusion and
inconsistency (there's no "pyb" module in modern ports; but people
took esp8266 port as an example, and "pyb" naming kept proliferating,
while other people complained that source structure is not clear).
parent 3ccdbf79
...@@ -78,19 +78,19 @@ SRC_C = \ ...@@ -78,19 +78,19 @@ SRC_C = \
espapa102.c \ espapa102.c \
intr.c \ intr.c \
modpyb.c \ modpyb.c \
modpybpin.c \ modmachine.c \
modpybpwm.c \ machine_pin.c \
modpybrtc.c \ machine_pwm.c \
modpybadc.c \ machine_rtc.c \
modpybuart.c \ machine_adc.c \
modmachinewdt.c \ machine_uart.c \
modpybspi.c \ machine_wdt.c \
modpybhspi.c \ machine_spi.c \
machine_hspi.c \
modesp.c \ modesp.c \
modnetwork.c \ modnetwork.c \
modutime.c \ modutime.c \
moduos.c \ moduos.c \
modmachine.c \
modonewire.c \ modonewire.c \
ets_alt_task.c \ ets_alt_task.c \
fatfs_port.c \ fatfs_port.c \
......
...@@ -137,16 +137,16 @@ SECTIONS ...@@ -137,16 +137,16 @@ SECTIONS
*lexerstr32.o(.literal* .text*) *lexerstr32.o(.literal* .text*)
*utils.o(.literal* .text*) *utils.o(.literal* .text*)
*modpyb.o(.literal*, .text*) *modpyb.o(.literal*, .text*)
*modpybpin.o(.literal*, .text*) *machine_pin.o(.literal*, .text*)
*modpybpwm.o(.literal*, .text*) *machine_pwm.o(.literal*, .text*)
*modpybrtc.o(.literal*, .text*) *machine_rtc.o(.literal*, .text*)
*modpybadc.o(.literal*, .text*) *machine_adc.o(.literal*, .text*)
*modpybuart.o(.literal*, .text*) *machine_uart.o(.literal*, .text*)
*modpybi2c.o(.literal*, .text*) *modpybi2c.o(.literal*, .text*)
*modmachine.o(.literal*, .text*) *modmachine.o(.literal*, .text*)
*modmachinewdt.o(.literal*, .text*) *machine_wdt.o(.literal*, .text*)
*modpybspi.o(.literal*, .text*) *machine_spi.o(.literal*, .text*)
*modpybhspi.o(.literal*, .text*) *machine_hspi.o(.literal*, .text*)
*hspi.o(.literal*, .text*) *hspi.o(.literal*, .text*)
*modesp.o(.literal* .text*) *modesp.o(.literal* .text*)
*modnetwork.o(.literal* .text*) *modnetwork.o(.literal* .text*)
......
...@@ -75,7 +75,7 @@ void ets_event_poll(void); ...@@ -75,7 +75,7 @@ void ets_event_poll(void);
// C-level pin HAL // C-level pin HAL
#include "etshal.h" #include "etshal.h"
#include "gpio.h" #include "gpio.h"
#include "esp8266/modpyb.h" #include "esp8266/modmachine.h"
#define mp_hal_pin_obj_t uint32_t #define mp_hal_pin_obj_t uint32_t
#define mp_hal_get_pin_obj(o) mp_obj_get_pin(o) #define mp_hal_get_pin_obj(o) mp_obj_get_pin(o)
void mp_hal_pin_input(mp_hal_pin_obj_t pin); void mp_hal_pin_input(mp_hal_pin_obj_t pin);
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "etshal.h" #include "etshal.h"
#include "user_interface.h" #include "user_interface.h"
#include "modpyb.h" #include "modmachine.h"
#include "esponewire.h" #include "esponewire.h"
#define TIMING_RESET1 (0) #define TIMING_RESET1 (0)
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "py/obj.h" #include "py/obj.h"
#include "lib/fatfs/ff.h" #include "lib/fatfs/ff.h"
#include "timeutils.h" #include "timeutils.h"
#include "modpybrtc.h" #include "modmachine.h"
DWORD get_fattime(void) { DWORD get_fattime(void) {
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "etshal.h" #include "etshal.h"
#include "ets_alt_task.h" #include "ets_alt_task.h"
#include "modpyb.h" #include "modmachine.h"
// this is in a separate file so it can go in iRAM // this is in a separate file so it can go in iRAM
void pin_intr_handler_iram(void *arg) { void pin_intr_handler_iram(void *arg) {
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include "py/runtime.h" #include "py/runtime.h"
#include "py/gc.h" #include "py/gc.h"
#include "py/mphal.h" #include "py/mphal.h"
#include "modpyb.h" #include "modmachine.h"
#define GET_TRIGGER(phys_port) \ #define GET_TRIGGER(phys_port) \
GPIO_PIN_INT_TYPE_GET(GPIO_REG_READ(GPIO_PIN_ADDR(phys_port))) GPIO_PIN_INT_TYPE_GET(GPIO_REG_READ(GPIO_PIN_ADDR(phys_port)))
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "py/nlr.h" #include "py/nlr.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "modpyb.h" #include "modmachine.h"
typedef struct _pyb_pwm_obj_t { typedef struct _pyb_pwm_obj_t {
mp_obj_base_t base; mp_obj_base_t base;
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "py/runtime.h" #include "py/runtime.h"
#include "timeutils.h" #include "timeutils.h"
#include "user_interface.h" #include "user_interface.h"
#include "modpyb.h" #include "modmachine.h"
typedef struct _pyb_rtc_obj_t { typedef struct _pyb_rtc_obj_t {
mp_obj_base_t base; mp_obj_base_t base;
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "py/runtime.h" #include "py/runtime.h"
#include "py/stream.h" #include "py/stream.h"
#include "py/mperrno.h" #include "py/mperrno.h"
#include "modpyb.h" #include "modmachine.h"
// UartDev is defined and initialized in rom code. // UartDev is defined and initialized in rom code.
extern UartDevice UartDev; extern UartDevice UartDev;
......
...@@ -45,8 +45,7 @@ ...@@ -45,8 +45,7 @@
#include "mem.h" #include "mem.h"
#include "espneopixel.h" #include "espneopixel.h"
#include "espapa102.h" #include "espapa102.h"
#include "modpyb.h" #include "modmachine.h"
#include "modpybrtc.h"
#define MODESP_ESPCONN (0) #define MODESP_ESPCONN (0)
......
...@@ -33,8 +33,7 @@ ...@@ -33,8 +33,7 @@
#include "extmod/machine_mem.h" #include "extmod/machine_mem.h"
#include "extmod/machine_pulse.h" #include "extmod/machine_pulse.h"
#include "extmod/machine_i2c.h" #include "extmod/machine_i2c.h"
#include "modpyb.h" #include "modmachine.h"
#include "modpybrtc.h"
#include "xtirq.h" #include "xtirq.h"
#include "os_type.h" #include "os_type.h"
......
...@@ -33,4 +33,11 @@ pyb_pin_obj_t *mp_obj_get_pin_obj(mp_obj_t pin_in); ...@@ -33,4 +33,11 @@ pyb_pin_obj_t *mp_obj_get_pin_obj(mp_obj_t pin_in);
int pin_get(uint pin); int pin_get(uint pin);
void pin_set(uint pin, int value); void pin_set(uint pin, int value);
extern uint32_t pyb_rtc_alarm0_wake;
extern uint64_t pyb_rtc_alarm0_expiry;
void pyb_rtc_set_us_since_2000(uint64_t nowus);
uint64_t pyb_rtc_get_us_since_2000();
void rtc_prepare_deepsleep(uint64_t sleep_us);
#endif // __MICROPY_INCLUDED_ESP8266_MODPYB_H__ #endif // __MICROPY_INCLUDED_ESP8266_MODPYB_H__
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "py/obj.h" #include "py/obj.h"
#include "py/mphal.h" #include "py/mphal.h"
#include "modpyb.h" #include "modmachine.h"
#include "esponewire.h" #include "esponewire.h"
STATIC mp_obj_t onewire_timings(mp_obj_t timings_in) { STATIC mp_obj_t onewire_timings(mp_obj_t timings_in) {
......
...@@ -28,12 +28,12 @@ ...@@ -28,12 +28,12 @@
#include "py/gc.h" #include "py/gc.h"
#include "gccollect.h" #include "gccollect.h"
#include "modpyb.h" #include "modmachine.h"
// The pyb module no longer exists since all functionality now appears // The pyb module no longer exists since all functionality now appears
// elsewhere, in more standard places (eg time, machine modules). The // elsewhere, in more standard places (eg time, machine modules). The
// only remaining function is pyb.info() which has been moved to the // only remaining function is pyb.info() which has been moved to the
// esp module, pending deletion/renaming/moving elsewher. // esp module, pending deletion/renaming/moving elsewhere.
STATIC mp_obj_t pyb_info(mp_uint_t n_args, const mp_obj_t *args) { STATIC mp_obj_t pyb_info(mp_uint_t n_args, const mp_obj_t *args) {
// print info about memory // print info about memory
......
/*
* This file is part of the Micro Python project, http://micropython.org/
*
* The MIT License (MIT)
*
* Copyright (c) 2015 Josef Gajdusek
*
* 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.
*/
extern uint32_t pyb_rtc_alarm0_wake;
extern uint64_t pyb_rtc_alarm0_expiry;
void pyb_rtc_set_us_since_2000(uint64_t nowus);
uint64_t pyb_rtc_get_us_since_2000();
void rtc_prepare_deepsleep(uint64_t sleep_us);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment