Skip to content

Fix compiler errors and disable type checking on latest sdk #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blueacorn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix compiler errors and disable type checking on latest sdk #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions monkey.jungle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
project.manifest = manifest.xml
project.typecheck = 0
12 changes: 6 additions & 6 deletions source/HuwaiiApp.mc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ var gLocationLng = null;
var centerX;
var centerY;

hidden function degreesToRadians(degrees) {
function degreesToRadians(degrees) {
return degrees * Math.PI / 180;
}

hidden function radiansToDegrees(radians) {
function radiansToDegrees(radians) {
return radians * 180 / Math.PI;
}

hidden function convertCoorX(radians, radius) {
function convertCoorX(radians, radius) {
return centerX + radius*Math.cos(radians);
}

hidden function convertCoorY(radians, radius) {
function convertCoorY(radians, radius) {
return centerY + radius*Math.sin(radians);
}

Expand Down Expand Up @@ -227,7 +227,7 @@ class HuwaiiApp extends Application.AppBase {
var day_of_weak = date.day_of_week;
return Lang.format("$1$ $2$",[days[day_of_weak], date.day.format("%d")]);
} else {
var date = Date.info(now, Time.FORMAT_LONG);
date = Date.info(now, Time.FORMAT_LONG);
var day_of_weak = date.day_of_week;
return Lang.format("$1$ $2$",[day_of_weak.toUpper(), date.day.format("%d")]);
}
Expand Down Expand Up @@ -257,7 +257,7 @@ class HuwaiiApp extends Application.AppBase {
day = date.day;
month = months[date.month];
} else {
var date = Date.info(now, Time.FORMAT_MEDIUM);
date = Date.info(now, Time.FORMAT_MEDIUM);
day = date.day;
month = months[date.month];
}
Expand Down
12 changes: 4 additions & 8 deletions source/datafield/DataFactory.mc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ class GroupNotiField extends BaseDataField {

function cur_label(value) {
var settings = Sys.getDeviceSettings();
var value = settings.alarmCount;
value = settings.alarmCount;
var alarm_str = Lang.format("A$1$",[value.format("%d")]);
value = settings.notificationCount;
var noti_str = Lang.format("N$1$",[value.format("%d")]);
Expand Down Expand Up @@ -866,7 +866,6 @@ class SunField extends BaseDataField {

function cur_label(value) {
if (gLocationLat != null) {
var value = "";
var nextSunEvent = 0;
var isSunriseNext = false;
var now = Date.info(Time.now(), Time.FORMAT_SHORT);
Expand Down Expand Up @@ -1097,7 +1096,6 @@ class TemparatureField extends BaseDataField {

function cur_label(value) {
var need_minimal = App.getApp().getProperty("minimal_data");
var value = 0;
var settings = Sys.getDeviceSettings();
if ((Toybox has :SensorHistory) && (Toybox.SensorHistory has :getTemperatureHistory)) {
var sample = SensorHistory.getTemperatureHistory(null).next();
Expand Down Expand Up @@ -1145,7 +1143,6 @@ class AltitudeField extends BaseDataField {

function cur_label(value) {
var need_minimal = App.getApp().getProperty("minimal_data");
var value = 0;
// #67 Try to retrieve altitude from current activity, before falling back on elevation history.
// Note that Activity::Info.altitude is supported by CIQ 1.x, but elevation history only on select CIQ 2.x
// devices.
Expand Down Expand Up @@ -1207,7 +1204,7 @@ class AlarmField extends BaseDataField {

function cur_label(value) {
var settings = Sys.getDeviceSettings();
var value = settings.alarmCount;
value = settings.alarmCount;
return Lang.format("ALAR $1$",[value.format("%d")]);
}
}
Expand All @@ -1228,7 +1225,7 @@ class NotifyField extends BaseDataField {

function cur_label(value) {
var settings = Sys.getDeviceSettings();
var value = settings.notificationCount;
value = settings.notificationCount;
return Lang.format("NOTIF $1$",[value.format("%d")]);
}
}
Expand Down Expand Up @@ -1351,8 +1348,7 @@ class DistanceField extends BaseDataField {
}

function max_label(value) {
var value = value/1000.0;
value = value/100.0; // convert cm to km
value = value/(100.0 * 1000.0); // convert cm to km
var valKp = App.getApp().toKValue(value);
return Lang.format("$1$K",[valKp]);
}
Expand Down