Browse Source

C20 fixes

Willy-JL 1 year ago
parent
commit
0a2b6900fe
5 changed files with 7 additions and 7 deletions
  1. 1 1
      doom/assets.h
  2. 1 1
      doom/display.h
  3. 1 1
      flipbip/lib/crypto/base32.c
  4. 2 2
      totp/app_api_table.cpp
  5. 2 2
      unitemp/Sensors.c

+ 1 - 1
doom/assets.h

@@ -9,7 +9,7 @@
 #define bmp_font_width_pxs 192
 #define bmp_font_height_pxs 48
 #define CHAR_MAP " 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ.,-_(){}[]#"
-#define CHAR_WIDTH 4
+#define _CHAR_WIDTH 4
 #define CHAR_HEIGHT 6
 
 #define BMP_GUN_WIDTH 32

+ 1 - 1
doom/display.h

@@ -117,7 +117,7 @@ void drawTextSpace(int8_t x, int8_t y, char* txt, uint8_t space, Canvas* const c
     while((ch = txt[i]) != '\0') {
         drawChar(pos, y, ch, canvas);
         i++;
-        pos += CHAR_WIDTH + space;
+        pos += _CHAR_WIDTH + space;
 
         // shortcut on end of screen
         if(pos > SCREEN_WIDTH) return;

+ 1 - 1
flipbip/lib/crypto/base32.c

@@ -51,7 +51,7 @@ char* base32_encode(
         int ret = base32_encode_character(out[i], alphabet);
 
         if(ret == -1) {
-            return false;
+            return NULL;
         } else {
             out[i] = ret;
         }

+ 2 - 2
totp/app_api_table.cpp

@@ -11,8 +11,8 @@ constexpr HashtableApiInterface applicaton_hashtable_api_interface{
         .api_version_minor = 0,
         .resolver_callback = &elf_resolve_from_hashtable,
     },
-    .table_cbegin = app_api_table.cbegin(),
-    .table_cend = app_api_table.cend(),
+    app_api_table.cbegin(),
+    app_api_table.cend(),
 };
 
 extern "C" const ElfApiInterface* const application_api_interface =

+ 2 - 2
unitemp/Sensors.c

@@ -493,14 +493,14 @@ Sensor* unitemp_sensor_alloc(char* name, const SensorType* type, char* args) {
     Sensor* sensor = malloc(sizeof(Sensor));
     if(sensor == NULL) {
         FURI_LOG_E(APP_NAME, "Sensor %s allocation error", name);
-        return false;
+        return NULL;
     }
 
     //Выделение памяти под имя
     sensor->name = malloc(11);
     if(sensor->name == NULL) {
         FURI_LOG_E(APP_NAME, "Sensor %s name allocation error", name);
-        return false;
+        return NULL;
     }
     //Запись имени датчка
     strcpy(sensor->name, name);