SVCalls and display_draw_string : both are almost working fine.

Author: Naereen

README.md

@@ -64,6 +64,8 @@ Copy the files you obtained to the `./src/javascript/` folder on this project (t
 
 Here is a short documentation for each function that I've ported from their interface in [`eadk.h`](https://github.com/numworks/epsilon/blob/master/eadk/include/eadk/eadk.h) to a working version in JavaScript.
 
+I've exposed an `Eadk` module (see example in JavaScript below, or [here](https://github.com/Naereen/A-JavaScript-interpreter-for-the-NumWorks-calculator/issues/3#issuecomment-2910813161)), which comes ready with these functions and constants:
+
 > *Legend:*
 > - ✅ = code written, function tested!
 > - ✅? = code written, function not yet working!
@@ -72,7 +74,7 @@ Here is a short documentation for each function that I've ported from their inte
 ### ✅? Eadk predefined colors
 `Eadk.color_black`, `Eadk.color_white`, `Eadk.color_red`, `Eadk.color_green`, `Eadk.color_blue` are the five predefined colors.
 
-### ✅? Screen width and height
+### ✅ Screen width and height
 `Eadk.SCREEN_WIDTH` and `Eadk.SCREEN_HEIGHT` are the screen's width and height, respectively.
 
 ### ✅ Controlling the screen's brightness
@@ -85,31 +87,38 @@ Returns the screen's brightness, it's a 8 bits integer (`uint8_t` in C), ranging
 Sets the screen's brightness to this value.
 `brightness` **must** be an integer value which fits inside a `uint8_t`, between 0 and 256.
 
-### ❌ Accessing the Battery levels
+### ✅ Accessing the Battery levels
 
-#### ❌ `bool Eadk.battery_is_charging()`
+#### ✅ `bool Eadk.battery_is_charging()`
 
 Indicates whether the battery is charging.
 
-#### ❌ `uint8_t Eadk.battery_level()`
+#### ✅ `uint8_t Eadk.battery_level()`
 
 Returns a 8 bits integer giving the battery level.
 
-#### ❌ `float Eadk.battery_voltage()`
+#### ✅ `float Eadk.battery_voltage()`
 
 Returns a floating value of the battery voltage (in Volt, I guess?).
 
 > These functions are missing from the hardware!
 > See [this issue on NumWorks/epsilon's repository](https://github.com/numworks/epsilon/issues/2326)
-> TODO: [I could try to implement them myself, by SVC calls](https://github.com/Naereen/A-JavaScript-interpreter-for-the-NumWorks-calculator/issues/5)
+> DONE: [I just implemented them myself, by SVC calls](https://github.com/Naereen/A-JavaScript-interpreter-for-the-NumWorks-calculator/issues/5)
+
+### ✅ Display
+
+#### ❌✅ `void Eadk.display_draw_string(const char* text, uint16_t x, uint16_t y, bool large_font, uint16_t text_color, uint16_t background_color)`
 
-### Display
+Displays a given `text` string, at a `{x,y}` position, in large/small font (`large_font`?), with the text in `text_color` and the background in `background_color`.
 
-#### ❌ `void Eadk.display_draw_string(const char* text, uint16_t x, uint16_t y, bool large_font, uint16_t text_color, uint16_t background_color)`
+For instance:
+```javascript
+Eadk.display_draw_string(text, x, y, large, text_color, background_color);
+```
 
-TODO: I still haven't been able to define this one correctly, due to the `char* text` that I don't know how to declare in JSON (in the JSON to C process used by `jswrap_` to generate the corresponding C code).
+> TODO: it's still a bit buggy!
 
-### Timing
+### ✅ Timing
 
 #### ✅ `void Eadk.timing_usleep(uint32_t us)`
 
@@ -123,17 +132,17 @@ Sleep for `ms` micro-seconds
 
 Time since boot of the machine? Not clear. FIXME:
 
-### Miscellanious
+### ✅ Miscellanious
 
-#### ❌ `bool Eadk.usb_is_plugged()`
+#### ✅ `bool Eadk.usb_is_plugged()`
 
 Indicates whether the USB is plugged.
 
 > This function is missing from the hardware!
 > See [this issue on NumWorks/epsilon's repository](https://github.com/numworks/epsilon/issues/2326)
-> TODO: [I could try to implement it myself, by SVC calls](https://github.com/Naereen/A-JavaScript-interpreter-for-the-NumWorks-calculator/issues/5)
+> DONE: [I just implemented it myself, by SVC calls](https://github.com/Naereen/A-JavaScript-interpreter-for-the-NumWorks-calculator/issues/5)
 
-#### ✅? `uint32_t Eadk.random()`
+#### ✅ `uint32_t Eadk.random()`
 
 Returns an almost truly random number, generated from the hardware RNG (a uint32_t, unsigned 32 bits integer).
 

src/javascript/espruino_embedded.c

@@ -9996,6 +9996,7 @@ JsVar *jspGetPrototypeOwner(JsVar *proto) {
   }
   return 0;
 }
+
 typedef uint16_t eadk_color_t;
 static const eadk_color_t eadk_color_black = 0x0;
 static const eadk_color_t eadk_color_white = 0xFFFF;
@@ -10215,18 +10216,19 @@ extern const char* eadk_external_data;
 extern size_t eadk_external_data_size;
 bool eadk_usb_is_plugged();
 uint32_t eadk_random();
-int jswrap_color_black(void);
-int jswrap_color_white(void);
-int jswrap_color_red(void);
-int jswrap_color_green(void);
-int jswrap_color_blue(void);
-int jswrap_SCREEN_WIDTH(void);
-int jswrap_SCREEN_HEIGHT(void);
+int16_t jswrap_color_black(void);
+int16_t jswrap_color_white(void);
+int16_t jswrap_color_red(void);
+int16_t jswrap_color_green(void);
+int16_t jswrap_color_blue(void);
+int32_t jswrap_SCREEN_WIDTH(void);
+int32_t jswrap_SCREEN_HEIGHT(void);
 int jswrap_backlight_brightness(void);
 void jswrap_backlight_set_brightness(int brightness);
 _Bool jswrap_battery_is_charging();
 uint8_t jswrap_battery_level();
 float jswrap_battery_voltage();
+void jswrap_display_draw_string(JsVar *args);
 void jswrap_timing_usleep(uint32_t us);
 void jswrap_timing_msleep(uint32_t ms);
 uint64_t jswrap_timing_millis();
@@ -10571,11 +10573,12 @@ static const JswSymPtr jswSymbols_Eadk[] = {
   { 146, JSWAT_INT32 | JSWAT_EXECUTE_IMMEDIATELY, (void*)jswrap_color_green},
   { 158, JSWAT_INT32 | JSWAT_EXECUTE_IMMEDIATELY, (void*)jswrap_color_red},
   { 168, JSWAT_INT32 | JSWAT_EXECUTE_IMMEDIATELY, (void*)jswrap_color_white},
-  { 180, JSWAT_INT32, (void*)jswrap_random},
-  { 187, JSWAT_INT32, (void*)jswrap_timing_millis},
-  { 201, JSWAT_VOID | (JSWAT_INT32 << ((((JSWAT_MASK+1)== 1)? 0: ((JSWAT_MASK+1)== 2)? 1: ((JSWAT_MASK+1)== 4)? 2: ((JSWAT_MASK+1)== 8)? 3: ((JSWAT_MASK+1)== 16)? 4: ((JSWAT_MASK+1)== 32)? 5: ((JSWAT_MASK+1)== 64)? 6: ((JSWAT_MASK+1)== 128)? 7: ((JSWAT_MASK+1)== 256)? 8: ((JSWAT_MASK+1)== 512)? 9: ((JSWAT_MASK+1)== 1024)?10: ((JSWAT_MASK+1)== 2048)?11: ((JSWAT_MASK+1)== 4096)?12: ((JSWAT_MASK+1)== 8192)?13: ((JSWAT_MASK+1)==16384)?14: ((JSWAT_MASK+1)==32768)?15:10000 )*1)), (void*)jswrap_timing_msleep},
-  { 215, JSWAT_VOID | (JSWAT_INT32 << ((((JSWAT_MASK+1)== 1)? 0: ((JSWAT_MASK+1)== 2)? 1: ((JSWAT_MASK+1)== 4)? 2: ((JSWAT_MASK+1)== 8)? 3: ((JSWAT_MASK+1)== 16)? 4: ((JSWAT_MASK+1)== 32)? 5: ((JSWAT_MASK+1)== 64)? 6: ((JSWAT_MASK+1)== 128)? 7: ((JSWAT_MASK+1)== 256)? 8: ((JSWAT_MASK+1)== 512)? 9: ((JSWAT_MASK+1)== 1024)?10: ((JSWAT_MASK+1)== 2048)?11: ((JSWAT_MASK+1)== 4096)?12: ((JSWAT_MASK+1)== 8192)?13: ((JSWAT_MASK+1)==16384)?14: ((JSWAT_MASK+1)==32768)?15:10000 )*1)), (void*)jswrap_timing_usleep},
-  { 229, JSWAT_BOOL, (void*)jswrap_usb_is_plugged}
+  { 180, JSWAT_VOID | (JSWAT_ARGUMENT_ARRAY << ((((JSWAT_MASK+1)== 1)? 0: ((JSWAT_MASK+1)== 2)? 1: ((JSWAT_MASK+1)== 4)? 2: ((JSWAT_MASK+1)== 8)? 3: ((JSWAT_MASK+1)== 16)? 4: ((JSWAT_MASK+1)== 32)? 5: ((JSWAT_MASK+1)== 64)? 6: ((JSWAT_MASK+1)== 128)? 7: ((JSWAT_MASK+1)== 256)? 8: ((JSWAT_MASK+1)== 512)? 9: ((JSWAT_MASK+1)== 1024)?10: ((JSWAT_MASK+1)== 2048)?11: ((JSWAT_MASK+1)== 4096)?12: ((JSWAT_MASK+1)== 8192)?13: ((JSWAT_MASK+1)==16384)?14: ((JSWAT_MASK+1)==32768)?15:10000 )*1)), (void*)jswrap_display_draw_string},
+  { 200, JSWAT_INT32, (void*)jswrap_random},
+  { 207, JSWAT_INT32, (void*)jswrap_timing_millis},
+  { 221, JSWAT_VOID | (JSWAT_INT32 << ((((JSWAT_MASK+1)== 1)? 0: ((JSWAT_MASK+1)== 2)? 1: ((JSWAT_MASK+1)== 4)? 2: ((JSWAT_MASK+1)== 8)? 3: ((JSWAT_MASK+1)== 16)? 4: ((JSWAT_MASK+1)== 32)? 5: ((JSWAT_MASK+1)== 64)? 6: ((JSWAT_MASK+1)== 128)? 7: ((JSWAT_MASK+1)== 256)? 8: ((JSWAT_MASK+1)== 512)? 9: ((JSWAT_MASK+1)== 1024)?10: ((JSWAT_MASK+1)== 2048)?11: ((JSWAT_MASK+1)== 4096)?12: ((JSWAT_MASK+1)== 8192)?13: ((JSWAT_MASK+1)==16384)?14: ((JSWAT_MASK+1)==32768)?15:10000 )*1)), (void*)jswrap_timing_msleep},
+  { 235, JSWAT_VOID | (JSWAT_INT32 << ((((JSWAT_MASK+1)== 1)? 0: ((JSWAT_MASK+1)== 2)? 1: ((JSWAT_MASK+1)== 4)? 2: ((JSWAT_MASK+1)== 8)? 3: ((JSWAT_MASK+1)== 16)? 4: ((JSWAT_MASK+1)== 32)? 5: ((JSWAT_MASK+1)== 64)? 6: ((JSWAT_MASK+1)== 128)? 7: ((JSWAT_MASK+1)== 256)? 8: ((JSWAT_MASK+1)== 512)? 9: ((JSWAT_MASK+1)== 1024)?10: ((JSWAT_MASK+1)== 2048)?11: ((JSWAT_MASK+1)== 4096)?12: ((JSWAT_MASK+1)== 8192)?13: ((JSWAT_MASK+1)==16384)?14: ((JSWAT_MASK+1)==32768)?15:10000 )*1)), (void*)jswrap_timing_usleep},
+  { 249, JSWAT_BOOL, (void*)jswrap_usb_is_plugged}
 };
 static const unsigned char jswSymbolIndex_Eadk = 0;
 static const JswSymPtr jswSymbols_global[] = {
@@ -10897,7 +10900,7 @@ static const JswSymPtr jswSymbols_heatshrink[] = {
   { 9, JSWAT_JSVAR | (JSWAT_JSVAR << ((((JSWAT_MASK+1)== 1)? 0: ((JSWAT_MASK+1)== 2)? 1: ((JSWAT_MASK+1)== 4)? 2: ((JSWAT_MASK+1)== 8)? 3: ((JSWAT_MASK+1)== 16)? 4: ((JSWAT_MASK+1)== 32)? 5: ((JSWAT_MASK+1)== 64)? 6: ((JSWAT_MASK+1)== 128)? 7: ((JSWAT_MASK+1)== 256)? 8: ((JSWAT_MASK+1)== 512)? 9: ((JSWAT_MASK+1)== 1024)?10: ((JSWAT_MASK+1)== 2048)?11: ((JSWAT_MASK+1)== 4096)?12: ((JSWAT_MASK+1)== 8192)?13: ((JSWAT_MASK+1)==16384)?14: ((JSWAT_MASK+1)==32768)?15:10000 )*1)), (void*)jswrap_heatshrink_decompress}
 };
 static const unsigned char jswSymbolIndex_heatshrink = 26;
-static const char jswSymbols_Eadk_str[] = "SCREEN_HEIGHT\0SCREEN_WIDTH\0backlight_brightness\0backlight_set_brightness\0battery_is_charging\0battery_level\0battery_voltage\0color_black\0color_blue\0color_green\0color_red\0color_white\0random\0timing_millis\0timing_msleep\0timing_usleep\0usb_is_plugged\0";
+static const char jswSymbols_Eadk_str[] = "SCREEN_HEIGHT\0SCREEN_WIDTH\0backlight_brightness\0backlight_set_brightness\0battery_is_charging\0battery_level\0battery_voltage\0color_black\0color_blue\0color_green\0color_red\0color_white\0display_draw_string\0random\0timing_millis\0timing_msleep\0timing_usleep\0usb_is_plugged\0";
 static const char jswSymbols_global_str[] = "Array\0ArrayBuffer\0ArrayBufferView\0Boolean\0DataView\0Date\0Eadk\0Error\0Float32Array\0Float64Array\0Function\0HIGH\0Infinity\0Int16Array\0Int32Array\0Int8Array\0InternalError\0JSON\0LOW\0Math\0Modules\0NaN\0Number\0Object\0ReferenceError\0RegExp\0String\0SyntaxError\0TypeError\0Uint16Array\0Uint24Array\0Uint32Array\0Uint8Array\0Uint8ClampedArray\0arguments\0atob\0btoa\0console\0decodeURIComponent\0encodeURIComponent\0eval\0global\0globalThis\0isFinite\0isNaN\0parseFloat\0parseInt\0print\0require\0trace\0";
 static const char jswSymbols_Array_proto_str[] = "concat\0every\0fill\0filter\0find\0findIndex\0forEach\0includes\0indexOf\0join\0length\0map\0pop\0push\0reduce\0reverse\0shift\0slice\0some\0sort\0splice\0toString\0unshift\0";
 static const char jswSymbols_Array_str[] = "isArray\0";
@@ -10925,7 +10928,7 @@ static const char jswSymbols_Modules_str[] = "addCached\0getCached\0removeAllCac
 static const char jswSymbols_Math_str[] = "E\0LN10\0LN2\0LOG10E\0LOG2E\0PI\0SQRT1_2\0SQRT2\0abs\0acos\0asin\0atan\0atan2\0ceil\0clip\0cos\0exp\0floor\0log\0max\0min\0pow\0randInt\0random\0round\0sign\0sin\0sqrt\0tan\0wrap\0";
 static const char jswSymbols_heatshrink_str[] = "compress\0decompress\0";
 const JswSymList jswSymbolTables[] = {
-  {jswSymbols_Eadk, jswSymbols_Eadk_str, 17},
+  {jswSymbols_Eadk, jswSymbols_Eadk_str, 18},
   {jswSymbols_global, jswSymbols_global_str, 50},
   {jswSymbols_Array_proto, jswSymbols_Array_proto_str, 23},
   {jswSymbols_Array, jswSymbols_Array_str, 1},
@@ -11202,6 +11205,13 @@ JsVar *jswCallFunctionHack(void *function, JsnArgumentType argumentSpecifier, Js
       result = jsvNewFromFloat(((JsVarFloat(*)())function)());
       return result;
     }
+    case JSWAT_VOID | (JSWAT_ARGUMENT_ARRAY << ((((JSWAT_MASK+1)== 1)? 0: ((JSWAT_MASK+1)== 2)? 1: ((JSWAT_MASK+1)== 4)? 2: ((JSWAT_MASK+1)== 8)? 3: ((JSWAT_MASK+1)== 16)? 4: ((JSWAT_MASK+1)== 32)? 5: ((JSWAT_MASK+1)== 64)? 6: ((JSWAT_MASK+1)== 128)? 7: ((JSWAT_MASK+1)== 256)? 8: ((JSWAT_MASK+1)== 512)? 9: ((JSWAT_MASK+1)== 1024)?10: ((JSWAT_MASK+1)== 2048)?11: ((JSWAT_MASK+1)== 4096)?12: ((JSWAT_MASK+1)== 8192)?13: ((JSWAT_MASK+1)==16384)?14: ((JSWAT_MASK+1)==32768)?15:10000 )*1)): {
+      JsVar *result = 0;
+      JsVar *argArray = (paramCount>0)?jsvNewArray(&paramData[0],paramCount-0):jsvNewEmptyArray();
+      ((void(*)(JsVar*))function)(argArray);
+      jsvUnLock(argArray);
+      return result;
+    }
     case JSWAT_JSVAR | (JSWAT_ARGUMENT_ARRAY << ((((JSWAT_MASK+1)== 1)? 0: ((JSWAT_MASK+1)== 2)? 1: ((JSWAT_MASK+1)== 4)? 2: ((JSWAT_MASK+1)== 8)? 3: ((JSWAT_MASK+1)== 16)? 4: ((JSWAT_MASK+1)== 32)? 5: ((JSWAT_MASK+1)== 64)? 6: ((JSWAT_MASK+1)== 128)? 7: ((JSWAT_MASK+1)== 256)? 8: ((JSWAT_MASK+1)== 512)? 9: ((JSWAT_MASK+1)== 1024)?10: ((JSWAT_MASK+1)== 2048)?11: ((JSWAT_MASK+1)== 4096)?12: ((JSWAT_MASK+1)== 8192)?13: ((JSWAT_MASK+1)==16384)?14: ((JSWAT_MASK+1)==32768)?15:10000 )*1)): {
       JsVar *result = 0;
       JsVar *argArray = (paramCount>0)?jsvNewArray(&paramData[0],paramCount-0):jsvNewEmptyArray();
@@ -11365,13 +11375,6 @@ JsVar *jswCallFunctionHack(void *function, JsnArgumentType argumentSpecifier, Js
       ((void(*)(JsVar*))function)(((paramCount>0)?paramData[0]:0));
       return result;
     }
-    case JSWAT_VOID | (JSWAT_ARGUMENT_ARRAY << ((((JSWAT_MASK+1)== 1)? 0: ((JSWAT_MASK+1)== 2)? 1: ((JSWAT_MASK+1)== 4)? 2: ((JSWAT_MASK+1)== 8)? 3: ((JSWAT_MASK+1)== 16)? 4: ((JSWAT_MASK+1)== 32)? 5: ((JSWAT_MASK+1)== 64)? 6: ((JSWAT_MASK+1)== 128)? 7: ((JSWAT_MASK+1)== 256)? 8: ((JSWAT_MASK+1)== 512)? 9: ((JSWAT_MASK+1)== 1024)?10: ((JSWAT_MASK+1)== 2048)?11: ((JSWAT_MASK+1)== 4096)?12: ((JSWAT_MASK+1)== 8192)?13: ((JSWAT_MASK+1)==16384)?14: ((JSWAT_MASK+1)==32768)?15:10000 )*1)): {
-      JsVar *result = 0;
-      JsVar *argArray = (paramCount>0)?jsvNewArray(&paramData[0],paramCount-0):jsvNewEmptyArray();
-      ((void(*)(JsVar*))function)(argArray);
-      jsvUnLock(argArray);
-      return result;
-    }
     case JSWAT_JSVAR | (JSWAT_JSVAR << ((((JSWAT_MASK+1)== 1)? 0: ((JSWAT_MASK+1)== 2)? 1: ((JSWAT_MASK+1)== 4)? 2: ((JSWAT_MASK+1)== 8)? 3: ((JSWAT_MASK+1)== 16)? 4: ((JSWAT_MASK+1)== 32)? 5: ((JSWAT_MASK+1)== 64)? 6: ((JSWAT_MASK+1)== 128)? 7: ((JSWAT_MASK+1)== 256)? 8: ((JSWAT_MASK+1)== 512)? 9: ((JSWAT_MASK+1)== 1024)?10: ((JSWAT_MASK+1)== 2048)?11: ((JSWAT_MASK+1)== 4096)?12: ((JSWAT_MASK+1)== 8192)?13: ((JSWAT_MASK+1)==16384)?14: ((JSWAT_MASK+1)==32768)?15:10000 )*1)) | (JSWAT_JSVAR << ((((JSWAT_MASK+1)== 1)? 0: ((JSWAT_MASK+1)== 2)? 1: ((JSWAT_MASK+1)== 4)? 2: ((JSWAT_MASK+1)== 8)? 3: ((JSWAT_MASK+1)== 16)? 4: ((JSWAT_MASK+1)== 32)? 5: ((JSWAT_MASK+1)== 64)? 6: ((JSWAT_MASK+1)== 128)? 7: ((JSWAT_MASK+1)== 256)? 8: ((JSWAT_MASK+1)== 512)? 9: ((JSWAT_MASK+1)== 1024)?10: ((JSWAT_MASK+1)== 2048)?11: ((JSWAT_MASK+1)== 4096)?12: ((JSWAT_MASK+1)== 8192)?13: ((JSWAT_MASK+1)==16384)?14: ((JSWAT_MASK+1)==32768)?15:10000 )*2)) | (JSWAT_JSVAR << ((((JSWAT_MASK+1)== 1)? 0: ((JSWAT_MASK+1)== 2)? 1: ((JSWAT_MASK+1)== 4)? 2: ((JSWAT_MASK+1)== 8)? 3: ((JSWAT_MASK+1)== 16)? 4: ((JSWAT_MASK+1)== 32)? 5: ((JSWAT_MASK+1)== 64)? 6: ((JSWAT_MASK+1)== 128)? 7: ((JSWAT_MASK+1)== 256)? 8: ((JSWAT_MASK+1)== 512)? 9: ((JSWAT_MASK+1)== 1024)?10: ((JSWAT_MASK+1)== 2048)?11: ((JSWAT_MASK+1)== 4096)?12: ((JSWAT_MASK+1)== 8192)?13: ((JSWAT_MASK+1)==16384)?14: ((JSWAT_MASK+1)==32768)?15:10000 )*3)): {
       JsVar *result = 0;
       result = (((JsVar*(*)(JsVar*,JsVar*,JsVar*))function)(((paramCount>0)?paramData[0]:0),((paramCount>1)?paramData[1]:0),((paramCount>2)?paramData[2]:0)));
@@ -12434,42 +12437,43 @@ const JshPinInfo pinInfo[33] = {
            { JSH_PORTD, JSH_PIN0+31, JSH_ANALOG_NONE, { } },
            { JSH_PORTD, JSH_PIN0+32, JSH_ANALOG_NONE, { } },
 };
-int jswrap_color_black(void);
-int jswrap_color_white(void);
-int jswrap_color_red(void);
-int jswrap_color_green(void);
-int jswrap_color_blue(void);
-int jswrap_SCREEN_WIDTH(void);
-int jswrap_SCREEN_HEIGHT(void);
+int16_t jswrap_color_black(void);
+int16_t jswrap_color_white(void);
+int16_t jswrap_color_red(void);
+int16_t jswrap_color_green(void);
+int16_t jswrap_color_blue(void);
+int32_t jswrap_SCREEN_WIDTH(void);
+int32_t jswrap_SCREEN_HEIGHT(void);
 int jswrap_backlight_brightness(void);
 void jswrap_backlight_set_brightness(int brightness);
 _Bool jswrap_battery_is_charging();
 uint8_t jswrap_battery_level();
 float jswrap_battery_voltage();
+void jswrap_display_draw_string(JsVar *args);
 void jswrap_timing_usleep(uint32_t us);
 void jswrap_timing_msleep(uint32_t ms);
 uint64_t jswrap_timing_millis();
 _Bool jswrap_usb_is_plugged();
 uint32_t jswrap_random();
-int jswrap_color_black(void) {
+int16_t jswrap_color_black(void) {
     return 0x0;
 }
-int jswrap_color_white(void) {
+int16_t jswrap_color_white(void) {
     return 0xFFFF;
 }
-int jswrap_color_red(void) {
+int16_t jswrap_color_red(void) {
     return 0xF800;
 }
-int jswrap_color_green(void) {
+int16_t jswrap_color_green(void) {
     return 0x07E0;
 }
-int jswrap_color_blue(void) {
+int16_t jswrap_color_blue(void) {
     return 0x001F;
 }
-int jswrap_SCREEN_WIDTH(void) {
+int32_t jswrap_SCREEN_WIDTH(void) {
     return 320;
 }
-int jswrap_SCREEN_HEIGHT(void) {
+int32_t jswrap_SCREEN_HEIGHT(void) {
     return 240;
 }
 int jswrap_backlight_brightness(void) {
@@ -12480,13 +12484,52 @@ void jswrap_backlight_set_brightness(int brightness) {
     eadk_backlight_set_brightness(brightness);
 }
 _Bool jswrap_battery_is_charging(void) {
-    return 0;
+    _Bool returnValue; __asm__ volatile("svc %[immediate] ; mov %[returnValue], r0" : [returnValue] "=r"(returnValue) : [immediate] "I"(3) : "r0", "r1", "r2", "r3"); return returnValue;
 }
 uint8_t jswrap_battery_level(void) {
-    return 0;
+    uint8_t returnValue; __asm__ volatile("svc %[immediate] ; mov %[returnValue], r0" : [returnValue] "=r"(returnValue) : [immediate] "I"(4) : "r0", "r1", "r2", "r3"); return returnValue;
 }
 float jswrap_battery_voltage(void) {
-    return 0.0f;
+    float returnValue; __asm__ volatile("svc %[immediate] ; mov %[returnValue], r0" : [returnValue] "=r"(returnValue) : [immediate] "I"(5) : "r0", "r1", "r2", "r3"); return returnValue;
+}
+void jswrap_display_draw_string(JsVar *args) {
+    int argc = jsvGetArrayLength(args);
+    if (argc < 6) {
+        jsError("Arg error: too few args (%i)", argc);
+        return;
+    }
+    if (!jsvIsString(jsvGetArrayItem(args, 0))) {
+        jsError("Arg error: bad arg type [0]");
+        return;
+    }
+    const char* text = jsvAsString(jsvGetArrayItem(args, 0));
+    if (!jsvIsInt(jsvGetArrayItem(args, 1))) {
+        jsError("Arg error: bad arg type [1]");
+        return;
+    }
+    uint16_t x = (uint16_t)jsvGetInteger(jsvGetArrayItem(args, 1));
+    if (!jsvIsInt(jsvGetArrayItem(args, 2))) {
+        jsError("Arg error: bad arg type [2]");
+        return;
+    }
+    uint16_t y = (uint16_t)jsvGetInteger(jsvGetArrayItem(args, 2));
+    if (!jsvIsInt(jsvGetArrayItem(args, 3))) {
+        jsError("Arg error: bad arg type [3]");
+        return;
+    }
+    _Bool large_font = jsvGetBool(jsvGetArrayItem(args, 3));
+    if (!jsvIsInt(jsvGetArrayItem(args, 4))) {
+        jsError("Arg error: bad arg type [4]");
+        return;
+    }
+    uint16_t text_color = (uint16_t)jsvGetInteger(jsvGetArrayItem(args, 4));
+    if (!jsvIsInt(jsvGetArrayItem(args, 5))) {
+        jsError("Arg error: bad arg type [5]");
+        return;
+    }
+    uint16_t background_color = (uint16_t)jsvGetInteger(jsvGetArrayItem(args, 5));
+    eadk_display_draw_string(text, (eadk_point_t){x, y}, large_font, (eadk_color_t)text_color, (eadk_color_t)background_color);
+    return;
 }
 void jswrap_timing_usleep(uint32_t us) {
     return eadk_timing_usleep(us);
@@ -12498,7 +12541,7 @@ uint64_t jswrap_timing_millis() {
     return eadk_timing_millis();
 }
 _Bool jswrap_usb_is_plugged() {
-    return 0;
+    _Bool returnValue; __asm__ volatile("svc %[immediate] ; mov %[returnValue], r0" : [returnValue] "=r"(returnValue) : [immediate] "I"(52) : "r0", "r1", "r2", "r3"); return returnValue;
 }
 uint32_t jswrap_random() {
     return eadk_random();