little fix

1_wire/main.c

@@ -54,9 +54,9 @@ int main(){
 	while(1){
 		usbd_poll(usbd_dev);
 		if(usbdatalen){ // there's something in USB buffer
-			usbdatalen = parce_incoming_buf(usbdatabuf, usbdatalen);
+			usbdatalen = parse_incoming_buf(usbdatabuf, usbdatalen);
 		}
-		//check_and_parce_UART(USART1); // also check data in UART buffers
+		//check_and_parse_UART(USART1); // also check data in UART buffers
 		check_btns();
 		if(Timer - Old_timer > 999){ // one-second cycle
 			Old_timer += 1000;

1_wire/user_proto.c

@@ -61,10 +61,10 @@ uint8_t show_int(int32_t v){
 }
 
 /**
- * parce command buffer buf with length len
+ * parse command buffer buf with length len
  * return 0 if buffer processed or len if there's not enough data in buffer
  */
-int parce_incoming_buf(char *buf, int len){
+int parse_incoming_buf(char *buf, int len){
 	uint8_t command;
 	//uint32_t utmp;
 	int i = 0;

1_wire/user_proto.h

@@ -45,7 +45,7 @@ void prnt(uint8_t *wrd);
 void print_int(int32_t N);
 void print_hex(uint8_t *buff, uint8_t l);
 
-int parce_incoming_buf(char *buf, int len);
+int parse_incoming_buf(char *buf, int len);
 void OW_printID(uint8_t N);
 
 #endif // __USER_PROTO_H__

DMA_GPIO/user_proto.c

@@ -25,7 +25,7 @@
 #include "dmagpio.h"
 
 /**
- * parce command buffer buf with length len
+ * parse command buffer buf with length len
  * return 0 if buffer processed or len if there's not enough data in buffer
  */
 void parse_incoming_buf(uint8_t *buf, int *len){

GPIO_TIM/user_proto.c

@@ -25,7 +25,7 @@
 #include "timgpio.h"
 
 /**
- * parce command buffer buf with length len
+ * parse command buffer buf with length len
  * return 0 if buffer processed or len if there's not enough data in buffer
  */
 void parse_incoming_buf(uint8_t *buf, int *len){

GPS+ultrasonic/main.c

@@ -95,7 +95,7 @@ int main(){
 		poll_ultrasonic();
 		poll_ADC();
 		if(usbdatalen){ // there's something in USB buffer
-			usbdatalen = parce_incoming_buf(usbdatabuf, usbdatalen);
+			usbdatalen = parse_incoming_buf(usbdatabuf, usbdatalen);
 		}
 		if((string = check_UART2())){
 		//	P(string);

GPS+ultrasonic/uart.c

@@ -98,7 +98,7 @@ void UART_isr(uint32_t UART){
 	UART_buff *curbuff;
 	// Check if we were called because of RXNE
 	if(USART_SR(UART) & USART_SR_RXNE){
-		// parce incoming byte
+		// parse incoming byte
 		data = usart_recv(UART);
 		fill_uart_RXbuff(UART, data);
 	}

GPS+ultrasonic/user_proto.c

@@ -62,10 +62,10 @@ uint8_t show_int(int32_t v){
 }
 
 /**
- * parce command buffer buf with length len
+ * parse command buffer buf with length len
  * return 0 if buffer processed or len if there's not enough data in buffer
  */
-int parce_incoming_buf(char *buf, int len){
+int parse_incoming_buf(char *buf, int len){
 	uint8_t command;
 	//uint32_t utmp;
 	int i = 0, j;

GPS+ultrasonic/user_proto.h

@@ -42,6 +42,6 @@ void prnt(uint8_t *wrd);
 void print_int(int32_t N);
 void print_hex(uint8_t *buff, uint8_t l);
 
-int parce_incoming_buf(char *buf, int len);
+int parse_incoming_buf(char *buf, int len);
 
 #endif // __USER_PROTO_H__

GPS/main.c

@@ -86,7 +86,7 @@ int main(){
 	while(1){
 		usbd_poll(usbd_dev);
 		if(usbdatalen){ // there's something in USB buffer
-			usbdatalen = parce_incoming_buf(usbdatabuf, usbdatalen);
+			usbdatalen = parse_incoming_buf(usbdatabuf, usbdatalen);
 		}
 		if((string = check_UART2())){
 			P(string);

GPS/uart.c

@@ -98,7 +98,7 @@ void UART_isr(uint32_t UART){
 	UART_buff *curbuff;
 	// Check if we were called because of RXNE
 	if(USART_SR(UART) & USART_SR_RXNE){
-		// parce incoming byte
+		// parse incoming byte
 		data = usart_recv(UART);
 		fill_uart_RXbuff(UART, data);
 	}

GPS/user_proto.c

@@ -58,10 +58,10 @@ uint8_t show_int(int32_t v){
 }
 
 /**
- * parce command buffer buf with length len
+ * parse command buffer buf with length len
  * return 0 if buffer processed or len if there's not enough data in buffer
  */
-int parce_incoming_buf(char *buf, int len){
+int parse_incoming_buf(char *buf, int len){
 	uint8_t command;
 	//uint32_t utmp;
 	int i = 0;

GPS/user_proto.h

@@ -42,6 +42,6 @@ void prnt(uint8_t *wrd);
 void print_int(int32_t N);
 void print_hex(uint8_t *buff, uint8_t l);
 
-int parce_incoming_buf(char *buf, int len);
+int parse_incoming_buf(char *buf, int len);
 
 #endif // __USER_PROTO_H__

Jeep_generator/Makefile

@@ -46,7 +46,7 @@ SCRIPT_DIR	= $(OPENCM3_DIR)/scripts
 
 ###############################################################################
 # C flags
-CFLAGS		+= -Os -g
+CFLAGS		+= -O3 -g
 CFLAGS		+= -Wall -Wextra -Wshadow -Wimplicit-function-declaration
 CFLAGS		+= -Wredundant-decls
 # -Wmissing-prototypes -Wstrict-prototypes

Jeep_generator/README

@@ -1,6 +1,6 @@
 Jeep crankshaft signals generator
 
-Speed from 180 to 6000RPM
+Speed from 200 to 6000RPM
 Buttons "+" and "-", LEDS "MIN" and "MAX"
 
 written for chinese devboard based on STM32F103RBT6

Jeep_generator/main.c

@@ -43,7 +43,7 @@ int main(){
     while(1){
         usbd_poll(usbd_dev);
         if(usbdatalen){ // there's something in USB buffer
-            usbdatalen = parce_incoming_buf(usbdatabuf, usbdatalen);
+            usbdatalen = parse_incoming_buf(usbdatabuf, usbdatalen);
         }
         check_btns();
         if(Timer - Old_timer > 999){ // one-second cycle

Jeep_generator/timer.c

@@ -23,9 +23,9 @@
 #include "user_proto.h" // for print_int
 
 // current speed
-int32_t current_RPM = 0;
+uint16_t current_RPM = 0;
 void get_RPM();
-uint16_t get_ARR(int32_t RPM);
+uint16_t get_ARR(uint32_t RPM);
 
 // pulses: 16 1/0, 4 1/1, 16 1/0, 4 0/0,
 const uint8_t pulses[] = {
@@ -58,8 +58,8 @@ void tim2_isr(){
             GPIO_BSRR(OUTP_PORT) = OUTP_PIN;
         else
             GPIO_BSRR(OUTP_PORT) = OUTP_PIN << 16;
-        TIM2_SR = 0;
     }
+    TIM2_SR = 0;
 }
 
 /**
@@ -67,14 +67,17 @@ void tim2_isr(){
  * RPM = 1/tim2_arr / 40 * 60
  */
 void get_RPM(){
-    current_RPM = 3000000 / (int32_t)TIM2_ARR;
+    uint32_t R = 3000000 / (uint32_t)TIM2_ARR;
-    current_RPM /= 2;
+    current_RPM = R/2;
+    //current_RPM = R;
+    //current_RPM >>= 1; // x/2 != x>>1, WTF?
 }
 
 // calculate TIM2_ARR by RPM
-uint16_t get_ARR(int32_t RPM){
+uint16_t get_ARR(uint32_t RPM){
-    int32_t R = 3000000 / RPM;
+    uint32_t R = 3000000 / RPM;
     R /= 2;
+    //R >>= 1;
     return (uint16_t)R;
 }
 

Jeep_generator/timer.h

@@ -31,13 +31,13 @@
 //~ #define TM2_MAX_SPEED (250)
 // max & min rotation speed
 #define MAX_RPM  (6000)
-#define MIN_RPM  (180)
+#define MIN_RPM  (200)
 
 
 void tim2_init();
 void increase_speed();
 void decrease_speed();
 
-extern int32_t current_RPM;
+extern uint16_t current_RPM;
 
 #endif // __TIMER_H__

Jeep_generator/user_proto.c

@@ -34,13 +34,13 @@ void help(){
 }
 
 /**
- * parce command buffer buf with length len
+ * parse command buffer buf with length len
  * return 0 if buffer processed or len if there's not enough data in buffer
  */
-int parce_incoming_buf(char *buf, int len){
+int parse_incoming_buf(char *buf, int len){
     uint8_t command;
     int i = 0;
-    for(; i < len; i++){
+    for(; i < len; ++i){
         command = buf[i];
         if(!command) continue; // omit zero
         switch (command){

Jeep_generator/user_proto.h

@@ -42,6 +42,6 @@ void prnt(uint8_t *wrd);
 void print_int(int32_t N);
 void print_hex(uint8_t *buff, uint8_t l);
 
-int parce_incoming_buf(char *buf, int len);
+int parse_incoming_buf(char *buf, int len);
 
 #endif // __USER_PROTO_H__

Timelapse_keyboard/uart.c

@@ -97,7 +97,7 @@ void UART_isr(uint32_t UART){
 	UART_buff *curbuff;
 	// Check if we were called because of RXNE
 	if(USART_SR(UART) & USART_SR_RXNE){
-		// parce incoming byte
+		// parse incoming byte
 		data = usart_recv(UART);
 		fill_uart_RXbuff(UART, data);
 	}

Timelapse_keyboard_only_lasers/uart.c

@@ -97,7 +97,7 @@ void UART_isr(uint32_t UART){
 	UART_buff *curbuff;
 	// Check if we were called because of RXNE
 	if(USART_SR(UART) & USART_SR_RXNE){
-		// parce incoming byte
+		// parse incoming byte
 		data = usart_recv(UART);
 		fill_uart_RXbuff(UART, data);
 	}

USBCDC_template/user_proto.c

@@ -29,7 +29,7 @@ void help(){
 
 
 /**
- * parce command buffer buf with length len
+ * parse command buffer buf with length len
  * return 0 if buffer processed or len if there's not enough data in buffer
  */
 int parse_incoming_buf(char *buf, int len){

canon_lens/user_proto.c

@@ -137,7 +137,7 @@ void showFval(){
 }
 
 /**
- * parce command buffer buf with length len
+ * parse command buffer buf with length len
  * fill uint8_t data buffer with readed data
  */
 void parse_incoming_buf(){

distance_meters/main.c

@@ -56,7 +56,7 @@ int main(){
 		uint32_t L;
 		usbd_poll(usbd_dev);
 		if(usbdatalen){ // there's something in USB buffer
-			usbdatalen = parce_incoming_buf(usbdatabuf, usbdatalen);
+			usbdatalen = parse_incoming_buf(usbdatabuf, usbdatalen);
 		}
 		if(AWD_flag){
 			P("Int, value = ");

distance_meters/user_proto.c

@@ -59,10 +59,10 @@ uint8_t show_int(int32_t v){
 }
 
 /**
- * parce command buffer buf with length len
+ * parse command buffer buf with length len
  * return 0 if buffer processed or len if there's not enough data in buffer
  */
-int parce_incoming_buf(char *buf, int len){
+int parse_incoming_buf(char *buf, int len){
 	uint8_t command;
 	//uint32_t utmp;
 	int i = 0;

distance_meters/user_proto.h

@@ -44,6 +44,6 @@ void prnt(uint8_t *wrd);
 void print_int(int32_t N);
 void print_hex(uint8_t *buff, uint8_t l);
 
-int parce_incoming_buf(char *buf, int len);
+int parse_incoming_buf(char *buf, int len);
 
 #endif // __USER_PROTO_H__

nokia5110/main.c

@@ -80,7 +80,7 @@ int main(){
 			}
 			usbdatalen = 0;
 		}
-		//check_and_parce_UART(USART1); // also check data in UART buffers
+		//check_and_parse_UART(USART1); // also check data in UART buffers
 		if(Timer - Old_timer > 999){ // one-second cycle
 			Old_timer += 1000;
 			//print_int(Timer / 1000);newline();

simple_cdc/main.c

@@ -51,9 +51,9 @@ int main(){
 	while(1){
 		usbd_poll(usbd_dev);
 		if(usbdatalen){ // there's something in USB buffer
-			usbdatalen = parce_incoming_buf(usbdatabuf, usbdatalen);
+			usbdatalen = parse_incoming_buf(usbdatabuf, usbdatalen);
 		}
-		//check_and_parce_UART(USART1); // also check data in UART buffers
+		//check_and_parse_UART(USART1); // also check data in UART buffers
 		check_btns();
 		if(Timer - Old_timer > 999){ // one-second cycle
 			Old_timer += 1000;

simple_cdc/user_proto.c

@@ -57,10 +57,10 @@ uint8_t show_int(int32_t v){
 }
 
 /**
- * parce command buffer buf with length len
+ * parse command buffer buf with length len
  * return 0 if buffer processed or len if there's not enough data in buffer
  */
-int parce_incoming_buf(char *buf, int len){
+int parse_incoming_buf(char *buf, int len){
 	uint8_t command;
 	//uint32_t utmp;
 	int i = 0;

simple_cdc/user_proto.h

@@ -42,6 +42,6 @@ void prnt(uint8_t *wrd);
 void print_int(int32_t N);
 void print_hex(uint8_t *buff, uint8_t l);
 
-int parce_incoming_buf(char *buf, int len);
+int parse_incoming_buf(char *buf, int len);
 
 #endif // __USER_PROTO_H__

stepper_motion/client-p2/cmdlnopts.c

@@ -1,5 +1,5 @@
 /*
- * cmdlnopts.c - the only function that parce cmdln args and returns glob parameters
+ * cmdlnopts.c - the only function that parse cmdln args and returns glob parameters
  *
  * Copyright 2013 Edward V. Emelianoff <eddy@sao.ru>
  *
@@ -93,13 +93,13 @@ myoption cmdlnopts[] = {
 
 
 /**
- * Parce command line options and return dynamically allocated structure
+ * Parse command line options and return dynamically allocated structure
  * 		to global parameters
  * @param argc - copy of argc from main
  * @param argv - copy of argv from main
  * @return allocated structure with global parameters
  */
-glob_pars *parce_args(int argc, char **argv){
+glob_pars *parse_args(int argc, char **argv){
 	int i;
 	void *ptr;
 	ptr = memcpy(&G, &Gdefault, sizeof(G)); assert(ptr);
@@ -107,7 +107,7 @@ glob_pars *parce_args(int argc, char **argv){
 	/// "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ÁÒÇÕÍÅÎÔÙ]\n\n\tçÄÅ ÁÒÇÕÍÅÎÔÙ:\n"
 	change_helpstring(_("Usage: %s [args]\n\n\tWhere args are:\n"));
 	// parse arguments
-	parceargs(&argc, &argv, cmdlnopts);
+	parseargs(&argc, &argv, cmdlnopts);
 	if(help) showhelp(-1, cmdlnopts);
 	if(argc > 0){
 		/// "éÇÎÏÒÉÒÕÀ ÁÒÇÕÍÅÎÔ[Ù]:"

stepper_motion/client-p2/cmdlnopts.h

@@ -1,5 +1,5 @@
 /*
- * cmdlnopts.h - comand line options for parceargs
+ * cmdlnopts.h - comand line options for parseargs
  *
  * Copyright 2013 Edward V. Emelianoff <eddy@sao.ru>
  *
@@ -23,7 +23,7 @@
 #ifndef __CMDLNOPTS_H__
 #define __CMDLNOPTS_H__
 
-#include "parceargs.h"
+#include "parseargs.h"
 
 /*
  * here are some typedef's for global data
@@ -35,6 +35,6 @@ typedef struct{
 	double relmove;         // move relative current position
 }glob_pars;
 
-glob_pars *parce_args(int argc, char **argv);
+glob_pars *parse_args(int argc, char **argv);
 
 #endif // __CMDLNOPTS_H__

stepper_motion/client-p2/main.c

@@ -235,7 +235,7 @@ int main(int argc, char *argv[]){
 	char buff[BUFLEN+1];
 	pthread_t motor_thread;
 	size_t L;
-	Global_parameters = parce_args(argc, argv);
+	Global_parameters = parse_args(argc, argv);
 	assert(Global_parameters != NULL);
 	if(!get_shm_block(&sdat, ClientSide) || !check_shm_block(&sdat)){
 		fprintf(stderr, "Can't get SHM block!");

stepper_motion/client-p2/parseargs.c

@@ -1,5 +1,5 @@
 /*
- * parceargs.c - parcing command line arguments & print help
+ * parseargs.c - parsing command line arguments & print help
  *
  * Copyright 2013 Edward V. Emelianoff <eddy@sao.ru>
  *
@@ -27,7 +27,7 @@
 #include <limits.h> // INT_MAX & so on
 #include <libintl.h>// gettext
 #include <ctype.h>	// isalpha
-#include "parceargs.h"
+#include "parseargs.h"
 
 // macro to print help messages
 #ifndef PRNT
@@ -135,7 +135,7 @@ int get_optind(int opt, myoption *options){
 }
 
 /**
- * Parce command line arguments
+ * Parse command line arguments
  * ! If arg is string, then value will be strdup'ed!
  *
  * @param argc (io) - address of argc of main(), return value of argc stay after `getopt`
@@ -146,7 +146,7 @@ int get_optind(int opt, myoption *options){
  *
  * @exit: in case of error this function show help & make `exit(-1)`
   */
-void parceargs(int *argc, char ***argv, myoption *options){
+void parseargs(int *argc, char ***argv, myoption *options){
 	char *short_options, *soptr;
 	struct option *long_options, *loptr;
 	size_t optsize, i;
@@ -247,7 +247,7 @@ void parceargs(int *argc, char ***argv, myoption *options){
  */
 void showhelp(int oindex, myoption *options){
 	// ATTENTION: string `help` prints through macro PRNT(), by default it is gettext,
-	// but you can redefine it before `#include "parceargs.h"`
+	// but you can redefine it before `#include "parseargs.h"`
 	int max_opt_len = 0; // max len of options substring - for right indentation
 	const int bufsz = 255;
 	char buf[bufsz+1];

stepper_motion/client-p2/parseargs.h

@@ -1,5 +1,5 @@
 /*
- * parceargs.h - headers for parcing command line arguments
+ * parseargs.h - headers for parcing command line arguments
  *
  * Copyright 2013 Edward V. Emelianoff <eddy@sao.ru>
  *
@@ -19,8 +19,8 @@
  * MA 02110-1301, USA.
  */
 #pragma once
-#ifndef __PARCEARGS_H__
+#ifndef __PARSEARGS_H__
-#define __PARCEARGS_H__
+#define __PARSEARGS_H__
 
 #include <stdbool.h>// bool
 #include <stdlib.h>
@@ -48,7 +48,7 @@ typedef  bool(*argfn)(void *arg, int N);
  * 		int iarg;
  * 		myoption opts[] = {
  * 		{"value", 1, NULL, 'v', arg_int, &iarg, "char val"}, ..., end_option};
- * 		..(parce args)..
+ * 		..(parse args)..
  * 		charg = (char) iarg;
  */
 typedef enum {
@@ -58,7 +58,7 @@ typedef enum {
 	arg_double,		// double
 	arg_float,		// float
 	arg_string,		// char *
-	arg_function	// parce_args will run function `bool (*fn)(char *optarg, int N)`
+	arg_function	// parse_args will run function `bool (*fn)(char *optarg, int N)`
 } argtype;
 
 /*
@@ -67,7 +67,7 @@ typedef enum {
  * 		conversion depends on .type
  *
  * ATTENTION: string `help` prints through macro PRNT(), bu default it is gettext,
- * but you can redefine it before `#include "parceargs.h"`
+ * but you can redefine it before `#include "parseargs.h"`
  *
  * if arg is string, then value wil be strdup'ed like that:
  * 		char *str;
@@ -99,8 +99,8 @@ typedef struct{
 extern const char *__progname;
 
 void showhelp(int oindex, myoption *options);
-void parceargs(int *argc, char ***argv, myoption *options);
+void parseargs(int *argc, char ***argv, myoption *options);
 void change_helpstring(char *s);
 bool myatod(void *num, const char *str, argtype t);
 
-#endif // __PARCEARGS_H__
+#endif // __PARSEARGS_H__

stepper_motion/main.c

@@ -53,9 +53,9 @@ int main(){
 	while(1){
 		usbd_poll(usbd_dev);
 		if(usbdatalen){ // there's something in USB buffer
-			usbdatalen = parce_incoming_buf(usbdatabuf, usbdatalen);
+			usbdatalen = parse_incoming_buf(usbdatabuf, usbdatalen);
 		}
-		//check_and_parce_UART(USART1); // also check data in UART buffers
+		//check_and_parse_UART(USART1); // also check data in UART buffers
 		if(Timer - Old_timer > 999){ // one-second cycle
 			Old_timer += 1000;
 		}else if(Timer < Old_timer){ // Timer overflow

stepper_motion/user_proto.c

@@ -51,10 +51,10 @@ void help(){
 
 
 /**
- * parce command buffer buf with length len
+ * parse command buffer buf with length len
  * return 0 if buffer processed or len if there's not enough data in buffer
  */
-int parce_incoming_buf(char *buf, int len){
+int parse_incoming_buf(char *buf, int len){
 	uint8_t command;
 	//uint32_t utmp;
 	int i = 0;

stepper_motion/user_proto.h

@@ -42,6 +42,6 @@ void prnt(uint8_t *wrd);
 void print_int(int32_t N);
 void print_hex(uint8_t *buff, uint8_t l);
 
-int parce_incoming_buf(char *buf, int len);
+int parse_incoming_buf(char *buf, int len);
 
 #endif // __USER_PROTO_H__

ultrasonic/main.c

@@ -56,7 +56,7 @@ int main(){
 		uint32_t L;
 		usbd_poll(usbd_dev);
 		if(usbdatalen){ // there's something in USB buffer
-			usbdatalen = parce_incoming_buf(usbdatabuf, usbdatalen);
+			usbdatalen = parse_incoming_buf(usbdatabuf, usbdatalen);
 		}
 		if(AWD_flag){
 			P("Int, value = ");

ultrasonic/user_proto.c

@@ -59,10 +59,10 @@ uint8_t show_int(int32_t v){
 }
 
 /**
- * parce command buffer buf with length len
+ * parse command buffer buf with length len
  * return 0 if buffer processed or len if there's not enough data in buffer
  */
-int parce_incoming_buf(char *buf, int len){
+int parse_incoming_buf(char *buf, int len){
 	uint8_t command;
 	//uint32_t utmp;
 	int i = 0;

ultrasonic/user_proto.h

@@ -44,6 +44,6 @@ void prnt(uint8_t *wrd);
 void print_int(int32_t N);
 void print_hex(uint8_t *buff, uint8_t l);
 
-int parce_incoming_buf(char *buf, int len);
+int parse_incoming_buf(char *buf, int len);
 
 #endif // __USER_PROTO_H__