minor tweaks

Author: gfwilliams

scripts/build_platform_config.py

@@ -355,6 +355,15 @@ def codeOutDevicePin(device, pin, definition_name):
   if "pin_vsense" in board.devices["USB"]: codeOutDevicePin("USB", "pin_vsense", "USB_VSENSE_PIN")
 
 if "LCD" in board.devices:
+  codeOut("#define LCD_CONTROLLER_"+board.devices["LCD"]["controller"].upper())
+  if "width" in board.devices["LCD"]:
+    codeOut("#define LCD_WIDTH "+str(board.devices["LCD"]["width"]))
+  if "height" in board.devices["LCD"]:
+    codeOut("#define LCD_HEIGHT "+str(board.devices["LCD"]["height"]))
+  if "bpp" in board.devices["LCD"]:
+    codeOut("#define LCD_BPP "+str(board.devices["LCD"]["bpp"]))
+  if "pin_bl" in board.devices["LCD"]:
+    codeOutDevicePin("LCD", "pin_bl", "LCD_BL")
   if board.devices["LCD"]["controller"]=="fsmc":
     for i in range(0,16):
       codeOutDevicePin("LCD", "pin_d"+str(i), "LCD_FSMC_D"+str(i))
@@ -365,14 +374,14 @@ def codeOutDevicePin(device, pin, definition_name):
       codeOutDevicePin("LCD", "pin_rs", "LCD_FSMC_RS")
     if "pin_reset" in board.devices["LCD"]:
       codeOutDevicePin("LCD", "pin_reset", "LCD_RESET")
-    if "pin_bl" in board.devices["LCD"]:
-      codeOutDevicePin("LCD", "pin_bl", "LCD_BL")
-  if board.devices["LCD"]["controller"]=="ssd1306" or board.devices["LCD"]["controller"]=="st7567":
+  if board.devices["LCD"]["controller"]=="ssd1306" or board.devices["LCD"]["controller"]=="st7567" or board.devices["LCD"]["controller"]=="st7789v":
     codeOutDevicePin("LCD", "pin_mosi", "LCD_SPI_MOSI")
     codeOutDevicePin("LCD", "pin_sck", "LCD_SPI_SCK")
     codeOutDevicePin("LCD", "pin_cs", "LCD_SPI_CS")
     codeOutDevicePin("LCD", "pin_dc", "LCD_SPI_DC")
     codeOutDevicePin("LCD", "pin_rst", "LCD_SPI_RST")
+  if "pin_bl" in board.devices["LCD"]:
+    codeOutDevicePin("LCD", "pin_bl", "LCD_BL")
 
 if "SD" in board.devices:
   if not "pin_d3" in board.devices["SD"]: # NOT SDIO - normal SD

src/jsinteractive.c

@@ -827,7 +827,7 @@ void jsiSemiInit(bool autoLoad) {
           "|  __|_ -| . |  _| | | |   | . |\n"
           "|____|___|  _|_| |___|_|_|_|___|\n"
           "         |_| espruino.com\n"
-          " "JS_VERSION" (c) 2018 G.Williams\n"
+          " "JS_VERSION" (c) 2019 G.Williams\n"
         // Point out about donations - but don't bug people
         // who bought boards that helped Espruino
 #if !defined(PICO) && !defined(ESPRUINOBOARD) && !defined(ESPRUINOWIFI) && !defined(PUCKJS) && !defined(PIXLJS)

targets/nrf5x/jshardware.c

@@ -1309,8 +1309,17 @@ void jshSPISetup(IOEventFlags device, JshSPIInfo *inf) {
     freq = SPI_FREQUENCY_FREQUENCY_M2;
   else if (inf->baudRate<((4000000+8000000)/2))
     freq = SPI_FREQUENCY_FREQUENCY_M4;
+#ifndef NRF52840
   else
     freq = SPI_FREQUENCY_FREQUENCY_M8;
+#else
+  else if (inf->baudRate<((8000000+16000000)/2))
+    freq = SPI_FREQUENCY_FREQUENCY_M8;
+  else if (inf->baudRate<((16000000+32000000)/2))
+    freq = 0x0A000000;//SPI_FREQUENCY_FREQUENCY_M16;
+  else
+    freq = 0x14000000;//SPI_FREQUENCY_FREQUENCY_M32;
+#endif
   spi_config.frequency =  freq;
   spi_config.mode = inf->spiMode;
   spi_config.bit_order = inf->spiMSB ? NRF_DRV_SPI_BIT_ORDER_MSB_FIRST : NRF_DRV_SPI_BIT_ORDER_LSB_FIRST;