Skip to content

Commit

Permalink
Merge pull request #21 from bxparks/develop
Browse files Browse the repository at this point in the history
merge v0.6 into master
  • Loading branch information
bxparks authored Feb 20, 2021
2 parents 1f99763 + 04add48 commit 8379066
Show file tree
Hide file tree
Showing 48 changed files with 3,843 additions and 190 deletions.
36 changes: 36 additions & 0 deletions .github/workflows/aunit_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: AUnit Tests

on: [push]

jobs:
build:

runs-on: ubuntu-18.04

steps:
- uses: actions/checkout@v2

- name: Setup
run: |
cd ..
git clone https://github.com/bxparks/AUnit
git clone https://github.com/bxparks/AceCommon
git clone https://github.com/bxparks/AceCRC
git clone https://github.com/bxparks/AceUtils
git clone https://github.com/bxparks/AceRoutine
- name: Verify examples
run: |
make -C examples
make -C libraries/EpoxyFS/examples
make -C libraries/EpoxyPromEsp/examples
make -C libraries/EpoxyPromAvr/examples
- name: Verify tests
run: |
make -C libraries/EpoxyFS/tests
make -C libraries/EpoxyFS/tests runtests
make -C libraries/EpoxyPromEsp/tests
make -C libraries/EpoxyPromEsp/tests runtests
make -C libraries/EpoxyPromAvr/tests
make -C libraries/EpoxyPromAvr/tests runtests
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,9 @@
*.exe
*.out
*.app

# Root directory of EpoxyFS
epoxyfsdata

# Root file of EpoxyPROM
epoxypromdata
4 changes: 4 additions & 0 deletions Arduino.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
// Arduino methods emulated in Unix
// -----------------------------------------------------------------------

void delayMicroseconds(unsigned int us) {
usleep(us);
}

void delay(unsigned long ms) {
usleep(ms * 1000);
}
Expand Down
8 changes: 5 additions & 3 deletions Arduino.h
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
/*
* Copyright (c) 2019 Brian T. Park
* MIT License
*
*
* Parts derived from the Arduino SDK
* Copyright (c) 2005-2013 Arduino Team
*/

#ifndef EPOXY_DUINO_ARDUINO_H
#define EPOXY_DUINO_ARDUINO_H

#include <math.h>
#include "Print.h"
#include "StdioSerial.h"

// xx.yy.zz => xxyyzz (without leading 0)
#define EPOXY_DUINO_VERSION 500
#define EPOXY_DUINO_VERSION_STRING "0.5"
#define EPOXY_DUINO_VERSION 600
#define EPOXY_DUINO_VERSION_STRING "0.6"

// Used by digitalRead() and digitalWrite()
#define HIGH 0x1
Expand Down Expand Up @@ -81,6 +82,7 @@

extern "C" {

void delayMicroseconds(unsigned int us);
void delay(unsigned long ms);
void yield();
unsigned long millis();
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
# Changelog

* Unreleased
* 0.6 (2021-02-19)
* Add `libraries/EpoxyFS`, an implementation of the ESP8266 `FS` file system
that runs on Linux and MacOS.
* Add `delayMicroSeconds()`, `WCharacter.h`, and stub implementations of
`IPAddress.h`, `SPI.h`, by Erik Tideman (@ramboerik), see
[PR #18](https://github.com/bxparks/EpoxyDuino/pull/18).
* Add `libraries/EpoxyPromEsp` (EEPROM using the API of ESP8266/ESP32).
* Add `libraries/EpoxyPromAvr` (EEPROM using the API of AVR processors).
* 0.5 (2021-01-21)
* **Breaking Change** Change project name to "EpoxyDuino". The
`UNIX_HOST_DUINO` macro is replaced with `EPOXY_DUINO`, and the
Expand Down
149 changes: 0 additions & 149 deletions EEPROM.h

This file was deleted.

13 changes: 8 additions & 5 deletions EpoxyDuino.mk
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,12 @@
# Detect Linux or MacOS
UNAME := $(shell uname)

# EpoxyDuino module directory.
# EpoxyDuino directory.
EPOXY_DUINO_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
# Assume that there are other libs are siblings to EpoxyDuino
EPOXY_DUINO_LIB_DIR := $(abspath $(EPOXY_DUINO_DIR)/..)
# Look for libraries under ./EpoxyDuino/libraries/
EPOXY_DUINO_LIB_DIR := $(abspath $(EPOXY_DUINO_DIR)/libraries)
# Look for libraries which are siblings to ./EpoxyDuino/
EPOXY_DUINO_SIBLING_DIR := $(abspath $(EPOXY_DUINO_DIR)/..)

# List of Arduino IDE library folders, both built-in to the Arduino IDE
# and those downloaded later, e.g. in the portable/ directory or .arduino15/
Expand All @@ -52,9 +54,10 @@ ARDUINO_LIB_DIRS ?=
# Default modules which are automatically linked in: EpoxyDuino/
DEFAULT_MODULES := $(EPOXY_DUINO_DIR)

# Look for the ARDUINO_LIBS modules under each of the ARDUINO_LIB_DIRS and
# EPOXY_DUINO_LIB_DIR.
# Look for libraries under EPOXY_DUINO_LIB_DIR, EPOXY_DUINO_SIBLING_DIR, and
# each of the directories listed in ARDUINO_LIB_DIRS.
APP_MODULES := $(foreach lib,$(ARDUINO_LIBS),${EPOXY_DUINO_LIB_DIR}/${lib})
APP_MODULES += $(foreach lib,$(ARDUINO_LIBS),${EPOXY_DUINO_SIBLING_DIR}/${lib})
APP_MODULES += \
$(foreach lib_dir,$(ARDUINO_LIB_DIRS),\
$(foreach lib,$(ARDUINO_LIBS),\
Expand Down
Loading

0 comments on commit 8379066

Please sign in to comment.