gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Increased minimum SDK to Android 5 because of errors compiling for Android 4. Fixed web interface javascript (broken by V3.1.13). Separated Start-up and Main activity UI strings to resources so we can add translations

Browse Source
This commit is contained in:
Graham Jones
2020-02-27 20:58:26 +00:00
parent 3e9000c52a
commit 79c65284e4
10 changed files with 150 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/assets/www/js/osd_main.js
View File

@@ -4,8 +4,8 @@ function get_settings() {
};
function populate_settings(dataStr) {
var dataObj = JSON.parse(dataStr);
function populate_settings(dataObj) {
//var dataObj = JSON.parse(dataStr);
//alert (dataStr);
var alarmFreqMin = dataObj['alarmFreqMin'];
var alarmFreqMax = dataObj['alarmFreqMax'];
@@ -40,8 +40,8 @@ function get_data() {
$.ajax({url:"/data",success:process_data});
};
function process_data(dataStr) {
var dataObj = JSON.parse(dataStr);
function process_data(dataObj) {
//var dataObj = JSON.parse(dataStr);
//alert (dataStr);
var timeStr = dataObj['Time'];
var maxFreq = dataObj['maxFreq'];
@@ -109,8 +109,8 @@ function get_spectrum() {
$.ajax({url:"/spectrum",success:process_spectrum});
};
function process_spectrum(dataStr) {
var dataObj = JSON.parse(dataStr);
function process_spectrum(dataObj) {
//var dataObj = JSON.parse(dataStr);
var chartData = {
labels:["1","2","3","4","5","6","7","8","9","10"],