WiFi: use default instance if available

Author: facchinm

examples/ArduinoOnMbed/ArduinoOnMbed.ino

@@ -1,7 +1,7 @@
 #include "WiFi.h"
 #include "WiFiSSLClient.h"
 //#include "WiFiESP8266.h"
-#include "WiFiODINW2.h"
+//#include "WiFiODINW2.h"
 #include "TLSSocket.h"
 #include <MQTTClient.h>
 
@@ -36,7 +36,7 @@ const char CA_CERTIFICATES[] = "-----BEGIN CERTIFICATE-----\n"
 "-----END CERTIFICATE-----\n";
 
 
-#define TEST_SSL
+//#define TEST_SSL
 
 #ifndef TEST_SSL
 WiFiClient net;
@@ -45,6 +45,8 @@ WiFiSSLClient net;
 #endif
 MQTTClient client;
 
+#define Serial Serial1
+
 unsigned long lastMillis = 0;
 
 void messageReceived(String &topic, String &payload) {
@@ -58,17 +60,16 @@ void setup() {
   String b = a + 12;
   String c = a + "18";
   Serial.begin(115200);
+  while (!Serial) {}
   delay(100);
   Serial.println(a);
   Serial.println(b);
   Serial.println(c);
   a += "68";
   Serial.println(a);
-  //delay(2000);
-  Serial.println(USBRX);
-  Serial.println(USBTX);
+  delay(2000);
   printf("now\n\r");
-  int ret = WiFi.begin("BCMI", "ArduinoccRulez");
+  int ret = WiFi.begin("AndroidCulo", "Sesamo1.");
   Serial.println("Wifibegin " + String(ret));
 
 #ifndef TEST_SSL

examples/Demo_CES_mjpeg/Demo_CES_mjpeg.ino

@@ -59,7 +59,7 @@ void setup() {
   //edid_set_framebuffer_bits_per_pixel(&recognized_edid, 16, 0);
   //set_display_mode(&recognized_edid, EDID_MODE_720x480_60Hz);
   //anx7625_dp_start(0, &recognized_edid, EDID_MODE_1280x720_60Hz);
-  anx7625_dp_start(0, &recognized_edid);
+  anx7625_dp_start(0, &recognized_edid, EDID_MODE_800x600_59Hz);
 
   SDRAM.begin(getFramebufferEnd());
 
@@ -111,10 +111,11 @@ void setup() {
   LCD_X_Size = stm32_getXSize();
   LCD_Y_Size = stm32_getYSize();
 
-/*
+  while (1) {
   stm32_LCD_DrawImage((void*)texture_raw, (void *)getNextFrameBuffer(), 300, 300, DMA2D_INPUT_RGB565);
   stm32_LCD_DrawImage((void*)texture_raw, (void *)getNextFrameBuffer(), 300, 300, DMA2D_INPUT_RGB565);
-*/
+  }
+
   JPEG_Handle.Instance = JPEG;
   HAL_JPEG_Init(&JPEG_Handle);
 }

examples/Doom/Doom.ino

@@ -1,9 +1,8 @@
-#include "QSPIFBlockDevice.h"
+#include "SDMMCBlockDevice.h"
 #include "FATFileSystem.h"
 #include "doomgeneric.h"
 
-QSPIFBlockDevice block_device(PD_11, PD_12, PF_7, PD_13,
-                              PF_10, PG_6, QSPIF_POLARITY_MODE_1, MBED_CONF_QSPIF_QSPI_FREQ);
+SDMMCBlockDevice block_device;
 
 mbed::FATFileSystem fs("fs");
 

examples/Envie_camera/Envie_camera.ino

@@ -7,12 +7,13 @@ mbed::DigitalOut pin(PD_4);
 void setup() {
 
   Serial.begin(115200);
+  while (!Serial);
   pin = 1;
-  delay(1000);
 
   // put your setup code here, to run once:
   cam.begin();
   cam.snapshot();
+
 }
 
 void loop() {

examples/RPC_m4/RPC_m4.ino

@@ -17,6 +17,6 @@ void loop() {
   digitalWrite(LED_BUILTIN, LOW);
   delay(1000);
   RPC1.println("test");
-  auto res = RPC1.client.call("add", 12, 45).as<int>();;
-  RPC1.println(res);
+  //auto res = RPC1.client.call("add", 12, 45).as<int>();;
+  //RPC1.println(res);
 }

libraries/ENVIE_Camera/camera.cpp

@@ -7,11 +7,11 @@
 #define LCD_FRAME_BUFFER                  0xC0000000 /* LCD Frame buffer of size 800x480 in ARGB8888 */
 #define CAMERA_FRAME_BUFFER               0xC0200000
 
-#define QVGA_RES_X	320
-#define QVGA_RES_Y	240
+#define QVGA_RES_X	96
+#define QVGA_RES_Y	96
 
-#define CAM_W_RES       324
-#define CAM_H_RES       244
+#define CAM_W_RES       96
+#define CAM_H_RES       96
 #define CAM_PIXEL_IMAGE_SIZE (CAM_H_RES * CAM_W_RES)
 #define SKIP_FRAMES 10
 
@@ -206,12 +206,17 @@ uint8_t BSP_CAMERA_Init(uint32_t Resolution)
   BSP_CAMERA_MspInit(&hdcmi_discovery, NULL);
   HAL_DCMI_Init(phdcmi);
 
+  /*
+  * @param  YSize DCMI Line number
+  * @param  XSize DCMI Pixel per line
+  * @param  X0    DCMI window X offset
+  * @param  Y0    DCMI window Y offset
+  * @retval HAL status
+  */
+//HAL_StatusTypeDef HAL_DCMI_ConfigCrop(DCMI_HandleTypeDef *hdcmi, uint32_t X0, uint32_t Y0, uint32_t XSize, uint32_t YSize)
+
 /*
-      HAL_DCMI_ConfigCROP(phdcmi,           // Crop in the middle of the VGA picture
-                         (CAMERA_VGA_RES_X - CAMERA_480x272_RES_X)/2,
-                         (CAMERA_VGA_RES_Y - CAMERA_480x272_RES_Y)/2,
-                         (CAMERA_480x272_RES_X * 2) - 1,
-                          CAMERA_480x272_RES_Y - 1);
+      HAL_DCMI_ConfigCROP(phdcmi, (324 - 96) / 2, (244 - 96 / 2), 96, 96);
       HAL_DCMI_EnableCROP(phdcmi);
 */
 
@@ -367,7 +372,7 @@ static uint32_t GetSize(uint32_t Resolution)
     break;
   case CAMERA_R320x240:
     {
-      size =  324 * 244;
+      size =  96 * 96;
     }
     break;
   case CAMERA_R480x272:
@@ -399,7 +404,7 @@ void BSP_CAMERA_ErrorCallback(void)
 
 void BSP_CAMERA_FrameEventCallback(void)
 {
-  camera_frame_ready = 1;
+  camera_frame_ready++;
 }
 
 
@@ -472,65 +477,68 @@ void HAL_DCMI_ErrorCallback(DCMI_HandleTypeDef *hdcmi)
 }
 
 
-int CameraClass::begin(void)
+int CameraClass::begin(int horizontalResolution, int verticalResolution)
 {  
   CameraResX = QVGA_RES_X;
   CameraResY = QVGA_RES_Y;
 
   SDRAM.begin(LCD_FRAME_BUFFER);
 
-  for (int i=0; i<1000; i++) {
-    *((uint8_t*)LCD_FRAME_BUFFER + i) = 0x55;
-  }
-
-    printf("Clean ram\n");
-
-  for (int i=0; i<1000; i++) {
-    printf("%02x ", *((uint8_t*)LCD_FRAME_BUFFER + i));
-    if (i % 16 == 0) {
-      printf("\n");
-    }
-  }
-
   /*## Camera Initialization and capture start ############################*/
   /* Initialize the Camera in QVGA mode */
   if(BSP_CAMERA_Init(CAMERA_R320x240) != 1)
   {
-    printf("BSP_CAMERA_Init failed\n");
     return 0;
   }
 
 }
 
-int CameraClass::snapshot(void)
+int CameraClass::start(void)
 {
-  printf("Start snapshot\n");
   HIMAX_Mode(HIMAX_Streaming);
 
   /* Start the Camera Snapshot Capture */
-  BSP_CAMERA_SnapshotStart((uint8_t *)LCD_FRAME_BUFFER);
-  //BSP_CAMERA_ContinuousStart((uint8_t *)CAMERA_FRAME_BUFFER);
+  BSP_CAMERA_ContinuousStart((uint8_t *)LCD_FRAME_BUFFER);
 
   /* Wait until camera frame is ready : DCMI Frame event */
   while(camera_frame_ready == 0)
   {
   }
+}
 
-  delay(100);
+uint8_t* CameraClass::grab(void)
+{
+  HIMAX_Mode(HIMAX_Streaming);
 
-  printf("Snapshot done\n");
-  
-      printf("Print ram\n");
+  /* Start the Camera Snapshot Capture */
+  BSP_CAMERA_ContinuousStart((uint8_t *)LCD_FRAME_BUFFER);
 
-  for (int i=0; i<1000; i++) {
-    printf("%02x ", *((uint8_t*)LCD_FRAME_BUFFER + i));
-    if (i % 16 == 0) {
-      printf("\n");
-    }
+  /* Wait until camera frame is ready : DCMI Frame event */
+  while(camera_frame_ready == 0)
+  {
   }
+}
+
+uint8_t* CameraClass::snapshot(void)
+{
+  printf("Start snapshot\n");
+  HIMAX_Mode(HIMAX_Streaming);
+
+  /* Start the Camera Snapshot Capture */
+  BSP_CAMERA_SnapshotStart((uint8_t *)LCD_FRAME_BUFFER);
+
+  /* Wait until camera frame is ready : DCMI Frame event */
+  while(camera_frame_ready == 0)
+  {
+  }
+
+  HIMAX_Mode(HIMAX_Standby);
+
   /* Stop the camera to avoid having the DMA2D work in parallel of Display */
   /* which cause perturbation of LTDC                                      */
-  BSP_CAMERA_Stop();
+  BSP_CAMERA_Suspend();
+
+  return (uint8_t *)LCD_FRAME_BUFFER;
 }
 
 

libraries/ENVIE_SDRAM/SDRAM.cpp

@@ -5,6 +5,7 @@ extern "C" {
 
 int SDRAMClass::begin(uint32_t start_address) {
 
+	printf("FMC_SDRAM_DEVICE->SDCMR: %x\n", FMC_SDRAM_DEVICE->SDCMR);
 	if (FMC_SDRAM_DEVICE->SDCMR == 0x00000000U) {
 		printf("initializing external ram\n");
 		bool ret = sdram_init();

libraries/Himax_HM01B0/himax.cpp

@@ -157,10 +157,11 @@ static regval_list_t himax_default_regs[] = {
     {0x3010, 0x01}, // 324 x 244 pixel
     {0x0383, 0x01},
     {0x0387, 0x01},
-    {0x0390, 0x00},
+    {0x0390, 0x03},
     {0x3011, 0x70},
     {0x3059, 0x02},
     {0x3060, 0x00},
+    //{0x0601, 0x01},
     {IMG_ORIENTATION, 0x01}, // change the orientation
     {0x0104, 0x01}
 };

libraries/WiFi/src/WiFi.cpp

@@ -57,6 +57,10 @@ NetworkInterface *arduino::WiFiClass::getNetwork() {
     return wifi_if;
 }
 
+#if defined(ARDUINO_ENVIE_M7) || defined(ARDUINO_ENVIE_M4)
+arduino::WiFiClass WiFi(WiFiInterface::get_default_instance());
+#endif
+
 // every specialization library should declare its own WiFI object: eg
 //
 // static ESP8266Interface wifi_if(PD_8, PD_9);

variants/MTB_MURATA_ABZ/defines.txt

@@ -34,7 +34,7 @@
 -DDEVICE_USTICKER=1
 -DDEVICE_WATCHDOG=1
 -D__MBED__=1
--DMBED_BUILD_TIMESTAMP=1578671453.0131822
+-DMBED_BUILD_TIMESTAMP=1580311026.79433
 -D__MBED_CMSIS_RTOS_CM
 -DTARGET_CORTEX
 -DTARGET_CORTEX_M

variants/MTB_MURATA_ABZ/includes.txt

@@ -14,13 +14,7 @@
 -iwithprefixbefore/mbed/platform/cxxsupport
 -iwithprefixbefore/mbed/platform
 -iwithprefixbefore/mbed/hal/usb
--iwithprefixbefore/mbed/hal/storage_abstraction
 -iwithprefixbefore/mbed/hal
--iwithprefixbefore/mbed/features/unsupported/dsp/dsp
--iwithprefixbefore/mbed/features/unsupported/dsp/cmsis_dsp
--iwithprefixbefore/mbed/features/unsupported/dsp/
--iwithprefixbefore/mbed/features/storage/system_storage
--iwithprefixbefore/mbed/features/storage/nvstore
 -iwithprefixbefore/mbed/features/storage/kvstore/tdbstore
 -iwithprefixbefore/mbed/features/storage/kvstore/securestore
 -iwithprefixbefore/mbed/features/storage/kvstore/kv_map