m4 tc output works. Watch out for the PAC!

tannewt · tannewt · commit cc616aea4e85 · 2018-02-12T23:41:26.000-08:00
diff --git a/main.c b/main.c
@@ -153,6 +153,10 @@ bool start_mp(safe_mode_t safe_mode) {
                 serial_write(MSG_DOUBLE_FILE_EXTENSION);
             }
         }
+
+        reset_port();
+        reset_board();
+        reset_mp();
         reset_status_led();
 
         if (result.return_code & PYEXEC_FORCED_EXIT) {
@@ -314,9 +318,6 @@ int __attribute__((used)) main(void) {
             }
             first_run = false;
             skip_repl = start_mp(safe_mode);
-            reset_port();
-            reset_board();
-            reset_mp();
         } else if (exit_code != 0) {
             break;
         }
diff --git a/ports/atmel-samd/common-hal/pulseio/PWMOut.c b/ports/atmel-samd/common-hal/pulseio/PWMOut.c
@@ -330,10 +330,16 @@ void common_hal_pulseio_pwmout_construct(pulseio_pwmout_obj_t* self,
             tc->COUNT16.CC[0].reg = top;
             #endif
             #ifdef SAMD51
+
+            tc->COUNT16.CTRLA.bit.SWRST = 1;
+            while (tc->COUNT16.CTRLA.bit.SWRST == 1) {
+            }
+            tc_set_enable(tc, false);
             tc->COUNT16.CTRLA.reg = TC_CTRLA_MODE_COUNT16 | TC_CTRLA_PRESCALER(divisor);
-            tc->COUNT16.CTRLBSET.bit.LUPD = true;
+            //tc->COUNT16.CTRLBSET.bit.LUPD = true;
             tc->COUNT16.WAVE.reg = TC_WAVE_WAVEGEN_MPWM;
             tc->COUNT16.CCBUF[0].reg = top;
+            tc->COUNT16.CCBUF[1].reg = top / 2;
             #endif
 
             tc_set_enable(tc, true);
@@ -404,7 +410,10 @@ extern void common_hal_pulseio_pwmout_set_duty_cycle(pulseio_pwmout_obj_t* self,
         tc_insts[t->index]->COUNT16.CC[t->wave_output].reg = adjusted_duty;
         #endif
         #ifdef SAMD51
-        tc_insts[t->index]->COUNT16.CCBUF[t->wave_output].reg = adjusted_duty;
+        while (tc_insts[t->index]->COUNT16.SYNCBUSY.bit.CC1 != 0) {
+            // Wait for a previous value to be written.
+        }
+        tc_insts[t->index]->COUNT16.CCBUF[1].reg = adjusted_duty;
         #endif
     } else {
         uint32_t adjusted_duty = ((uint64_t) tcc_periods[t->index]) * duty / 0xffff;
diff --git a/ports/atmel-samd/supervisor/port.c b/ports/atmel-samd/supervisor/port.c
@@ -46,6 +46,7 @@
 #include "common-hal/analogio/AnalogIn.h"
 #include "common-hal/analogio/AnalogOut.h"
 #include "common-hal/microcontroller/Pin.h"
+#include "common-hal/pulseio/PWMOut.h"
 #include "tick.h"
 
 extern volatile bool mp_msc_enabled;
@@ -206,8 +207,8 @@ void reset_port(void) {
 //     pdmin_reset();
 //     pulsein_reset();
 //     pulseout_reset();
-//     pwmout_reset();
 // #endif
+    pwmout_reset();
 
     analogin_reset();
 

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,10 @@ bool start_mp(safe_mode_t safe_mode) {`
`153`	`153`	`serial_write(MSG_DOUBLE_FILE_EXTENSION);`
`154`	`154`	`}`
`155`	`155`	`}`
	`156`	`+`
	`157`	`+ reset_port();`
	`158`	`+ reset_board();`
	`159`	`+ reset_mp();`
`156`	`160`	`reset_status_led();`
`157`	`161`
`158`	`162`	`if (result.return_code & PYEXEC_FORCED_EXIT) {`
`@@ -314,9 +318,6 @@ int __attribute__((used)) main(void) {`
`314`	`318`	`}`
`315`	`319`	`first_run = false;`
`316`	`320`	`skip_repl = start_mp(safe_mode);`
`317`		`- reset_port();`
`318`		`- reset_board();`
`319`		`- reset_mp();`
`320`	`321`	`} else if (exit_code != 0) {`
`321`	`322`	`break;`
`322`	`323`	`}`