initial proof of concept PWM

Author: gfwilliams

Makefile

@@ -67,7 +67,7 @@
 #					      # GENDIR=/home/mydir/mygendir
 # SETDEFINES=FileDefines  # settings which are called after definitions for board are done
 #                         # SETDEFINES=/home/mydir/myDefines
-# UNSUPPORTEDMAKE=FileUnsu# Adds additional files from unsupported sources(means not supported by Gordon) to actual make 
+# UNSUPPORTEDMAKE=FileUnsu# Adds additional files from unsupported sources(means not supported by Gordon) to actual make
 #                         # UNSUPPORTEDMAKE=/home/mydir/unsupportedCommands
 # PROJECTNAME=myBigProject# Sets projectname
 # BLACKLIST=fileBlacklist # Removes javascript commands given in a file from compilation and therefore from project defined firmware
@@ -673,7 +673,7 @@ USE_HASHLIB=1
 USE_GRAPHICS=1
 USE_CRYPTO=1
 USE_TLS=1
-USE_TELNET=1 
+USE_TELNET=1
 #USE_LCD_SDL=1
 
 ifdef MACOSX
@@ -688,7 +688,7 @@ endif
 endif
 endif
 
-#set or reset defines like USE_GRAPHIC from an external file to customize firmware 
+#set or reset defines like USE_GRAPHIC from an external file to customize firmware
 ifdef SETDEFINES
 include $(SETDEFINES)
 endif
@@ -878,11 +878,11 @@ INCLUDE += -I$(ROOT)/libs/math
 WRAPPERSOURCES += libs/math/jswrap_math.c
 ifeq ($(FAMILY),ESP8266)
 # special ESP8266 maths lib that doesn't go into RAM
-LIBS += -lmirom 
+LIBS += -lmirom
 LDFLAGS += -L$(ROOT)/targets/esp8266
 else
 # everything else uses normal maths lib
-LIBS += -lm 
+LIBS += -lm
 endif
 endif
 
@@ -1091,7 +1091,7 @@ libs/crypto/mbedtls/library/cipher_wrap.c \
 libs/crypto/mbedtls/library/md.c \
 libs/crypto/mbedtls/library/md_wrap.c \
 libs/crypto/mbedtls/library/oid.c \
-libs/crypto/mbedtls/library/pkcs5.c 
+libs/crypto/mbedtls/library/pkcs5.c
 endif
 endif
 
@@ -1290,7 +1290,7 @@ ifeq ($(FAMILY), NRF51)
 
   NRF5X=1
   NRF5X_SDK_PATH=$(ROOT)/targetlibs/nrf5x/nrf5_sdk
-  
+
   # ARCHFLAGS are shared by both CFLAGS and LDFLAGS.
   ARCHFLAGS = -mcpu=cortex-m0 -mthumb -mabi=aapcs -mfloat-abi=soft # Use nRF51 makefiles provided in SDK as reference.
 
@@ -1312,7 +1312,7 @@ ifeq ($(FAMILY), NRF51)
   NRF_BOOTLOADER    = $(ROOT)/targetlibs/nrf5x/nrf5_singlebank_bl_hex/nrf51_s130_singlebank_bl.hex
   NFR_BL_START_ADDR = 0x3C000
   NRF_BOOTLOADER_SETTINGS = $(ROOT)/targetlibs/nrf5x/nrf5_singlebank_bl_hex/bootloader_settings_nrf51.hex # This file writes 0x3FC00 with 0x01 so we can flash the application with the bootloader.
-  
+
   endif
 
 endif # FAMILY == NRF51
@@ -1324,7 +1324,7 @@ ifeq ($(FAMILY), NRF52)
 
   # ARCHFLAGS are shared by both CFLAGS and LDFLAGS.
   ARCHFLAGS = -mcpu=cortex-m4 -mthumb -mabi=aapcs -mfloat-abi=hard -mfpu=fpv4-sp-d16
- 
+
   # nRF52 specific.
   INCLUDE          += -I$(NRF5X_SDK_PATH)/../nrf52_config
   INCLUDE          += -I$(NRF5X_SDK_PATH)/components/softdevice/s132/headers
@@ -1444,12 +1444,12 @@ ifdef NRF5X
 
   # Just try and get rid of the compile warnings.
   CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-parameter -fomit-frame-pointer #this is for device manager in nordic sdk
-  DEFINES += -DBLUETOOTH -D$(BOARD) 
+  DEFINES += -DBLUETOOTH -D$(BOARD)
 
   ARM = 1
   ARM_HAS_OWN_CMSIS = 1 # Nordic uses its own CMSIS files in its SDK, these are up-to-date.
   INCLUDE += -I$(ROOT)/targetlibs/nrf5x -I$(NRF5X_SDK_PATH)
-  
+
   TEMPLATE_PATH = $(ROOT)/targetlibs/nrf5x/nrf5x_linkers # This is where the common linker for both nRF51 & nRF52 is stored.
   LDFLAGS += -L$(TEMPLATE_PATH)
 
@@ -1486,6 +1486,7 @@ ifdef NRF5X
   INCLUDE += -I$(NRF5X_SDK_PATH)/components/libraries/trace
   INCLUDE += -I$(NRF5X_SDK_PATH)/components/softdevice/common/softdevice_handler
   INCLUDE += -I$(NRF5X_SDK_PATH)/components/drivers_nrf/twi_master
+	INCLUDE += -I$(NRF5X_SDK_PATH)/components/drivers_nrf/hal/nrf_pwm
 
   TARGETSOURCES += \
   $(NRF5X_SDK_PATH)/components/libraries/util/app_error.c \
@@ -1507,7 +1508,7 @@ ifdef NRF5X
   $(NRF5X_SDK_PATH)/components/softdevice/common/softdevice_handler/softdevice_handler.c \
   $(NRF5X_SDK_PATH)/components/drivers_nrf/hal/nrf_nvmc.c \
   $(NRF5X_SDK_PATH)/components/drivers_nrf/twi_master/nrf_drv_twi.c \
-  $(NRF5X_SDK_PATH)/components/drivers_nrf/hal/nrf_adc.c 
+  $(NRF5X_SDK_PATH)/components/drivers_nrf/hal/nrf_adc.c
   # $(NRF5X_SDK_PATH)/components/libraries/util/nrf_log.c
 
   ifdef USE_BOOTLOADER
@@ -1669,7 +1670,7 @@ else ifdef EFM32
  LDFLAGS += $(OPTIMIZEFLAGS) $(ARCHFLAGS)
  LDFLAGS += -Wl,--start-group -lgcc -lc -lnosys -Wl,--end-group
 else
- LDFLAGS += $(OPTIMIZEFLAGS) $(ARCHFLAGS) 
+ LDFLAGS += $(OPTIMIZEFLAGS) $(ARCHFLAGS)
 endif
 
 ifdef EMBEDDED
@@ -1721,7 +1722,7 @@ ESPTOOL    ?= $(ESP8266_SDK_ROOT)/esptool/esptool.py
 INCLUDE += -I$(ESP8266_SDK_ROOT)/include -I$(ROOT)/targets/esp8266
 endif # ESP8266
 
-# Adds additional files from unsupported sources(means not supported by Gordon) to actual make 
+# Adds additional files from unsupported sources(means not supported by Gordon) to actual make
 ifdef UNSUPPORTEDMAKE
 include $(UNSUPPORTEDMAKE)
 endif
@@ -1760,7 +1761,7 @@ ifdef USE_NET
         # hack to ensure that Pico/etc have all possible firmware configs listed
 	$(Q)python scripts/build_board_json.py $(WRAPPERSOURCES) $(DEFINES) -DUSE_WIZNET=1 -DUSE_CC3000=1 -B$(BOARD)
 else
-	$(Q)python scripts/build_board_json.py $(WRAPPERSOURCES) $(DEFINES) -B$(BOARD) 
+	$(Q)python scripts/build_board_json.py $(WRAPPERSOURCES) $(DEFINES) -B$(BOARD)
 endif
 
 
@@ -1789,7 +1790,7 @@ $(PLATFORM_CONFIG_FILE): boards/$(BOARD).py scripts/build_platform_config.py
 	$(Q)python scripts/build_platform_config.py $(BOARD) $(HEADERFILENAME)
 
 # skips compiling and linking, if NO_COMPILE is defined
-# Generation of temporary files and setting of wrappersources is already done this moment	
+# Generation of temporary files and setting of wrappersources is already done this moment
 ifndef NO_COMPILE
 
 compile=$(CC) $(CFLAGS) $< -o $@
@@ -1867,7 +1868,7 @@ ifdef USE_CRYPTO
 	$(Q)$(OBJCOPY) --rename-section .rodata=.irom0.text libs/crypto/mbedtls/library/sha1.o
 	$(Q)$(OBJCOPY) --rename-section .rodata=.irom0.text libs/crypto/mbedtls/library/sha256.o
 	$(Q)$(OBJCOPY) --rename-section .rodata=.irom0.text libs/crypto/mbedtls/library/sha512.o
-endif	
+endif
 	$(Q)$(LD) $(OPTIMIZEFLAGS) -nostdlib -Wl,--no-check-sections -Wl,-static -r -o $@ $(OBJS)
 	$(Q)$(OBJCOPY) --rename-section .text=.irom0.text --rename-section .literal=.irom0.literal $@
 

targets/nrf5x/jshardware.c

@@ -40,6 +40,7 @@
 
 #ifdef NRF52
 #include "nrf_saadc.h"
+#include "nrf_pwm.h"
 #else
 #include "nrf_adc.h"
 #endif
@@ -426,14 +427,45 @@ int jshPinAnalogFast(Pin pin) {
 JshPinFunction jshPinAnalogOutput(Pin pin, JsVarFloat value, JsVarFloat freq, JshAnalogOutputFlags flags) {
   /* we set the bit field here so that if the user changes the pin state
    * later on, we can get rid of the IRQs */
-  if (!jshGetPinStateIsManual(pin)) {
+ /* if (!jshGetPinStateIsManual(pin)) {
     BITFIELD_SET(jshPinSoftPWM, pin, 0);
     jshPinSetState(pin, JSHPINSTATE_GPIO_OUT);
   }
   BITFIELD_SET(jshPinSoftPWM, pin, 1);
   if (freq<=0) freq=50;
   jstPinPWM(freq, value, pin);
-  return JSH_NOTHING;
+  return JSH_NOTHING;*/
+
+  NRF_PWM_Type *pwm = NRF_PWM0;
+  jshPinSetState(pin, JSHPINSTATE_GPIO_OUT);
+  uint32_t out_pins[NRF_PWM_CHANNEL_COUNT] = { pin, NRF_PWM_PIN_NOT_CONNECTED, NRF_PWM_PIN_NOT_CONNECTED, NRF_PWM_PIN_NOT_CONNECTED };
+  nrf_pwm_pins_set(pwm, out_pins);
+  nrf_pwm_enable(pwm);
+  nrf_pwm_configure(pwm,
+      NRF_PWM_CLK_1MHz, NRF_PWM_MODE_UP, 32767 /* top value - 15 bits, not 16! */);
+  nrf_pwm_decoder_set(pwm,
+      NRF_PWM_LOAD_INDIVIDUAL, // allow all 4 channels to be used
+      NRF_PWM_STEP_TRIGGERED); // Only step on NEXTSTEP task
+
+  nrf_pwm_shorts_set(pwm, 0);
+  nrf_pwm_int_set(pwm, 0);
+  nrf_pwm_event_clear(pwm, NRF_PWM_EVENT_LOOPSDONE);
+  nrf_pwm_event_clear(pwm, NRF_PWM_EVENT_SEQEND0);
+  nrf_pwm_event_clear(pwm, NRF_PWM_EVENT_SEQEND1);
+  nrf_pwm_event_clear(pwm, NRF_PWM_EVENT_STOPPED);
+  nrf_pwm_event_clear(pwm, NRF_PWM_EVENT_STOPPED);
+
+  static uint16_t pwmValues[4];
+  pwmValues[0] = 32767 - (uint16_t)(value*32767);
+  nrf_pwm_loop_set(pwm, PWM_LOOP_CNT_Disabled);
+  nrf_pwm_seq_ptr_set(      pwm, 0, pwmValues);
+  nrf_pwm_seq_cnt_set(      pwm, 0, 4);
+  nrf_pwm_seq_refresh_set(  pwm, 0, 0);
+  nrf_pwm_seq_end_delay_set(pwm, 0, 0);
+
+  nrf_pwm_task_trigger(pwm, NRF_PWM_TASK_SEQSTART0);
+  // nrf_pwm_disable(pwm);
+
 } // if freq<=0, the default is used
 
 void jshPinPulse(Pin pin, bool pulsePolarity, JsVarFloat pulseTime) {