UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-24 00:00:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'omega-master' of https://github.com/Omega-Numworks/Omega into omega-master

Browse Source
This commit is contained in:
BuildTools
2019-11-03 19:43:08 -05:00
parent 5454b3142b d4a9f66b32
commit 8251dfb313
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -32,7 +32,7 @@ First of all, follow **step 1** [here](https://www.numworks.com/resources/engine
git clone --recursive https://github.com/Omega-Numworks/Omega.git
cd Omega
make MODEL=n0100 clean
make MODEL=n0100 USERNAME={Your name, max 15 characters; for spaces, type "\ "} -j4
make MODEL=n0100 USERNAME="{Your name, max 15 characters}" -j4
make MODEL=n0100 epsilon_flash
```
@@ -43,7 +43,7 @@ make MODEL=n0100 epsilon_flash
git clone --recursive https://github.com/Omega-Numworks/Omega.git
cd Omega
make clean
make USERNAME={Your name, max 15 characters; for spaces, type "\ "} -j4
make USERNAME="{Your name, max 15 characters}" -j4
make epsilon_flash
```

2
apps/Makefile
View File

@@ -45,7 +45,7 @@ snapshots_count = $(words $(apps))
snapshot_includes = $(foreach i,$(app_headers),-include $(i) )
epsilon_app_names = '$(foreach i,${EPSILON_APPS},"$(i)", )'
$(call object_for,apps/apps_container_storage.cpp apps/apps_container.cpp apps/main.cpp): CXXFLAGS += $(snapshot_includes) -DAPPS_CONTAINER_APPS_DECLARATION="$(apps_declaration)" -DAPPS_CONTAINER_SNAPSHOT_DECLARATIONS="$(snapshots_declaration)" -DAPPS_CONTAINER_SNAPSHOT_CONSTRUCTORS="$(snapshots_construction)" -DAPPS_CONTAINER_SNAPSHOT_LIST="$(snapshots_list)" -DAPPS_CONTAINER_SNAPSHOT_COUNT=$(snapshots_count) -DEPSILON_APPS_NAMES=$(epsilon_app_names) -DUSERNAME=${USERNAME}
$(call object_for,apps/apps_container_storage.cpp apps/apps_container.cpp apps/main.cpp): CXXFLAGS += $(snapshot_includes) -DAPPS_CONTAINER_APPS_DECLARATION="$(apps_declaration)" -DAPPS_CONTAINER_SNAPSHOT_DECLARATIONS="$(snapshots_declaration)" -DAPPS_CONTAINER_SNAPSHOT_CONSTRUCTORS="$(snapshots_construction)" -DAPPS_CONTAINER_SNAPSHOT_LIST="$(snapshots_list)" -DAPPS_CONTAINER_SNAPSHOT_COUNT=$(snapshots_count) -DEPSILON_APPS_NAMES=$(epsilon_app_names) -DUSERNAME="$(USERNAME)"
# I18n file generation

4
build/config.mak
View File

@@ -4,7 +4,7 @@ PLATFORM ?= device
DEBUG ?= 0
EPSILON_VERSION ?= 12.0.0
EPSILON_CUSTOM_VERSION ?= 1.13.5-0
EPSILON_CUSTOM_VERSION ?= 1.13.6-0
# USERNAME ?= N/A
# Valid values are "none", "update", "beta"
EPSILON_APPS ?= calculation rpn graph code statistics probability solver atom sequence regression settings
@@ -25,7 +25,7 @@ include build/toolchain.$(TOOLCHAIN).mak
SFLAGS += -DDEBUG=$(DEBUG)
ifdef USERNAME
SFLAGS += -DUSERNAME=$(USERNAME)
SFLAGS += -DUSERNAME="$(USERNAME)"
endif
SFLAGS += -DEPSILON_GETOPT=$(EPSILON_GETOPT)
SFLAGS += -DESCHER_LOG_EVENTS_BINARY=$(ESCHER_LOG_EVENTS_BINARY)

4
ion/src/device/n0110/drivers/led.cpp
View File

@@ -2,12 +2,14 @@
#include <ion/battery.h>
#include <ion/usb.h>
#include <apps/global_preferences.h>
namespace Ion {
namespace LED {
KDColor updateColorWithPlugAndCharge() {
KDColor ledColor = getColor();
if (ledColor != KDColorRed) { // If exam mode is on, we do not update the LED with the plugged/charging state
if (GlobalPreferences::sharedGlobalPreferences()->examMode() != GlobalPreferences::ExamMode::Activate) { // If exam mode is on, we do not update the LED with the plugged/charging state
if (USB::isPlugged()) {
ledColor = Battery::isCharging() ? KDColorOrange : KDColorGreen;
} else {