remove extraneous commas

Moddable-OpenSource · Oct 19, 2020 · b6a18d3 · b6a18d3
1 parent 1202b6e
commit b6a18d3
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 21 deletions.
diff --git a/build/devices/esp/targets/sparkfun_teensyview/manifest.json b/build/devices/esp/targets/sparkfun_teensyview/manifest.json
@@ -1,15 +1,15 @@
 {
 	"include": [
-		"$(MODDABLE)/modules/drivers/ssd1306/manifest_spi.json",
+		"$(MODDABLE)/modules/drivers/ssd1306/manifest_spi.json"
 	],
 	"config": {
 		"screen": "ssd1306",
 		"touch": "",
-		"format": "Gray256",
+		"format": "Gray256"
 	},
 	"defines": {
 		"ssd1306": {
-			"dither": true,
+			"dither": true
 		}
-	},
-}
+	}
+}
diff --git a/examples/drivers/ssd1306/manifest.json b/examples/drivers/ssd1306/manifest.json
@@ -2,7 +2,7 @@
 	"include": [
 		"$(MODDABLE)/examples/manifest_base.json",
 		"$(MODDABLE)/examples/manifest_commodetto.json",
-		"$(MODULES)/drivers/ssd1306/manifest.json"
+		"$(MODULES)/drivers/ssd1306/manifest_i2c.json"
 	],
 	"modules": {
 		"*": "./main"

diff --git a/examples/piu/wifi-config/manifest.json b/examples/piu/wifi-config/manifest.json
@@ -81,6 +81,14 @@
 				"rotation": 180
 			}
 		},
+		"esp32/m5stack_fire": {
+			"creation":{
+				"static": 50000
+			},
+			"config": {
+				"rotation": 180
+			}
+		},
         "...": {
             "error": "unsupported platform"
         }

diff --git a/modules/drivers/arducam/modArducam.c b/modules/drivers/arducam/modArducam.c
@@ -267,7 +267,7 @@ void xs_arducam_read(xsMachine *the)
 	int i;
 	uint8_t data[4];
 	uint8_t *buffer;
-	int bufferSize = xsGetArrayBufferLength(xsArg(0));
+	int bufferSize = xsmcGetArrayBufferLength(xsArg(0));
 	int readSize;
 
 	if (1 == argc)

diff --git a/modules/drivers/ssd1306/manifest_i2c.json b/modules/drivers/ssd1306/manifest_i2c.json
@@ -5,45 +5,45 @@
 			"height": 32,
 			"dither": false,
 			"spi": false,
-			"i2c": true,
+			"i2c": true
 		}
 	},
 	"preload": [
 		"ssd1306",
-		"commodetto/Bitmap",
+		"commodetto/Bitmap"
 	],
 	"platforms": {
 		"esp": {
 			"include": [
 				"$(MODULES)/pins/digital/manifest.json",
-				"$(MODULES)/pins/i2c/manifest.json",
+				"$(MODULES)/pins/i2c/manifest.json"
 			],
 			"modules": {
 				"*": "$(MODULES)/drivers/ssd1306/*",
-				"commodetto/Bitmap": "$(COMMODETTO)/commodettoBitmap",
+				"commodetto/Bitmap": "$(COMMODETTO)/commodettoBitmap"
 			},
 			"defines": {
 				"ssd1306": {
 					"scl_pin": 4,
 					"sda_pin": 5,
-					"address": "0x3c",
+					"address": "0x3c"
 				}
 			}
 		},
 		"esp32": {
 			"include": [
 				"$(MODULES)/pins/digital/manifest.json",
-				"$(MODULES)/pins/i2c/manifest.json",
+				"$(MODULES)/pins/i2c/manifest.json"
 			],
 			"modules": {
 				"*": "$(MODULES)/drivers/ssd1306/*",
-				"commodetto/Bitmap": "$(COMMODETTO)/commodettoBitmap",
+				"commodetto/Bitmap": "$(COMMODETTO)/commodettoBitmap"
 			},
 			"defines": {
 				"ssd1306": {
 					"scl_pin": 4,
 					"sda_pin": 5,
-					"address": "0x3c",
+					"address": "0x3c"
 				}
 			}
 		}

diff --git a/modules/drivers/ssd1306/manifest_spi.json b/modules/drivers/ssd1306/manifest_spi.json
@@ -5,22 +5,22 @@
 			"height": 32,
 			"dither": false,
 			"spi": true,
-			"i2c": false,
+			"i2c": false
 		}
 	},
 	"preload": [
 		"ssd1306",
-		"commodetto/Bitmap",
+		"commodetto/Bitmap"
 	],
 	"platforms": {
 		"esp": {
 			"include": [
 				"$(MODULES)/pins/digital/manifest.json",
-				"$(MODULES)/pins/spi/manifest.json",
+				"$(MODULES)/pins/spi/manifest.json"
 			],
 			"modules": {
 				"*": "$(MODULES)/drivers/ssd1306/*",
-				"commodetto/Bitmap": "$(COMMODETTO)/commodettoBitmap",
+				"commodetto/Bitmap": "$(COMMODETTO)/commodettoBitmap"
 			},
 			"defines": {
 				"ssd1306": {
@@ -33,11 +33,11 @@
 		"esp32": {
 			"include": [
 				"$(MODULES)/pins/digital/manifest.json",
-				"$(MODULES)/pins/spi/manifest.json",
+				"$(MODULES)/pins/spi/manifest.json"
 			],
 			"modules": {
 				"*": "$(MODULES)/drivers/ssd1306/*",
-				"commodetto/Bitmap": "$(COMMODETTO)/commodettoBitmap",
+				"commodetto/Bitmap": "$(COMMODETTO)/commodettoBitmap"
 			},
 			"defines": {
 				"ssd1306": {