2756 Commits

Author SHA1 Message Date
LaplaceG
c082d6cf8d Added pinout for EFM32 2016-01-26 10:32:37 +01:00
LaplaceG
8108f93ffb Time and flash now working for EFM32 2016-01-21 12:27:57 +01:00
LaplaceG
045b18f9da gitignore emacs temporary files 2016-01-21 12:27:14 +01:00
LaplaceG
5fca3ebda9 Merge remote-tracking branch 'refs/remotes/espruino/master' into efm32integration 2016-01-21 12:07:00 +01:00
Gordon Williams
a3d44d2726 Merge pull request #789 from simplicitylabs/efm32integration
Efm32integration
2016-01-18 13:07:20 +00:00
LaplaceG
9ed532b588 Temporary hack using the device number to remove the #USB in jsinteractive.c 2016-01-18 13:50:48 +01:00
LaplaceG
6eecd0ed2b Merged master into efm32integration 2016-01-18 13:24:55 +01:00
LaplaceG
e6620dea4a Added DEBUG=1 disclaimer for EFM32GG 2016-01-18 13:19:11 +01:00
LaplaceG
4462d23867 Clean-up after merge 2016-01-18 13:10:22 +01:00
LaplaceG
519ce015ab Merge remote-tracking branch 'refs/remotes/espruino/master' into efm32integration 2016-01-18 13:07:00 +01:00
LaplaceG
1ff818797e Now running prompt. Need to revert changes to avoid using USB in jsinteractive.c 2016-01-18 13:04:34 +01:00
Gordon Williams
f184b044ec Fix regression caused by merge error 2016-01-18 09:18:14 +00:00
Gordon Williams
70b353b615 Merge pull request #787 from tve/master
Merge gobs of esp8266 fixes/improvements back to mainline
2016-01-18 09:16:39 +00:00
Thorsten von Eicken
74fc4d7289 fix esp8266 neopixel timing 2016-01-17 18:22:50 -08:00
Thorsten von Eicken
02ee106f97 tweaks after esp8266 improvements 2016-01-17 17:47:51 -08:00
Thorsten von Eicken
528630211c merge upstream in to esp8266 fork 2016-01-17 17:26:21 -08:00
Thorsten von Eicken
242e5905de failed attempt to add use_graphics to esp8266 2016-01-17 17:06:56 -08:00
Gordon Williams
34326d03b9 Allow different types of network to have different buffer sizes - enlarge JS, Linux and WIZnet buffers 2016-01-15 18:37:54 +00:00
Gordon Williams
6a27f69adc oops 2016-01-15 18:01:13 +00:00
Gordon Williams
22d4a11d1f Limit the number of events processed each time around the idle loop to the number that were in it at the start
- helps to fix issues with out of memory when receiving big files over ESP8266 serial connection
2016-01-15 17:11:16 +00:00
Gordon Williams
251bb7c921 Improve tab complete's memopry usage
Added Tab complete and Debug to low-end Nordic uCs
2016-01-15 15:56:05 +00:00
Gordon Williams
89e6caf106 Fix regression where DACs didn't work on Original Espruino Board 2016-01-15 14:31:54 +00:00
Gordon Williams
f243273c0f Merge pull request #786 from mjdietzx/master
remove stub returns for adc stuff.
2016-01-15 12:00:49 +00:00
Gordon Williams
ef81a5b51f revert commented out code 2016-01-15 12:00:30 +00:00
Michael Dietz
ac63a0409e remove stub returns for adc stuff. 2016-01-15 12:50:20 +01:00
Gordon Williams
78c19d9b94 Merge branch 'mjdietzx-nrf5x_shared_sdk' 2016-01-15 11:36:53 +00:00
Gordon Williams
fba6cd654e re-enabled ADC - works now 2016-01-15 11:36:43 +00:00
Gordon Williams
660d3bf437 Merge branch 'nrf5x_shared_sdk' of https://github.com/mjdietzx/Espruino into mjdietzx-nrf5x_shared_sdk 2016-01-15 11:26:48 +00:00
Gordon Williams
c982bdeed6 add intelhex - needed for hexmerge (and hopefully travis builds) 2016-01-15 11:21:44 +00:00
Michael Dietz
a2a8ee3392 Timers don't need to be commented out in jshardware.c 2016-01-15 08:23:58 +01:00
Michael Dietz
cabceeee99 fix merge conflicts 2016-01-15 08:15:31 +01:00
Michael Dietz
02e11635b5 Remove heap from nRF51 so microbit has enough RAM to compile 2016-01-15 08:12:39 +01:00
Gordon Williams
9bf918190c now include hexmerge.py - should make Travis build possible 2016-01-14 16:13:47 +00:00
Gordon Williams
4d2523b564 Pinout notes 2016-01-14 16:06:08 +00:00
Gordon Williams
b5d23d8abb microbit image 2016-01-14 15:56:55 +00:00
Gordon Williams
6da366fdd7 microbit compass 2016-01-14 15:29:42 +00:00
Gordon Williams
62bb72b921 fix warnings about repeated init 2016-01-14 15:29:28 +00:00
Michael Dietz
551745e755 add softdevices that were getting blocked by .gitignore 2016-01-14 16:16:24 +01:00
Michael Dietz
41bd399970 Fix coding syle for jswrap functions in jswrap_bluetooth.c 2016-01-14 16:08:15 +01:00
Michael Dietz
61d2826dc7 fix twi mistake i made with twi_rx in i2c_write 2016-01-14 15:59:13 +01:00
Gordon Williams
d6a977faee Fix broken storage of floating point values when <255 variables 2016-01-14 14:54:09 +00:00
Michael Dietz
2be1bacb4b ADC compiling for both nRF51 & nRF52 2016-01-14 15:51:21 +01:00
Michael Dietz
a01ca6ec4e TWI now compiling for both nRF51 and nRF52 2016-01-14 15:46:44 +01:00
Gordon Williams
53593090d2 trying to squash some warnings, fix I2C tx 2016-01-14 13:43:00 +00:00
Michael Dietz
c3d2ce3833 merged changes from upstream espruino 2016-01-14 13:36:10 +01:00
Michael Dietz
ac88073f63 prevent merge conflict 2016-01-14 13:28:56 +01:00
Gordon Williams
f78194fe6b restart advertising after disconnection 2016-01-14 11:56:52 +00:00
Michael Dietz
43eb0cbdba remove source files not used 2016-01-14 11:23:50 +01:00
Michael Dietz
a8ee27f51d minor cleanup 2016-01-14 10:46:46 +01:00
Michael Dietz
38f756cdb9 touched up ble lib for nRF51 and nrf52. seems to be working for both 2016-01-14 10:16:16 +01:00