Merge branch 'master' of https://github.com/hugokernel/Bleuette

Conflicts:
	src/BleuettePi/Python/lib/Servo_SpeedDelay.py
	src/BleuettePi/Python/servo.py

src/BleuettePi/Pic/functions.inc

@@ -61,11 +61,12 @@ _Serial_Send_Delay
 
 Current_Test
 	INT_OFF
-;	btfsc 	Int_Status, INT_STATUS_MAX_REACHED
-;	goto 	_Current_Test_Exit
+	;btfsc 	Int_Status, INT_STATUS_MAX_CURRENT_REACHED
+	;goto 	_Current_Test_Exit
 
 	; Read current value just before stop port !
-	movlw 	ADC_AN0;CURRENT_CHANNEL
+	;movlw 	ADC_AN0;CURRENT_CHANNEL
+	movlw 	CURRENT_CHANNEL
 	call 	Adc_Read
 	movff 	Adc_Result_H, Current_Last_H
 	movff 	Adc_Result_L, Current_Last_L
@@ -100,7 +101,8 @@ _Current_Test_H
 	cpfseq 	Current_Last_H
 	bra 	$ + 4
 
-	goto 	_Current_Test_L
+	goto 	_Current_Test_Alert
+	;goto 	_Current_Test_L
 
 	movf 	Current_Max_H, W
 	cpfslt 	Current_Last_H
@@ -127,7 +129,7 @@ _Current_Test_L
 	goto 	_Current_Test_Exit
 
 _Current_Test_Alert
-	bsf 	Int_Status, INT_STATUS_MAX_REACHED
+	bsf 	Int_Status, INT_STATUS_MAX_CURRENT_REACHED
 	INT_ON
 _Current_Test_Exit
 	return

src/BleuettePi/Pic/init.inc

@@ -259,11 +259,27 @@ _init
 	#define 	BAUD	.9600
 	#define		XTAL	.40000000
 	#define		X		((XTAL / BAUD) / 64) - 1
+;	MOVLF	X, SPBRG
 
 ;messg X
 
-	MOVLF	.64, SPBRG
-;	MOVLF	X, SPBRG
+	; 64 : 9600baud OK
+	;MOVLF	.64, SPBRG
+
+	; 32 : 19200baud OK
+	MOVLF	.32, SPBRG
+
+	; 7 : 76.8 (78.13)
+	;MOVLF 	.7, SPBRG
+	;bcf TXSTA, BRGH
+
+	; 32 : 19200baud, BRGH = 1
+	;MOVLF	.129, SPBRG
+	;bsf		TXSTA, BRGH
+
+	; 25 : 96k, BRGH = 1
+	;MOVLF 	.25, SPBRG
+	;bsf		TXSTA, BRGH
 
 	bcf		TXSTA, SYNC
 
@@ -281,10 +297,16 @@ _init
 	bcf		IPR1, TXIP
 	; Fin ajout hugo
 
+;	clrf 	Current_Cmd
+;	clrf 	Arg_Count
+;	clrf 	Arg0
+;	clrf 	Arg1
 
-	movlw 	1
+	movlw 	0b00000011
 	movwf 	Current_Max_H
-	clrf 	Current_Max_L
+
+	movlw 	0b00000000
+	movwf 	Current_Max_L
 
 	clrf	Int_Status
 

src/BleuettePi/Pic/main.HEX

@@ -1,161 +1,160 @@
 :020000040000FA
-:04000000000015D215
+:0400000000000DD21D
 :04000800000008D01C
 :0800180000000DD0000E6F6224
-:1000200014EF02F0F2B49AEF01F0CD90D58E9EB0AD
-:100030009AEF01F011009EBA1FEF00F01000706EF1
-:10004000000E5F622AEF00F0FF0EAE6221EF01F0BA
-:1000500096EF01F0010E5F6224EF01F0530EAE62E5
-:1000600034EF00F096EF01F0490EAE623EEF00F083
-:10007000000ED8EC03F0F28A15EF01F0500EAE62DC
-:1000800047EF00F06F69F1EC03F015EF01F0520E4D
-:10009000AE624EEF00F06F6A15EF01F0410EAE62F6
-:1000A0005EEF00F04950A2EC03F04A50A2EC03F0DE
-:1000B00049504A249DEC03F021EF01F0540EAE624A
-:1000C0006BEF00F04D509DEC03F0496A4A6A4D9287
-:1000D000829021EF01F0300EAE627EEF00F0000E54
-:1000E0008BEC03F04750A2EC03F04850A2EC03F075
-:1000F000475048249DEC03F021EF01F0310EAE6231
-:1001000091EF00F0080E8BEC03F04750A2EC03F0E7
-:100110004850A2EC03F0475048249DEC03F021EF37
-:1001200001F0320EAE62A4EF00F0100E8BEC03F083
-:100130004750A2EC03F04850A2EC03F0475048248B
-:100140009DEC03F021EF01F0330EAE62B7EF00F04B
-:10015000180E8BEC03F04750A2EC03F04850A2ECD1
-:1001600003F0475048249DEC03F021EF01F0340EDA
-:10017000AE62CAEF00F0200E8BEC03F04750A2EC09
-:1001800003F04850A2EC03F0475048249DEC03F0E4
-:1001900021EF01F0350EAE62DDEF00F0280E8BECA2
-:1001A00003F04750A2EC03F04850A2EC03F0475094
-:1001B00048249DEC03F021EF01F0360EAE62F0EF23
-:1001C00000F0300E8BEC03F04750A2EC03F04850E7
-:1001D000A2EC03F0475048249DEC03F021EF01F01E
-:1001E000370EAE6205EF01F08B82380E8BEC03F018
-:1001F0004750A2EC03F04850A2EC03F047504824CB
-:100200009DEC03F08B9221EF01F0430EAE621CEFE8
-:1002100001F06F6A000ED8EC03F015EF01F0010E4B
-:10022000AE6221EF01F096EF01F04F0EAD6E9EA889
-:1002300017EF01F021EF01F04E0EAD6E9EA81EEFFC
-:1002400001F05F6A97EF01F0020E5F622CEF01F0A0
-:10025000AE50606E96EF01F0030E5F6234EF01F076
-:10026000AE50616E96EF01F0040E5F623CEF01F05C
-:10027000AE50626E96EF01F0050E5F6244EF01F042
-:10028000AE50636E96EF01F0060E5F624CEF01F028
-:10029000AE50646E96EF01F0070E5F6254EF01F00E
-:1002A000AE50656E96EF01F0080E5F625CEF01F0F4
-:1002B000AE50666E96EF01F0090E5F6264EF01F0DA
-:1002C000AE50676E96EF01F00A0E5F626CEF01F0C0
-:1002D000AE50686E96EF01F00B0E5F6274EF01F0A6
-:1002E000AE50696E96EF01F00C0E5F627CEF01F08C
-:1002F000AE506A6E96EF01F00D0E5F6284EF01F072
-:10030000AE506B6E96EF01F00E0E5F628CEF01F057
-:10031000AE506C6E96EF01F00F0E5F6294EF01F03D
-:10032000AE506D6E96EF01F0AE506E6E5F2A700E9D
-:100330009E9A100050B2FDEF01F07BEC04F0480EE5
-:10034000CF6EA00ECE6ECD80F5EC03F0FF0E586E92
-:1003500000D000D000D000D000D000D0582EF8D768
+:100020000CEF02F0F2B494EF01F0CD90D58E9EB0BB
+:1000300094EF01F011009EBA1FEF00F01000706EF7
+:10004000000E5F622AEF00F0FF0EAE621BEF01F0C0
+:1000500090EF01F0010E5F621EEF01F0530EAE62F1
+:1000600034EF00F090EF01F0490EAE623EEF00F089
+:10007000000ED3EC03F0F28A0FEF01F0500EAE62E7
+:1000800047EF00F06F69ECEC03F00FEF01F0520E58
+:10009000AE624EEF00F06F6A0FEF01F0410EAE62FC
+:1000A0005EEF00F049509DEC03F04A509DEC03F0E8
+:1000B00049504A2498EC03F01BEF01F0540EAE6255
+:1000C0006BEF00F04D5098EC03F0496A4A6A4D908E
+:1000D00082901BEF01F0300EAE627EEF00F0000E5A
+:1000E00086EC03F047509DEC03F048509DEC03F084
+:1000F0004750482498EC03F01BEF01F0310EAE623C
+:1001000091EF00F0080E86EC03F047509DEC03F0F1
+:1001100048509DEC03F04750482498EC03F01BEF47
+:1001200001F0320EAE62A4EF00F0100E86EC03F088
+:1001300047509DEC03F048509DEC03F04750482495
+:1001400098EC03F01BEF01F0330EAE62B7EF00F056
+:10015000180E86EC03F047509DEC03F048509DECE0
+:1001600003F04750482498EC03F01BEF01F0340EE5
+:10017000AE62CAEF00F0200E86EC03F047509DEC13
+:1001800003F048509DEC03F04750482498EC03F0EE
+:100190001BEF01F0350EAE62DDEF00F0280E86ECAD
+:1001A00003F047509DEC03F048509DEC03F047509E
+:1001B000482498EC03F01BEF01F0360EAE62F0EF2E
+:1001C00000F0300E86EC03F047509DEC03F04850F1
+:1001D0009DEC03F04750482498EC03F01BEF01F02E
+:1001E000370EAE6205EF01F08B82380E86EC03F01D
+:1001F00047509DEC03F048509DEC03F047504824D5
+:1002000098EC03F08B921BEF01F0430EAE6216EFF9
+:1002100001F06F6A000ED3EC03F00FEF01F04F0E08
+:10022000AD6E9EA811EF01F01BEF01F04E0EAD6E0A
+:100230009EA818EF01F05F6A91EF01F0020E5F6275
+:1002400026EF01F0AE50606E90EF01F0030E5F629A
+:100250002EEF01F0AE50616E90EF01F0040E5F6280
+:1002600036EF01F0AE50626E90EF01F0050E5F6266
+:100270003EEF01F0AE50636E90EF01F0060E5F624C
+:1002800046EF01F0AE50646E90EF01F0070E5F6232
+:100290004EEF01F0AE50656E90EF01F0080E5F6218
+:1002A00056EF01F0AE50666E90EF01F0090E5F62FE
+:1002B0005EEF01F0AE50676E90EF01F00A0E5F62E4
+:1002C00066EF01F0AE50686E90EF01F00B0E5F62CA
+:1002D0006EEF01F0AE50696E90EF01F00C0E5F62B0
+:1002E00076EF01F0AE506A6E90EF01F00D0E5F6296
+:1002F0007EEF01F0AE506B6E90EF01F00E0E5F627C
+:1003000086EF01F0AE506C6E90EF01F00F0E5F6261
+:100310008EEF01F0AE506D6E90EF01F0AE506E6E4C
+:100320005F2A700E9E9A100050B2F7EF01F076EC43
+:1003300004F0480ECF6EA00ECE6ECD80F0EC03F030
+:10034000FF0E586E00D000D000D000D000D000D0FA
+:10035000582EF8D700D000D000D000D000D000D068
 :1003600000D000D000D000D000D000D000D000D00D
 :1003700000D000D000D000D000D000D000D000D0FD
 :1003800000D000D000D000D000D000D000D000D0ED
 :1003900000D000D000D000D000D000D000D000D0DD
 :1003A00000D000D000D000D000D000D000D000D0CD
-:1003B00000D000D000D000D000D000D000D000D0BD
-:1003C00000D000D000EE18F011EE18F021EE00F091
-:1003D000406A416AEF503D6E41503D5E19E0EF507A
-:1003E000416E010E3C6E50680000000000000000ED
-:1003F00000000000000000000000FF0ED76EE10EBC
-:10040000D66E00003C2A3D503C640ED0506A00007D
-:10041000B4EC03F034EC04F0DE504026E92A00008E
-:10042000170E4064D7D7D59E9E90F29411001F0EF0
-:10043000926E000E936E800E946E000E956E070EF7
-:10044000966E000E806E000E816E000E826E000EA3
-:10045000836E000E846E800ED06E240EF26E8E0EB1
-:10046000F16E900ED56E000ECA6E810EC26E800EB9
-:10047000C16EA00ECD6E9D809F80010E4F6E506AA2
-:100480003C6A800E3D6E5F6A400EAF6EAC98AB8EDC
-:10049000AB9CAB889D8A9F9A210EAC6E9D8A9F98DB
-:1004A000010E4B6E4C6A4D6A826A000E006E000EA1
-:1004B000016E000E026E000E036E000E046E000E42
-:1004C000056E000E066E000E076E000E086E000E22
-:1004D000096E000E0A6E000E0B6E000E0C6E000E02
-:1004E0000D6E000E0E6E000E0F6E000E106E000EE2
-:1004F000116E000E126E000E136E000E146E000EC2
-:10050000156E000E166E000E176E0101170E006FAD
-:10051000000E016F000E026F000E036F000E046FDD
-:10052000000E056F000E066F000E076F000E086FBD
-:10053000000E096F000E0A6F000E0B6F000E0C6F9D
-:10054000000E0D6F000E0E6F000E0F6F000E106F7D
-:10055000000E116F000E126F000E136F000E146F5D
-:10056000000E156F000E166F000E176FFF0E186F3E
-:10057000FF0E196FFF0E1A6F000E1B6F000E1C6F1F
-:10058000000E1D6F000E1E6F000E1F6F000E206FFD
-:10059000000E216F000E226F000E236F000E246FDD
-:1005A000000E256F000E266F000E276F000E286FBD
-:1005B000000E296F000E2A6F000E2B6F000E2C6F9D
-:1005C000000E2D6F000E2E6F000E2F6F000E306F7D
-:1005D000000E316F000E326F000E336F000E346F5D
-:1005E000000E356F000E366F000E376F000E386F3D
-:1005F000000E396F000E3A6F000E3B6F000E3C6F1D
-:10060000000E3D6F000E3E6F000E3F6F000E406FFC
-:10061000000E416F000E426F000E436F000E446FDC
-:10062000000E456F000E466F000E476F000E486FBC
-:10063000000E496F000E4A6F000E4B6F000E4C6F9C
-:10064000000E4D6F000E4E6F000E4F6F000E506F7C
-:10065000000E516F000E526F000E536F000E546F5C
-:10066000000E556F000E566F000E576F000E586F3C
-:10067000000E596F000E5A6F000E5B6F000E5C6F1C
-:10068000000E5D6F000E5E6F000E5F6F00015F6A0F
-:100690006F6AF28EF28C110E5F624BEF03F05F6AAD
-:1006A000000E60246124622463246424652466248B
-:1006B0006724682469246A246B246C246D246E6288
-:1006C00084EF03F060C012F061C013F062C014F058
-:1006D00063C015F064C016F065C017F066C008F07E
-:1006E00067C009F068C00AF069C00BF06AC00CF07E
-:1006F0006BC00DF06CC010F06DC011F04F0EAD6E00
-:100700009EA880EF03F0C7D74E0EAD6E9EA886EF71
-:1007100003F04BEF03F0800FC26EC280200E586EC4
-:100720000000582EFDD7C284C2B494EF03F0C45029
-:10073000030B476EC350486E1200AD6E9EA89EEF2D
-:1007400003F01200AD6E9EA8A3EF03F0FF0E586EEB
-:1007500000D000D000D000D000D000D000D000D019
-:1007600000D0582EF5D712008290000E8BEC03F0CB
-:1007700047C049F048C04AF04B50496001D0D7EF1C
-:1007800003F04B50496201D0CAEF03F04B5049606F
-:10079000D5EF03F04C504A6201D0D5EF03F04C5036
-:1007A0004A60D5EF03F0D7EF03F04D82828012004C
-:1007B000006E016E026E036E046E056E066E076EAD
-:1007C000086E096E0A6E0B6E0C6E0D6E0E6E0F6E5D
-:1007D000106E116E126E136E146E156E166E176E0D
-:1007E0001200C00E8A168C6A1200436A456AE86AD3
-:1007F0001266040E4512E86A1366080E4512E86A8E
-:100800001466100E4512E86A1566200E4512E86A55
-:100810001666400E4512E86A1766800E4512E86AB1
-:100820001066010E4512E86A1166020E4512E86A6A
-:100830000866010E4312E86A0966020E4312E86A6E
-:100840000A66040E4312E86A0B66080E4312E86A51
-:100850000C66100E4312E86A0D66200E43124350D8
-:100860008A6E45508C6E12003D5023E0E750000028
-:1008700000000000E7500000000000000000000041
-:100880000000E4503F0B8A18436EE6500000000061
-:10089000000000000000E6508C18456E00000000CB
-:1008A0000000000043508A6E0000000045508C6E2E
-:1008B0001200E12AE12AE12A000000000000000005
+:1003B00000D000D000D000D000EE18F011EE18F000
+:1003C00021EE00F0406A416AEF503D6E41503D5EC3
+:1003D00019E0EF50416E010E3C6E506800000000C5
+:1003E0000000000000000000000000000000FF0E00
+:1003F000D76EE10ED66E00003C2A3D503C640CD016
+:10040000506A00002FEC04F0DE504026E92A00007C
+:10041000170E4064D9D7D59E9E90F29411001F0EFE
+:10042000926E000E936E800E946E000E956E070E07
+:10043000966E000E806E000E816E000E826E000EB3
+:10044000836E000E846E800ED06E240EF26E8E0EC1
+:10045000F16E900ED56E000ECA6E810EC26E800EC9
+:10046000C16EA00ECD6E9D809F80010E4F6E506AB2
+:100470003C6A800E3D6E5F6A200EAF6EAC98AB8E0C
+:10048000AB9CAB889D8A9F9A210EAC6E9D8A9F98EB
+:10049000110E4B6E000E4C6E4D6A826A000E006E9D
+:1004A000000E016E000E026E000E036E000E046E52
+:1004B000000E056E000E066E000E076E000E086E32
+:1004C000000E096E000E0A6E000E0B6E000E0C6E12
+:1004D000000E0D6E000E0E6E000E0F6E000E106EF2
+:1004E000000E116E000E126E000E136E000E146ED2
+:1004F000000E156E000E166E000E176E0101170E1F
+:10050000006F000E016F000E026F000E036F000EF1
+:10051000046F000E056F000E066F000E076F000ED1
+:10052000086F000E096F000E0A6F000E0B6F000EB1
+:100530000C6F000E0D6F000E0E6F000E0F6F000E91
+:10054000106F000E116F000E126F000E136F000E71
+:10055000146F000E156F000E166F000E176FFF0E52
+:10056000186FFF0E196FFF0E1A6F000E1B6F000E33
+:100570001C6F000E1D6F000E1E6F000E1F6F000E11
+:10058000206F000E216F000E226F000E236F000EF1
+:10059000246F000E256F000E266F000E276F000ED1
+:1005A000286F000E296F000E2A6F000E2B6F000EB1
+:1005B0002C6F000E2D6F000E2E6F000E2F6F000E91
+:1005C000306F000E316F000E326F000E336F000E71
+:1005D000346F000E356F000E366F000E376F000E51
+:1005E000386F000E396F000E3A6F000E3B6F000E31
+:1005F0003C6F000E3D6F000E3E6F000E3F6F000E11
+:10060000406F000E416F000E426F000E436F000EF0
+:10061000446F000E456F000E466F000E476F000ED0
+:10062000486F000E496F000E4A6F000E4B6F000EB0
+:100630004C6F000E4D6F000E4E6F000E4F6F000E90
+:10064000506F000E516F000E526F000E536F000E70
+:10065000546F000E556F000E566F000E576F000E50
+:10066000586F000E596F000E5A6F000E5B6F000E30
+:100670005C6F000E5D6F000E5E6F000E5F6F00011D
+:100680005F6A6F6AF28EF28CAFEC03F0110E5F625C
+:1006900044EF03F05F6A000E602461246224632447
+:1006A0006424652466246724682469246A246B24EE
+:1006B0006C246D246E627FEF03F060C012F061C0A5
+:1006C00013F062C014F063C015F064C016F065C08A
+:1006D00017F066C008F067C009F068C00AF069C08A
+:1006E0000BF06AC00CF06BC00DF06CC010F06DC068
+:1006F00011F04F0EAD6E9EA87BEF03F0C5D74E0EE6
+:10070000AD6E9EA881EF03F044EF03F0800FC26E40
+:10071000C280200E586E0000582EFDD7C284C2B48D
+:100720008FEF03F0C450030B476EC350486E1200A6
+:10073000AD6E9EA899EF03F01200AD6E9EA89EEFDD
+:1007400003F0FF0E586E00D000D000D000D000D0D3
+:1007500000D000D000D000D0582EF5D712008290E3
+:10076000380E86EC03F047C049F048C04AF04B50C1
+:10077000496001D0D2EF03F04B50496201D0D0EF75
+:1007800003F04B504960D0EF03F04C504A6201D067
+:10079000D0EF03F04C504A60D0EF03F0D2EF03F0FB
+:1007A0004D8082801200006E016E026E036E046E38
+:1007B000056E066E076E086E096E0A6E0B6E0C6E85
+:1007C0000D6E0E6E0F6E106E116E126E136E146E35
+:1007D000156E166E176E1200C00E8A168C6A120005
+:1007E000436A456AE86A1266040E4512E86A1366AF
+:1007F000080E4512E86A1466100E4512E86A15667E
+:10080000200E4512E86A1666400E4512E86A176621
+:10081000800E4512E86A1066010E4512E86A1166FC
+:10082000020E4512E86A0866010E4312E86A09667C
+:10083000020E4312E86A0A66040E4312E86A0B6667
+:10084000080E4312E86A0C66100E4312E86A0D6641
+:10085000200E431243508A6E45508C6E12003D505C
+:1008600023E0E750000000000000E7500000000017
+:100870000000000000000000E4503F0B8A18436EA7
+:10088000E65000000000000000000000E6508C1858
+:10089000456E000000000000000043508A6E00001A
+:1008A000000045508C6E1200E12AE12AE12A000086
+:1008B0000000000000000000000000000000000038
 :1008C0000000000000000000000000000000000028
 :1008D0000000000000000000000000000000000018
-:1008E0000000000000000000000000000000000008
-:1008F00000000000120000EE18F011EE18F021EEDA
-:1009000000F0E9CF59F0E2CF5BF0E1CF5AF0D9CF58
-:100910005CF0526A180E586E00EE00F010EE55F0C2
-:100920005168556A566A576A010E5D6E546E5E6A6A
-:100930005E2A190E5E6021D0180E585C03E0EF505D
-:10094000526013D0EF50516204D05450E7125D2A28
-:100950000CD0516001D009D0EF50516E556A566AE3
-:10096000576A010E5D6E5450E712D8905436D8A0E5
-:1009700002D05436E12AE92ADBD75150526E59C0D1
-:10098000E9FF5BC0E2FF5AC0E1FF5CC0D9FF51C084
-:10099000EEFF55C0E6FF56C0E6FF57C0E6FF5DC05C
-:1009A000DEFFE9CF59F0E2CF5BF0E1CF5AF0D9CFCB
-:0809B0005CF0582EB1D71200D3
+:1008E00000000000000000000000120000EE18F000
+:1008F00011EE18F021EE00F0E9CF59F0E2CF5BF0F5
+:10090000E1CF5AF0D9CF5CF0526A180E586E00EE63
+:1009100000F010EE55F05168556A566A576A010E9C
+:100920005D6E546E5E6A5E2A190E5E6021D0180EEE
+:10093000585C03E0EF50526013D0EF50516204D086
+:100940005450E7125D2A0CD0516001D009D0EF500D
+:10095000516E556A566A576A010E5D6E5450E71221
+:10096000D8905436D8A002D05436E12AE92ADBD7F1
+:100970005150526E59C0E9FF5BC0E2FF5AC0E1FF1F
+:100980005CC0D9FF51C0EEFF55C0E6FF56C0E6FF80
+:1009900057C0E6FF5DC0DEFFE9CF59F0E2CF5BF064
+:0E09A000E1CF5AF0D9CF5CF0582EB1D712003B
 :020000040030CA
 :04000000FFFEFDFE04
 :080006007AFFFFC0FFE0FF409C