Reset some encodings

workspace/TS100/Core/BSP/Pine64/Vendor/NMSIS/Core/Include/riscv_bits.h

@@ -37,9 +37,7 @@ extern "C" {
 #endif /* __riscv_xlen */
 
 #define REGBYTES (1 << LOG_REGBYTES)
-#ifndef __riscv_flen
-#define __riscv_flen 32
-#endif
+
 #if __riscv_flen == 64
 # define FPSTORE                fsd
 # define FPLOAD                 fld

workspace/TS100/Core/BSP/Pine64/Vendor/OS/FreeRTOS/Source/portable/GCC/portmacro.h

@@ -25,6 +25,7 @@
  * 1 tab == 4 spaces!
  */
 
+
 #ifndef PORTMACRO_H
 #define PORTMACRO_H
 
@@ -84,9 +85,7 @@ typedef uint64_t TickType_t;
     __RWMB();                                                                   \
 }
 
-#define portEND_SWITCHING_ISR(xSwitchRequired) \
-    if (xSwitchRequired != pdFALSE)            \
-    portYIELD()
+#define portEND_SWITCHING_ISR( xSwitchRequired )    if ( xSwitchRequired != pdFALSE ) portYIELD()
 #define portYIELD_FROM_ISR( x )                     portEND_SWITCHING_ISR( x )
 /*-----------------------------------------------------------*/
 
@@ -138,14 +137,16 @@ extern void vPortValidateInterruptPriority(void);
 extern uint8_t uxMaxSysCallMTH;
 
 /*-----------------------------------------------------------*/
-portFORCE_INLINE static void vPortRaiseBASEPRI(void) {
+portFORCE_INLINE static void vPortRaiseBASEPRI( void )
+{
     ECLIC_SetMth(uxMaxSysCallMTH);
     __RWMB();
 }
 
 /*-----------------------------------------------------------*/
 
-portFORCE_INLINE static uint8_t ulPortRaiseBASEPRI(void) {
+portFORCE_INLINE static uint8_t ulPortRaiseBASEPRI( void )
+{
     uint8_t ulOriginalBASEPRI;
 
     ulOriginalBASEPRI = ECLIC_GetMth();
@@ -158,17 +159,18 @@ portFORCE_INLINE static uint8_t ulPortRaiseBASEPRI(void) {
 }
 /*-----------------------------------------------------------*/
 
-portFORCE_INLINE static void vPortSetBASEPRI(uint8_t ulNewMaskValue) {
+portFORCE_INLINE static void vPortSetBASEPRI( uint8_t ulNewMaskValue )
+{
     ECLIC_SetMth(ulNewMaskValue);
     __RWMB();
 }
 /*-----------------------------------------------------------*/
 
-#define portMEMORY_BARRIER() __asm volatile("" :: \
-                                                : "memory")
+#define portMEMORY_BARRIER()        __asm volatile( "" ::: "memory" )
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* PORTMACRO_H */
+

workspace/TS100/Core/BSP/Pine64/Vendor/SoC/gd32vf103/Board/gd32vf103v_eval/Include/gd32vf103v_eval.h

@@ -0,0 +1,48 @@
+/*!
+    \file    gd32vf103v_eval.h
+    \brief   definitions for GD32VF103V_EVAL's leds, keys and COM ports hardware resources
+
+    \version 2019-6-5, V1.0.0, demo for GD32VF103
+*/
+
+/*
+    Copyright (c) 2019, GigaDevice Semiconductor Inc.
+
+    Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation
+       and/or other materials provided with the distribution.
+    3. Neither the name of the copyright holder nor the names of its contributors
+       may be used to endorse or promote products derived from this software without
+       specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGE.
+*/
+
+#ifndef GD32VF103V_EVAL_H
+#define GD32VF103V_EVAL_H
+
+#ifdef cplusplus
+ extern "C" {
+#endif
+
+#include "nuclei_sdk_soc.h"
+
+#ifdef cplusplus
+}
+#endif
+
+#endif /* GD32VF103V_EVAL_H */

workspace/TS100/Core/BSP/Pine64/Vendor/SoC/gd32vf103/Board/gd32vf103v_eval/Include/nuclei_sdk_hal.h

@@ -0,0 +1,19 @@
+// See LICENSE for license details.
+#ifndef _NUCLEI_SDK_HAL_H
+#define _NUCLEI_SDK_HAL_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+#include "gd32vf103v_eval.h"
+
+
+#ifndef NUCLEI_BANNER
+#define NUCLEI_BANNER       0
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif

workspace/TS100/Core/BSP/Pine64/Vendor/SoC/gd32vf103/Board/gd32vf103v_eval/Source/GCC/gcc_gd32vf103_flashxip.ld

@@ -0,0 +1,284 @@
+/*
+ * Copyright (c) 2019 Nuclei Limited. All rights reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the License); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/******************************************************************************
+ * @file     gcc_Device.ld
+ * @brief    GNU Linker Script for gd32vf103 based device
+ * @version  V1.0.0
+ * @date     17. Dec 2019
+ ******************************************************************************/
+
+/*********** Use Configuration Wizard in Context Menu *************************/
+
+OUTPUT_ARCH( "riscv" )
+/********************* Flash Configuration ************************************
+ * <h> Flash Configuration
+ * <o0> Flash Base Address <0x0-0xFFFFFFFF:8>
+ * <o1> Flash Size (in Bytes) <0x0-0xFFFFFFFF:8>
+ * </h>
+ */
+__ROM_BASE = 0x08000000;
+__ROM_SIZE = 0x00020000;
+
+/*--------------------- ILM RAM Configuration ---------------------------
+ * <h> ILM RAM Configuration
+ * <o0> ILM RAM Base Address    <0x0-0xFFFFFFFF:8>
+ * <o1> ILM RAM Size (in Bytes) <0x0-0xFFFFFFFF:8>
+ * </h>
+ */
+__ILM_RAM_BASE = 0x80000000;
+__ILM_RAM_SIZE = 0x00010000;
+
+/*--------------------- Embedded RAM Configuration ---------------------------
+ * <h> RAM Configuration
+ * <o0> RAM Base Address    <0x0-0xFFFFFFFF:8>
+ * <o1> RAM Size (in Bytes) <0x0-0xFFFFFFFF:8>
+ * </h>
+*/
+__RAM_BASE = 0x20000000;
+__RAM_SIZE = 0x00005000;
+
+/********************* Stack / Heap Configuration ****************************
+ * <h> Stack / Heap Configuration
+ * <o0> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
+ * <o1> Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
+ * </h>
+ */
+__STACK_SIZE = 0x00000800;
+__HEAP_SIZE  = 0x00000800;
+
+/**************************** end of configuration section ********************/
+
+/* Define base address and length of flash and ram */
+MEMORY
+{
+  flash (rxai!w) : ORIGIN = __ROM_BASE, LENGTH = __ROM_SIZE
+  ram (wxa!ri) : ORIGIN = __RAM_BASE, LENGTH = __RAM_SIZE
+}
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH,ILM and RAM.
+ * It references following symbols, which must be defined in code:
+ *   _Start : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   _ilm_lma
+ *   _ilm
+ *   __etext
+ *   _etext
+ *   etext
+ *   _eilm
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   _data_lma
+ *   _edata
+ *   edata
+ *   __data_end__
+ *   __bss_start
+ *   __fbss
+ *   _end
+ *   end
+ *   __heap_end
+ *   __StackLimit
+ *   __StackTop
+ *   __STACK_SIZE
+ */
+/* Define entry label of program */
+ENTRY(_start)
+SECTIONS
+{
+  __STACK_SIZE = DEFINED(__STACK_SIZE) ? __STACK_SIZE : 2K;
+
+  .init           :
+  {
+    /* vector table locate at flash */
+    *(.vtable)
+    KEEP (*(SORT_NONE(.init)))
+  } >flash AT>flash
+
+  .ilalign         :
+  {
+    . = ALIGN(4);
+    /* Create a section label as _ilm_lma which located at flash */
+    PROVIDE( _ilm_lma = . );
+  } >flash AT>flash
+
+  .ialign         :
+  {
+    /* Create a section label as _ilm which located at flash */
+    PROVIDE( _ilm = . );
+  } >flash AT>flash
+
+  /* Code section located at flash */
+  .text           :
+  {
+    *(.text.unlikely .text.unlikely.*)
+    *(.text.startup .text.startup.*)
+    *(.text .text.*)
+    *(.gnu.linkonce.t.*)
+  } >flash AT>flash
+
+  .rodata : ALIGN(4)
+  {
+    . = ALIGN(4);
+    *(.rdata)
+    *(.rodata .rodata.*)
+    /* section information for initial. */
+    . = ALIGN(4);
+    __rt_init_start = .;
+    KEEP(*(SORT(.rti_fn*)))
+    __rt_init_end = .;
+    /* section information for finsh shell */
+    . = ALIGN(4);
+    __fsymtab_start = .;
+    KEEP(*(FSymTab))
+    __fsymtab_end = .;
+    . = ALIGN(4);
+    __vsymtab_start = .;
+    KEEP(*(VSymTab))
+    __vsymtab_end = .;
+    *(.gnu.linkonce.r.*)
+    . = ALIGN(8);
+    *(.srodata.cst16)
+    *(.srodata.cst8)
+    *(.srodata.cst4)
+    *(.srodata.cst2)
+    *(.srodata .srodata.*)
+  } >flash AT>flash
+
+  .fini           :
+  {
+    KEEP (*(SORT_NONE(.fini)))
+  } >flash AT>flash
+
+  . = ALIGN(4);
+
+  PROVIDE (__etext = .);
+  PROVIDE (_etext = .);
+  PROVIDE (etext = .);
+  PROVIDE( _eilm = . );
+
+
+  .preinit_array  :
+  {
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+  } >flash AT>flash
+
+  .init_array     :
+  {
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))
+    KEEP (*(.init_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .ctors))
+    PROVIDE_HIDDEN (__init_array_end = .);
+  } >flash AT>flash
+
+  .fini_array     :
+  {
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))
+    KEEP (*(.fini_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .dtors))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+  } >flash AT>flash
+
+  .ctors          :
+  {
+    /* gcc uses crtbegin.o to find the start of
+     * the constructors, so we make sure it is
+     * first.  Because this is a wildcard, it
+     * doesn't matter if the user does not
+     * actually link against crtbegin.o; the
+     * linker won't look for a file to match a
+     * wildcard.  The wildcard also means that it
+     * doesn't matter which directory crtbegin.o
+     * is in.
+     */
+    KEEP (*crtbegin.o(.ctors))
+    KEEP (*crtbegin?.o(.ctors))
+    /* We don't want to include the .ctor section from
+     * the crtend.o file until after the sorted ctors.
+     * The .ctor section from the crtend file contains the
+     * end of ctors marker and it must be last
+     */
+    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))
+    KEEP (*(SORT(.ctors.*)))
+    KEEP (*(.ctors))
+  } >flash AT>flash
+
+  .dtors          :
+  {
+    KEEP (*crtbegin.o(.dtors))
+    KEEP (*crtbegin?.o(.dtors))
+    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))
+    KEEP (*(SORT(.dtors.*)))
+    KEEP (*(.dtors))
+  } >flash AT>flash
+
+  .lalign         :
+  {
+    . = ALIGN(4);
+    PROVIDE( _data_lma = . );
+  } >flash AT>flash
+
+  .dalign         :
+  {
+    . = ALIGN(4);
+    PROVIDE( _data = . );
+  } >ram AT>flash
+
+  /* Define data section virtual address is ram and physical address is flash */
+  .data          :
+  {
+    *(.data .data.*)
+    *(.gnu.linkonce.d.*)
+    . = ALIGN(8);
+    PROVIDE( __global_pointer$ = . + 0x800 );
+    *(.sdata .sdata.* .sdata*)
+    *(.gnu.linkonce.s.*)
+  } >ram AT>flash
+
+  . = ALIGN(4);
+  PROVIDE( _edata = . );
+  PROVIDE( edata = . );
+
+  PROVIDE( _fbss = . );
+  PROVIDE( __bss_start = . );
+  .bss            :
+  {
+    *(.sbss*)
+    *(.gnu.linkonce.sb.*)
+    *(.bss .bss.*)
+    *(.gnu.linkonce.b.*)
+    *(COMMON)
+    . = ALIGN(4);
+  } >ram AT>ram
+
+  . = ALIGN(8);
+  PROVIDE( _end = . );
+  PROVIDE( end = . );
+  /* Define stack and head location at ram */
+  .stack ORIGIN(ram) + LENGTH(ram) - __STACK_SIZE :
+  {
+    PROVIDE( _heap_end = . );
+    . = __STACK_SIZE;
+    PROVIDE( _sp = . );
+  } >ram AT>ram
+}

workspace/TS100/Core/BSP/Pine64/Vendor/SoC/gd32vf103/Board/gd32vf103v_eval/Source/gd32vf103v_eval.c

@@ -0,0 +1,39 @@
+/*!
+    \file    gd32vf103v_eval.c
+    \brief   firmware functions to manage leds, keys, COM ports
+
+    \version 2019-6-5, V1.0.0, demo for GD32VF103
+*/
+
+/*
+    Copyright (c) 2019, GigaDevice Semiconductor Inc.
+
+    Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice, this 
+       list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright notice, 
+       this list of conditions and the following disclaimer in the documentation 
+       and/or other materials provided with the distribution.
+    3. Neither the name of the copyright holder nor the names of its contributors 
+       may be used to endorse or promote products derived from this software without 
+       specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+OF SUCH DAMAGE.
+*/
+
+#include "nuclei_sdk_hal.h"
+#include "gd32vf103_usart.h"
+#include "gd32vf103_gpio.h"
+#include "gd32vf103_exti.h"
+

workspace/TS100/Core/BSP/Pine64/Vendor/SoC/gd32vf103/Board/gd32vf103v_eval/openocd_gd32vf103.cfg

@@ -0,0 +1,47 @@
+adapter_khz     1000
+reset_config srst_only
+adapter_nsrst_assert_width 100
+
+interface cmsis-dap
+
+transport select jtag
+
+autoexit true
+
+set _CHIPNAME riscv
+jtag newtap $_CHIPNAME cpu -irlen 5 -expected-id 0x1e200a6d
+
+set _TARGETNAME $_CHIPNAME.cpu
+target create $_TARGETNAME riscv -chain-position $_TARGETNAME
+$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size 20480 -work-area-backup 0
+
+# Work-area is a space in RAM used for flash programming
+if { [info exists WORKAREASIZE] } {
+   set _WORKAREASIZE $WORKAREASIZE
+} else {
+   set _WORKAREASIZE 0x5000
+}
+
+# Allow overriding the Flash bank size
+if { [info exists FLASH_SIZE] } {
+    set _FLASH_SIZE $FLASH_SIZE
+} else {
+    # autodetect size
+    set _FLASH_SIZE 0
+}
+
+# flash size will be probed
+set _FLASHNAME $_CHIPNAME.flash
+
+flash bank $_FLASHNAME gd32vf103 0x08000000 0 0 0 $_TARGETNAME
+
+# Expose Nuclei self-defined CSRS range 770-800,835-850,1984-2032,2064-2070
+# See https://github.com/riscv/riscv-gnu-toolchain/issues/319#issuecomment-358397306
+# Then user can view the csr register value in gdb using: info reg csr775 for CSR MTVT(0x307)
+riscv expose_csrs 770-800,835-850,1984-2032,2064-2070
+
+riscv set_reset_timeout_sec 1
+
+init
+
+halt

workspace/TS100/Core/BSP/Pine64/Vendor/SoC/gd32vf103/Board/pinecil/openocd_gd32vf103.cfg

@@ -1,4 +1,4 @@
-adapter_khz     1000
+adapter_khz     4000
 reset_config srst_only
 adapter_nsrst_assert_width 100
 

workspace/TS100/Core/Drivers/FUSB302/policy_engine.cpp

@@ -16,11 +16,11 @@
  */
 
 #include "policy_engine.h"
-#include "fusb302b.h"
-#include "int_n.h"
-#include "protocol_tx.h"
-#include <pd.h>
 #include <stdbool.h>
+#include "int_n.h"
+#include <pd.h>
+#include "protocol_tx.h"
+#include "fusb302b.h"
 bool PolicyEngine::pdNegotiationComplete;
 int PolicyEngine::current_voltage_mv;
 int PolicyEngine::_requested_voltage;
@@ -39,7 +39,8 @@ union pd_msg PolicyEngine::tempMessage;
 union pd_msg PolicyEngine::_last_dpm_request;
 PolicyEngine::policy_engine_state PolicyEngine::state = PESinkStartup;
 StaticQueue_t PolicyEngine::xStaticQueue;
-uint8_t PolicyEngine::ucQueueStorageArea[PDB_MSG_POOL_SIZE * sizeof(union pd_msg)];
+uint8_t PolicyEngine::ucQueueStorageArea[PDB_MSG_POOL_SIZE
+		* sizeof(union pd_msg)];
 QueueHandle_t PolicyEngine::messagesWaiting = NULL;
 EventGroupHandle_t PolicyEngine::xEventGroupHandle = NULL;
 StaticEventGroup_t PolicyEngine::xCreatedEventGroup;
@@ -183,7 +184,8 @@ PolicyEngine::policy_engine_state PolicyEngine::pe_sink_wait_cap() {
 		/* Get the message */
 		while ((evt & PDB_EVT_PE_MSG_RX_PEND) || readMessage() == true) {
 			/* If we got a Source_Capabilities message, read it. */
-            if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_SOURCE_CAPABILITIES && PD_NUMOBJ_GET(&tempMessage) > 0) {
+			if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_SOURCE_CAPABILITIES
+					&& PD_NUMOBJ_GET(&tempMessage) > 0) {
 				/* First, determine what PD revision we're using */
 				if ((hdr_template & PD_HDR_SPECREV) == PD_SPECREV_1_0) {
 					/* If the other end is using at least version 3.0, we'll
@@ -202,6 +204,7 @@ PolicyEngine::policy_engine_state PolicyEngine::pe_sink_wait_cap() {
 			evt = 0;
 		}
 		return PESinkWaitCap; //wait for more messages?
+
 	}
 
 	/* If we failed to get a message, send a hard reset */
@@ -217,7 +220,8 @@ PolicyEngine::policy_engine_state PolicyEngine::pe_sink_eval_cap() {
 	_pps_index = 8;
 	/* Search for the first PPS APDO */
 	for (int8_t i = 0; i < PD_NUMOBJ_GET(&tempMessage); i++) {
-        if ((tempMessage.obj[i] & PD_PDO_TYPE) == PD_PDO_TYPE_AUGMENTED && (tempMessage.obj[i] & PD_APDO_TYPE) == PD_APDO_TYPE_PPS) {
+		if ((tempMessage.obj[i] & PD_PDO_TYPE) == PD_PDO_TYPE_AUGMENTED
+				&& (tempMessage.obj[i] & PD_APDO_TYPE) == PD_APDO_TYPE_PPS) {
 			_pps_index = i + 1;
 			break;
 		}
@@ -270,14 +274,18 @@ PolicyEngine::policy_engine_state PolicyEngine::pe_sink_select_cap() {
 	if (messageWaiting()) {
 		readMessage();
 		/* If the source accepted our request, wait for the new power */
-        if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_ACCEPT && PD_NUMOBJ_GET(&tempMessage) == 0) {
+		if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_ACCEPT
+				&& PD_NUMOBJ_GET(&tempMessage) == 0) {
 
 			return PESinkTransitionSink;
 			/* If the message was a Soft_Reset, do the soft reset procedure */
-        } else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_SOFT_RESET && PD_NUMOBJ_GET(&tempMessage) == 0) {
+		} else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_SOFT_RESET
+				&& PD_NUMOBJ_GET(&tempMessage) == 0) {
 			return PESinkSoftReset;
 			/* If the message was Wait or Reject */
-        } else if ((PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_REJECT || PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_WAIT) && PD_NUMOBJ_GET(&tempMessage) == 0) {
+		} else if ((PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_REJECT
+				|| PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_WAIT)
+				&& PD_NUMOBJ_GET(&tempMessage) == 0) {
 			/* If we don't have an explicit contract, wait for capabilities */
 			if (!_explicit_contract) {
 				return PESinkWaitCap;
@@ -309,7 +317,8 @@ PolicyEngine::policy_engine_state PolicyEngine::pe_sink_transition_sink() {
 	if (messageWaiting()) {
 		readMessage();
 		/* If we got a PS_RDY, handle it */
-        if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_PS_RDY && PD_NUMOBJ_GET(&tempMessage) == 0) {
+		if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_PS_RDY
+				&& PD_NUMOBJ_GET(&tempMessage) == 0) {
 			/* We just finished negotiating an explicit contract */
 			_explicit_contract = true;
 
@@ -353,65 +362,83 @@ PolicyEngine::policy_engine_state PolicyEngine::pe_sink_ready() {
 		if (messageWaiting()) {
 			readMessage();
 			/* Ignore vendor-defined messages */
-            if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_VENDOR_DEFINED && PD_NUMOBJ_GET(&tempMessage) > 0) {
+			if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_VENDOR_DEFINED
+					&& PD_NUMOBJ_GET(&tempMessage) > 0) {
 
 				return PESinkReady;
 				/* Ignore Ping messages */
-            } else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_PING && PD_NUMOBJ_GET(&tempMessage) == 0) {
+			} else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_PING
+					&& PD_NUMOBJ_GET(&tempMessage) == 0) {
 
 				return PESinkReady;
 				/* DR_Swap messages are not supported */
-            } else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_DR_SWAP && PD_NUMOBJ_GET(&tempMessage) == 0) {
+			} else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_DR_SWAP
+					&& PD_NUMOBJ_GET(&tempMessage) == 0) {
 
 				return PESinkSendNotSupported;
 				/* Get_Source_Cap messages are not supported */
-            } else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_GET_SOURCE_CAP && PD_NUMOBJ_GET(&tempMessage) == 0) {
+			} else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_GET_SOURCE_CAP
+					&& PD_NUMOBJ_GET(&tempMessage) == 0) {
 
 				return PESinkSendNotSupported;
 				/* PR_Swap messages are not supported */
-            } else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_PR_SWAP && PD_NUMOBJ_GET(&tempMessage) == 0) {
+			} else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_PR_SWAP
+					&& PD_NUMOBJ_GET(&tempMessage) == 0) {
 
 				return PESinkSendNotSupported;
 				/* VCONN_Swap messages are not supported */
-            } else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_VCONN_SWAP && PD_NUMOBJ_GET(&tempMessage) == 0) {
+			} else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_VCONN_SWAP
+					&& PD_NUMOBJ_GET(&tempMessage) == 0) {
 
 				return PESinkSendNotSupported;
 				/* Request messages are not supported */
-            } else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_REQUEST && PD_NUMOBJ_GET(&tempMessage) > 0) {
+			} else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_REQUEST
+					&& PD_NUMOBJ_GET(&tempMessage) > 0) {
 
 				return PESinkSendNotSupported;
 				/* Sink_Capabilities messages are not supported */
-            } else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_SINK_CAPABILITIES && PD_NUMOBJ_GET(&tempMessage) > 0) {
+			} else if (PD_MSGTYPE_GET(&tempMessage)
+					== PD_MSGTYPE_SINK_CAPABILITIES
+					&& PD_NUMOBJ_GET(&tempMessage) > 0) {
 
 				return PESinkSendNotSupported;
 				/* Handle GotoMin messages */
-            } else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_GOTOMIN && PD_NUMOBJ_GET(&tempMessage) == 0) {
+			} else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_GOTOMIN
+					&& PD_NUMOBJ_GET(&tempMessage) == 0) {
 				/* GiveBack is not supported */
 				return PESinkSendNotSupported;
 
 				/* Evaluate new Source_Capabilities */
-            } else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_SOURCE_CAPABILITIES && PD_NUMOBJ_GET(&tempMessage) > 0) {
+			} else if (PD_MSGTYPE_GET(&tempMessage)
+					== PD_MSGTYPE_SOURCE_CAPABILITIES
+					&& PD_NUMOBJ_GET(&tempMessage) > 0) {
 				/* Don't free the message: we need to keep the
 				 * Source_Capabilities message so we can evaluate it. */
 				return PESinkEvalCap;
 				/* Give sink capabilities when asked */
-            } else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_GET_SINK_CAP && PD_NUMOBJ_GET(&tempMessage) == 0) {
+			} else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_GET_SINK_CAP
+					&& PD_NUMOBJ_GET(&tempMessage) == 0) {
 
 				return PESinkGiveSinkCap;
 				/* If the message was a Soft_Reset, do the soft reset procedure */
-            } else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_SOFT_RESET && PD_NUMOBJ_GET(&tempMessage) == 0) {
+			} else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_SOFT_RESET
+					&& PD_NUMOBJ_GET(&tempMessage) == 0) {
 
 				return PESinkSoftReset;
 				/* PD 3.0 messges */
 			} else if ((hdr_template & PD_HDR_SPECREV) == PD_SPECREV_3_0) {
 				/* If the message is a multi-chunk extended message, let it
 				 * time out. */
-                if ((tempMessage.hdr & PD_HDR_EXT) && (PD_DATA_SIZE_GET(&tempMessage) > PD_MAX_EXT_MSG_LEGACY_LEN)) {
+				if ((tempMessage.hdr & PD_HDR_EXT)
+						&& (PD_DATA_SIZE_GET(&tempMessage)
+								> PD_MAX_EXT_MSG_LEGACY_LEN)) {
 
 					return PESinkChunkReceived;
 					/* Tell the DPM a message we sent got a response of
 					 * Not_Supported. */
-                } else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_NOT_SUPPORTED && PD_NUMOBJ_GET(&tempMessage) == 0) {
+				} else if (PD_MSGTYPE_GET(&tempMessage)
+						== PD_MSGTYPE_NOT_SUPPORTED
+						&& PD_NUMOBJ_GET(&tempMessage) == 0) {
 
 					return PESinkNotSupportedReceived;
 					/* If we got an unknown message, send a soft reset */
@@ -434,7 +461,8 @@ PolicyEngine::policy_engine_state PolicyEngine::pe_sink_get_source_cap() {
 	/* Get a message object */
 	union pd_msg *get_source_cap = &tempMessage;
 	/* Make a Get_Source_Cap message */
-    get_source_cap->hdr = hdr_template | PD_MSGTYPE_GET_SOURCE_CAP | PD_NUMOBJ(0);
+	get_source_cap->hdr = hdr_template | PD_MSGTYPE_GET_SOURCE_CAP
+			| PD_NUMOBJ(0);
 	/* Transmit the Get_Source_Cap */
 	ProtocolTransmit::pushMessage(get_source_cap);
 	ProtocolTransmit::notify(
@@ -575,11 +603,13 @@ PolicyEngine::policy_engine_state PolicyEngine::pe_sink_send_soft_reset() {
 	if (messageWaiting()) {
 		readMessage();
 		/* If the source accepted our soft reset, wait for capabilities. */
-        if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_ACCEPT && PD_NUMOBJ_GET(&tempMessage) == 0) {
+		if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_ACCEPT
+				&& PD_NUMOBJ_GET(&tempMessage) == 0) {
 
 			return PESinkWaitCap;
 			/* If the message was a Soft_Reset, do the soft reset procedure */
-        } else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_SOFT_RESET && PD_NUMOBJ_GET(&tempMessage) == 0) {
+		} else if (PD_MSGTYPE_GET(&tempMessage) == PD_MSGTYPE_SOFT_RESET
+				&& PD_NUMOBJ_GET(&tempMessage) == 0) {
 
 			return PESinkSoftReset;
 			/* Otherwise, send a hard reset */
@@ -600,7 +630,8 @@ PolicyEngine::policy_engine_state PolicyEngine::pe_sink_send_not_supported() {
 		not_supported->hdr = hdr_template | PD_MSGTYPE_REJECT | PD_NUMOBJ(0);
 	} else if ((hdr_template & PD_HDR_SPECREV) == PD_SPECREV_3_0) {
 		/* Make a Not_Supported message */
-        not_supported->hdr = hdr_template | PD_MSGTYPE_NOT_SUPPORTED | PD_NUMOBJ(0);
+		not_supported->hdr = hdr_template | PD_MSGTYPE_NOT_SUPPORTED
+				| PD_NUMOBJ(0);
 	}
 
 	/* Transmit the message */
@@ -652,8 +683,10 @@ PolicyEngine::policy_engine_state PolicyEngine::pe_sink_source_unresponsive() {
 uint32_t PolicyEngine::waitForEvent(uint32_t mask, TickType_t ticksToWait) {
 	return xEventGroupWaitBits(xEventGroupHandle, mask, mask, pdFALSE,
 			ticksToWait);
+
 }
 
 bool PolicyEngine::isPD3_0() {
 	return (hdr_template & PD_HDR_SPECREV) == PD_SPECREV_3_0;
 }
+

workspace/TS100/Core/Drivers/FUSB302/policy_engine.h

@@ -56,7 +56,6 @@ class PolicyEngine {
 	static bool pdHasNegotiated() {
 		return pdNegotiationComplete;
 	}
-
 private:
 	static bool pdNegotiationComplete;
 	static int current_voltage_mv; //The current voltage PD is expecting

workspace/TS100/Core/Drivers/FUSB302/protocol_rx.cpp

@@ -17,12 +17,12 @@
 
 #include "protocol_rx.h"
 
-#include "fusb302b.h"
-#include "policy_engine.h"
-#include "protocol_tx.h"
+#include <stdlib.h>
 #include "string.h"
 #include <pd.h>
-#include <stdlib.h>
+#include "policy_engine.h"
+#include "protocol_tx.h"
+#include "fusb302b.h"
 osThreadId ProtocolReceive::TaskHandle = NULL;
 EventGroupHandle_t ProtocolReceive::xEventGroupHandle = NULL;
 StaticEventGroup_t ProtocolReceive::xCreatedEventGroup;
@@ -54,7 +54,8 @@ ProtocolReceive::protocol_rx_state ProtocolReceive::protocol_rx_wait_phy() {
 		/* Read the message */
 		fusb_read_message(_rx_message);
 		/* If it's a Soft_Reset, go to the soft reset state */
-        if (PD_MSGTYPE_GET(_rx_message) == PD_MSGTYPE_SOFT_RESET && PD_NUMOBJ_GET(_rx_message) == 0) {
+		if (PD_MSGTYPE_GET(_rx_message) == PD_MSGTYPE_SOFT_RESET
+				&& PD_NUMOBJ_GET(_rx_message) == 0) {
 			return PRLRxReset;
 		} else {
 			/* Otherwise, check the message ID */

workspace/TS100/Core/Drivers/FUSB302/protocol_rx.h

@@ -31,7 +31,6 @@ class ProtocolReceive {
 public:
 	static void init();
 	static void notify(uint32_t notification);
-
 private:
 	static void thread(const void *args);
 
@@ -48,10 +47,7 @@ class ProtocolReceive {
 	 * All transitions that would go to that state instead go to Check_MessageID.
 	 */
 	enum protocol_rx_state {
-        PRLRxWaitPHY,
-        PRLRxReset,
-        PRLRxCheckMessageID,
-        PRLRxStoreMessageID
+		PRLRxWaitPHY, PRLRxReset, PRLRxCheckMessageID, PRLRxStoreMessageID
 	};
 	static protocol_rx_state protocol_rx_store_messageid();
 	static protocol_rx_state protocol_rx_check_messageid();
@@ -62,6 +58,7 @@ class ProtocolReceive {
 	static uint8_t _tx_messageidcounter;
 	static uint32_t waitForEvent(uint32_t mask, TickType_t ticksToWait =
 	portMAX_DELAY);
+
 };
 
 #endif /* PDB_PROTOCOL_RX_H */

workspace/TS100/Core/Drivers/FUSB302/protocol_tx.cpp

@@ -16,18 +16,19 @@
  */
 
 #include "protocol_tx.h"
-#include "fusb302b.h"
-#include "fusbpd.h"
+#include <pd.h>
 #include "policy_engine.h"
 #include "protocol_rx.h"
-#include <pd.h>
+#include "fusb302b.h"
+#include "fusbpd.h"
 
 osThreadId ProtocolTransmit::TaskHandle = NULL;
 uint32_t ProtocolTransmit::TaskBuffer[ProtocolTransmit::TaskStackSize];
 osStaticThreadDef_t ProtocolTransmit::TaskControlBlock;
 StaticQueue_t ProtocolTransmit::xStaticQueue;
 bool ProtocolTransmit::messageSending = false;
-uint8_t ProtocolTransmit::ucQueueStorageArea[PDB_MSG_POOL_SIZE * sizeof(union pd_msg)];
+uint8_t ProtocolTransmit::ucQueueStorageArea[PDB_MSG_POOL_SIZE
+		* sizeof(union pd_msg)];
 QueueHandle_t ProtocolTransmit::messagesWaiting = NULL;
 uint8_t ProtocolTransmit::_tx_messageidcounter;
 union pd_msg ProtocolTransmit::temp_msg;
@@ -61,7 +62,9 @@ ProtocolTransmit::protocol_tx_state ProtocolTransmit::protocol_tx_phy_reset() {
 ProtocolTransmit::protocol_tx_state ProtocolTransmit::protocol_tx_wait_message() {
 	/* Wait for an event */
 	ProtocolTransmit::Notifications evt = waitForEvent(
-        (uint32_t)Notifications::PDB_EVT_PRLTX_RESET | (uint32_t)Notifications::PDB_EVT_PRLTX_DISCARD | (uint32_t)Notifications::PDB_EVT_PRLTX_MSG_TX);
+			(uint32_t) Notifications::PDB_EVT_PRLTX_RESET
+					| (uint32_t) Notifications::PDB_EVT_PRLTX_DISCARD
+					| (uint32_t) Notifications::PDB_EVT_PRLTX_MSG_TX);
 
 	if ((uint32_t) evt & (uint32_t) Notifications::PDB_EVT_PRLTX_RESET) {
 		return PRLTxPHYReset;
@@ -73,7 +76,8 @@ ProtocolTransmit::protocol_tx_state ProtocolTransmit::protocol_tx_wait_message()
 		getMessage();
 
 		/* If it's a Soft_Reset, reset the TX layer first */
-        if (PD_MSGTYPE_GET(&temp_msg) == PD_MSGTYPE_SOFT_RESET && PD_NUMOBJ_GET(&(temp_msg)) == 0) {
+		if (PD_MSGTYPE_GET(&temp_msg) == PD_MSGTYPE_SOFT_RESET
+				&& PD_NUMOBJ_GET(&(temp_msg)) == 0) {
 			return PRLTxReset;
 			/* Otherwise, just send the message */
 		} else {
@@ -130,7 +134,10 @@ ProtocolTransmit::protocol_tx_state ProtocolTransmit::protocol_tx_wait_response(
 	/* Wait for an event.  There is no need to run CRCReceiveTimer, since the
 	 * FUSB302B handles that as part of its retry mechanism. */
 	ProtocolTransmit::Notifications evt = waitForEvent(
-        (uint32_t)Notifications::PDB_EVT_PRLTX_RESET | (uint32_t)Notifications::PDB_EVT_PRLTX_DISCARD | (uint32_t)Notifications::PDB_EVT_PRLTX_I_TXSENT | (uint32_t)Notifications::PDB_EVT_PRLTX_I_RETRYFAIL);
+			(uint32_t) Notifications::PDB_EVT_PRLTX_RESET
+					| (uint32_t) Notifications::PDB_EVT_PRLTX_DISCARD
+					| (uint32_t) Notifications::PDB_EVT_PRLTX_I_TXSENT
+					| (uint32_t) Notifications::PDB_EVT_PRLTX_I_RETRYFAIL);
 
 	if ((uint32_t) evt & (uint32_t) Notifications::PDB_EVT_PRLTX_RESET) {
 		return PRLTxPHYReset;
@@ -162,7 +169,9 @@ ProtocolTransmit::protocol_tx_state ProtocolTransmit::protocol_tx_match_messagei
 	fusb_read_message(&goodcrc);
 
 	/* Check that the message is correct */
-    if (PD_MSGTYPE_GET(&goodcrc) == PD_MSGTYPE_GOODCRC && PD_NUMOBJ_GET(&goodcrc) == 0 && PD_MESSAGEID_GET(&goodcrc) == _tx_messageidcounter) {
+	if (PD_MSGTYPE_GET(&goodcrc) == PD_MSGTYPE_GOODCRC
+			&& PD_NUMOBJ_GET(&goodcrc) == 0
+			&& PD_MESSAGEID_GET(&goodcrc) == _tx_messageidcounter) {
 		return PRLTxMessageSent;
 	} else {
 		return PRLTxTransmissionError;

workspace/TS100/Core/Drivers/FUSB302/protocol_tx.h

@@ -18,10 +18,10 @@
 #ifndef PDB_PROTOCOL_TX_H
 #define PDB_PROTOCOL_TX_H
 
+#include <stdint.h>
 #include "policy_engine.h"
 #include "protocol_rx.h"
 #include <pd.h>
-#include <stdint.h>
 
 /* Events for the Protocol TX thread */
 
@@ -41,7 +41,6 @@ class ProtocolTransmit {
 		PDB_EVT_PRLTX_START_AMS = EVENT_MASK(5), //
 	};
 	static void notify(Notifications notification);
-
 private:
 	static void thread(const void *args);
 	static EventGroupHandle_t xEventGroupHandle;
@@ -92,6 +91,7 @@ class ProtocolTransmit {
 	static union pd_msg temp_msg;
 	static Notifications waitForEvent(uint32_t mask, TickType_t ticksToWait =
 	portMAX_DELAY);
+
 };
 
 #endif /* PDB_PROTOCOL_TX_H */

workspace/TS100/Core/Drivers/OLED.cpp

@@ -97,10 +97,12 @@ void OLED::initialize() {
 	// initialisation data to the OLED.
 
 	setDisplayState(DisplayState::ON);
-	FRToSI2C::writeRegistersBulk(DEVICEADDR_OLED, OLED_Setup_Array, sizeof(OLED_Setup_Array) / sizeof(OLED_Setup_Array[0]));
-
+	for (int tries = 0; tries < 10; tries++) {
+		if (FRToSI2C::writeRegistersBulk(DEVICEADDR_OLED, OLED_Setup_Array, sizeof(OLED_Setup_Array) / sizeof(OLED_Setup_Array[0]))) {
+			return;
+		}
+	}
 }
-
 void OLED::setFramebuffer(uint8_t *buffer) {
 	if (buffer == NULL) {
 		firstStripPtr = &screenBuffer[FRAMEBUFFER_START];