Diff: main.cpp

Revision:

55:6536e02d729e

Parent:

54:2062e5786a66

Child:

56:61b0f4d6a890

--- a/main.cpp	Thu May 31 08:03:28 2018 +0000
+++ b/main.cpp	Thu May 31 14:38:30 2018 +0000
@@ -16,14 +16,14 @@
 #define nSleep_SERVO_POUMON PC_6
 #define FWD_SERVO_POUMON PB_14
 #define REV_SERVO_POUMON PB_13
-#define Channel_A_SERVO_POUMON PB_2
-#define Channel_B_SERVO_POUMON PB_1
+#define Channel_A_SERVO_POUMON PB_1
+#define Channel_B_SERVO_POUMON PB_2
 #define HOME_SERVO_POUMON 0
 
 #define PWM_SERVO_FUITE PB_10
 #define nSleep_SERVO_FUITE PB_0
-#define FWD_SERVO_FUITE PB_4
-#define REV_SERVO_FUITE PB_5
+#define FWD_SERVO_FUITE PB_5
+#define REV_SERVO_FUITE PB_4
 #define Channel_A_SERVO_FUITE PC_9
 #define Channel_B_SERVO_FUITE PA_8
 #define HOME_SERVO_FUITE 90
@@ -33,7 +33,7 @@
 #define PIN_V_PILES_DIGI PC_3
 #define PIN_V_USB_DIGI PA_0
 
-USBSerial serialMonit;
+USBSerial serialMonit( 0x0483 , 0x5740 , 0x0001 , false ) ; 
 
 //#define OUTPUT(...) { NVIC_DisableIRQ(USART3_IRQn); serialMonit.printf(__VA_ARGS__); fflush(stdout);NVIC_EnableIRQ(USART3_IRQn);}
 #define OUTPUT(...) { NVIC_DisableIRQ(USART2_IRQn); serialMonit.printf(__VA_ARGS__); fflush(stdout);NVIC_EnableIRQ(USART2_IRQn);}
@@ -41,7 +41,7 @@
 
 //PinName pwm, PinName nSleep, PinName fwd, PinName rev, PinName channelA, PinName channelB, int pulsesPerRev, int Rapport, Encoding encoding = X2_ENCODING
 Faulhaber Servo_Poumon("Servo_Poumon", PWM_SERVO_POUMON, nSleep_SERVO_POUMON, FWD_SERVO_POUMON, REV_SERVO_POUMON, Channel_A_SERVO_POUMON, Channel_B_SERVO_POUMON, 16, 207, Faulhaber::X2_ENCODING);
-Faulhaber Servo_Fuite("Servo_Fuite", PWM_SERVO_FUITE, nSleep_SERVO_FUITE, FWD_SERVO_FUITE, REV_SERVO_FUITE, Channel_A_SERVO_FUITE, Channel_B_SERVO_FUITE, 16, 207, Faulhaber::X2_ENCODING);
+Faulhaber Servo_Fuite("Servo_Fuite", PWM_SERVO_FUITE, nSleep_SERVO_FUITE, FWD_SERVO_FUITE, REV_SERVO_FUITE, Channel_A_SERVO_FUITE, Channel_B_SERVO_FUITE, 16, 1257, Faulhaber::X2_ENCODING);
 
 //Moniteur série, Serial 2
 //Serial serialMonit(PC_10, PC_11, 115200); // UART 3 pour windev nucleo - version définitive sur uart3 pour carte ARNSRS
@@ -882,8 +882,7 @@
             UTILS::UnMount_Flash();
             FLASH_set_boot_bank(2);
             OUTPUT("  Reboot...\r\n");
-            while(1);
-            //HAL_NVIC_SystemReset;
+            HAL_NVIC_SystemReset;
         }
         
         //Update du PID