Battery Reporting

Finished implementation of reporting of the lowest voltage recorded for a team.
333fred · Dec 27, 2015 · b920b9f · b920b9f
1 parent 2605551
commit b920b9f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/appinfo.json b/appinfo.json
@@ -15,18 +15,18 @@
     "projectType": "native",
     "resources": {
         "media": [
-            {
-                "characterRegex": "[0-9\\.]",
-                "file": "fonts/SourceCodePro-Small.ttf",
-                "name": "SOURCE_CODE_PRO_REG_28",
-                "type": "font"
-            },
             {
                 "file": "images/FIRSTicon_RGB.png",
                 "menuIcon": true,
                 "name": "main_icon_image",
                 "type": "png"
             },
+            {
+                "characterRegex": "[0-9\\.]",
+                "file": "fonts/SourceCodePro-Small.ttf",
+                "name": "SOURCE_CODE_PRO_REG_24",
+                "type": "font"
+            },
             {
                 "characterRegex": "[0-9:a-zA-Z]",
                 "file": "fonts/SourceCodePro-Regular.ttf",

diff --git a/src/main.c b/src/main.c
@@ -51,13 +51,12 @@ status_type s_red3_status = 0;
 status_type s_blue1_status = 0;
 status_type s_blue2_status = 0;
 status_type s_blue3_status = 0;
- // Callback for receiving a message static void inbox_received_callback(DictionaryIterator *iter, void *ctx) {
-  APP_LOG(APP_LOG_LEVEL_INFO, "In Callback");
+ // Callback for receiving a message 
+static void inbox_received_callback(DictionaryIterator *iter, void *ctx) {
   Tuple *t = dict_read_first(iter);
   while (t != NULL) {
     CHECK_TYPE(t->type, t->length)
     uint32_t status = t->value->uint32;
-    APP_LOG(APP_LOG_LEVEL_INFO, "Processing message %d", (int) status);
     switch (t->key) {
       case RED1_STATUS:
       s_red1_status = (status_type) status;

diff --git a/src/text.c b/src/text.c
@@ -255,7 +255,7 @@ void setup_text_init() {
   s_blue2_text = (char*) malloc(6 * sizeof(char));
   s_blue3_text = (char*) malloc(6 * sizeof(char));
   s_source_code_pro = fonts_load_custom_font(resource_get_handle(RESOURCE_ID_SOURCE_CODE_PRO_REG_38));
-  s_source_code_pro_number = fonts_load_custom_font(resource_get_handle(RESOURCE_ID_SOURCE_CODE_PRO_REG_28));
+  s_source_code_pro_number = fonts_load_custom_font(resource_get_handle(RESOURCE_ID_SOURCE_CODE_PRO_REG_24));
 }
 
 void destroy_text_init() {