Bump V3.0.22 (#110)
* change simulator svg * change radio image * Remove google fonts cdn * change color of 'advanced' button * font fix * font fix 2 * display fix * change fullsceen simulator bg * Continuous servo * handle continuous state * adding shims * update rendering for continuous servos * fixing sim * fix sig * typo * fix sim * bump pxt * bump pxt * rerun travis * Input blocks revision - add Button and Pin event types - merge onPinPressed & onPinReleased in new onPinEvent function - create new onButtonEvent function * update input blocks in docs and tests * remove device_pin_release block * Hide DAL.x behind Enum * bring back deprecated blocks, but hide them * shims and locales files * fix input.input. typing * remove buildpr * bump V3 * update simulator aspect ratio * add Loudness Block * revoke loudness block * Adds soundLevel To be replaced by pxt-common-packages when DAL is updated. * Remove P0 & P3 from AnalogPin Co-authored-by: Juri <gitkraken@juriwolf.de>
This commit is contained in:
		
							
								
								
									
										1
									
								
								external/sha/buildflash.sh
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								external/sha/buildflash.sh
									
									
									
									
										vendored
									
									
								
							@@ -1,4 +1,5 @@
 | 
			
		||||
#!/bin/sh
 | 
			
		||||
set -e
 | 
			
		||||
yotta build
 | 
			
		||||
arm-none-eabi-objdump -d `find -name main.c.o` > disasm
 | 
			
		||||
node genapplet.js disasm Reset_Handler
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								external/sha/module.json
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								external/sha/module.json
									
									
									
									
										vendored
									
									
								
							@@ -4,6 +4,8 @@
 | 
			
		||||
  "keywords": [],
 | 
			
		||||
  "author": "",
 | 
			
		||||
  "license": "MIT",
 | 
			
		||||
  "dependencies": {},
 | 
			
		||||
  "dependencies": {
 | 
			
		||||
    "microbit-dal": "Amerlander/microbit-dal#v2.1.1"
 | 
			
		||||
  },
 | 
			
		||||
  "bin": "./source"
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										14
									
								
								external/sha/source/main.c
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										14
									
								
								external/sha/source/main.c
									
									
									
									
										vendored
									
									
								
							@@ -143,6 +143,7 @@ INLINE void murmur3_core_2(const uint8_t *data, uint32_t len, uint32_t *dst) {
 | 
			
		||||
  dst[1] = h1;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#if 0
 | 
			
		||||
int Reset_Handler(uint32_t *dst, uint8_t *ptr, uint32_t pageSize,
 | 
			
		||||
                  uint32_t numPages) {
 | 
			
		||||
  uint32_t crcTable[256];
 | 
			
		||||
@@ -165,19 +166,23 @@ int Reset_Handler(uint32_t *dst, uint8_t *ptr, uint32_t pageSize,
 | 
			
		||||
#endif
 | 
			
		||||
  return 0;
 | 
			
		||||
}
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if 1
 | 
			
		||||
#include "nrf.h"
 | 
			
		||||
 | 
			
		||||
#if 0
 | 
			
		||||
#define PAGE_SIZE 0x400
 | 
			
		||||
#define SIZE_IN_WORDS (PAGE_SIZE / 4)
 | 
			
		||||
 | 
			
		||||
#define setConfig(v)                                                           \
 | 
			
		||||
  do {                                                                         \
 | 
			
		||||
    NRF_NVMC->CONFIG = v;                                                      \
 | 
			
		||||
    __ISB(); __DSB();                                                          \
 | 
			
		||||
    while (NRF_NVMC->READY == NVMC_READY_READY_Busy)                           \
 | 
			
		||||
      ;                                                                        \
 | 
			
		||||
  } while (0)
 | 
			
		||||
 | 
			
		||||
void overwriteFlashPage(uint32_t *to, uint32_t *from) {
 | 
			
		||||
void Reset_Handler(uint32_t *to, uint32_t *from, uint32_t numWords) {
 | 
			
		||||
#if 0
 | 
			
		||||
  int same = 1;
 | 
			
		||||
  for (int i = 0; i <= (SIZE_IN_WORDS - 1); i++) {
 | 
			
		||||
    if (to[i] != from[i]) {
 | 
			
		||||
@@ -187,6 +192,7 @@ void overwriteFlashPage(uint32_t *to, uint32_t *from) {
 | 
			
		||||
  }
 | 
			
		||||
  if (same)
 | 
			
		||||
    return;
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
  // Turn on flash erase enable and wait until the NVMC is ready:
 | 
			
		||||
  setConfig(NVMC_CONFIG_WEN_Een << NVMC_CONFIG_WEN_Pos);
 | 
			
		||||
@@ -202,7 +208,7 @@ void overwriteFlashPage(uint32_t *to, uint32_t *from) {
 | 
			
		||||
  // Turn on flash write enable and wait until the NVMC is ready:
 | 
			
		||||
  setConfig(NVMC_CONFIG_WEN_Wen << NVMC_CONFIG_WEN_Pos);
 | 
			
		||||
 | 
			
		||||
  for (int i = 0; i <= (SIZE_IN_WORDS - 1); i++) {
 | 
			
		||||
  for (uint32_t i = 0; i < numWords; i++) {
 | 
			
		||||
    *(to + i) = *(from + i);
 | 
			
		||||
    while (NRF_NVMC->READY == NVMC_READY_READY_Busy)
 | 
			
		||||
      ;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user