Skip to content

Commit

Permalink
still bug with merge
Browse files Browse the repository at this point in the history 
conflicts with merge due to
those 2 files :
- ardublock properties
- mapping ardublock
  • Loading branch information
@karlTH
karlTH committed Jul 29, 2014
1 parent 7fe13fc commit 7f5974b
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 49 deletions.
27 changes: 26 additions & 1 deletion src/main/resources/com/ardublock/block/ardublock.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ bg.string_compareTo=compareTo

bg.code_head=add code on Head
bg.code_setup=add code on Setup
bg.setter_variable_String=set String variable
bg.setter_variable_String.description=set String variable
bg.variable_String=String variable
bg.variable_String.description=String variable
bg.code_loop=add code on Loop
bg.serial_read=serial read
bd.especial=Especial
Expand Down Expand Up @@ -399,7 +403,8 @@ ardublock.error_msg.double_number_var_slot=variable slot must take a 'Decimal' v
ardublock.error_msg.char_var_slot=Char variable slot must take a char variable name.\nHint: Look at the 'variable' socket on the highlighted block
ardublock.error_msg.array_var_slot='Array variable' slot must take an 'array variable' name.\nHint: Look at the 'variable' socket on the highlighted block
ardublock.error_msg.array_size_slot='Array size' slot must take a standard integer constant

ardublock.error_msg.string_var_slot=String variable slot must take a String variable name.\nHint: Look at the 'variable' socket on the highlighted block

ardublock.translator.exception.subroutineNameDuplicated=two or more subroutines have the same name!
ardublock.translator.exception.noLoopFound=No loop found!
ardublock.translator.exception.multipleLoopFound=multiple loop block found!
Expand Down Expand Up @@ -707,6 +712,12 @@ bg.keyboard=keyboard
bg.keyboard.description=keyboard
bg.keyboard_post=keyboard post
bg.keyboard_post.description=keyboard post
bg.DuinoEDU_Mouse_Init=Init Mouse
bg.DuinoEDU_Mouse_Init.description= Initialisation of the mouse
bg.DuinoEDU_Mouse_Xmove= Mouse X Move
bg.DuinoEDU_Mouse_Xmove.description= Mouse X Move
bg.DuinoEDU_Mouse_Ymove=Mouse Y Move
bg.DuinoEDU_Mouse_Ymove.description= Mouse Y Move
bg.DuinoEDU_Keypad_12_Button=Keypad 12 Button
bg.DuinoEDU_Keypad_12_Button.description=Keypad 12 Button
bg.DuinoEDU_Keypad_Post=Keypad Post
Expand All @@ -731,6 +742,10 @@ bg.DuinoEDU_Driver_I2C_Back=Back
bg.DuinoEDU_Driver_I2C_Back.description=Driver I2C Back
bg.DuinoEDU_Driver_I2C_Pivoter=Pivote
bg.DuinoEDU_Driver_I2C_Pivoter.description=Driver I2C Pivote
bg.DuinoEDU_Driver_I2C_Speed_A_Motor=Speed A Motor
bg.DuinoEDU_Driver_I2C_Speed_A_Motor.description=fixe the speed of the motor between 1 and 1000
bg.DuinoEDU_Driver_I2C_Speed_B_Motor=Speed B Motor
bg.DuinoEDU_Driver_I2C_Speed_B_Motor.description=fixe the speed of the motor between 1 and 1000
bg.DuinoEDU_right=Right
bg.DuinoEDU_straight=Straight
bg.DuinoEDU_left=Left
Expand All @@ -750,6 +765,16 @@ bg.DuinoEDU_Partie_Emetteur=Emetteur
bg.DuinoEDU_Partie_Emetteur.description=Emetteur
bg.DuinoEDU_Partie_Recepteur=Recepteur
bg.DuinoEDU_Partie_Recepteur.description=Recepteur
bg.DuinoEDU_Rfid_Write=Rfid save code
bg.DuinoEDU_Rfid_Write.description=Save in Ram the code
bg.DuinoEDU_Rfid_Test=Rfid Test
bg.DuinoEDU_Rfid_Test.description= compare the code with the list in the ram
bg.DuinoEDU_Rfid_Read=Rfid Read
bg.DuinoEDU_Rfid_Read.description=Read a badge
bg.DuinoEDU_Rfid_Clear=Rfid clear
bg.DuinoEDU_Rfid_Clear.description=Clear the liste of codes in Ram
bg.DuinoEDU_Rfid_Ram_List=Rfid Ram List
bg.DuinoEDU_Rfid_Ram_List.description=Create a liste of code in Ram
bc.DuinoEDU_Brightness=Brightness
bc.DuinoEDU_Display=Display
bg.DuinoEDU_On_digit1=1
Expand Down
96 changes: 48 additions & 48 deletions src/main/resources/com/ardublock/block/block-mapping.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,56 +317,56 @@ seeed_relay=digitalOutput


#DuinoEDU
DuinoEDU_infrared=com.ardublock.translator.block.DuinoEDU.Infrared
DuinoEDU_humi=com.ardublock.translator.block.DuinoEDU.Humi
DuinoEDU_temp=com.ardublock.translator.block.DuinoEDU.Temp
DuinoEDU_humiPro=com.ardublock.translator.block.DuinoEDU.HumiPro
DuinoEDU_tempPro=com.ardublock.translator.block.DuinoEDU.TempPro
DuinoEDU_Led_Bar=com.ardublock.translator.block.DuinoEDU.Led_Bar
DuinoEDU_LCD_I2C_RGB=com.ardublock.translator.block.DuinoEDU.LCD_I2C_RGB
DuinoEDU_LCD_I2C_Backlight=com.ardublock.translator.block.DuinoEDU.LCD_I2C_Backlight
DuinoEDU_LCD_I2C_RGB_Clear=com.ardublock.translator.block.DuinoEDU.LCD_I2C_RGB_Clear
DuinoEDU_infrared=com.ardublock.translator.block.Duinoedu.Infrared
DuinoEDU_humi=com.ardublock.translator.block.Duinoedu.Humi
DuinoEDU_temp=com.ardublock.translator.block.Duinoedu.Temp
DuinoEDU_humiPro=com.ardublock.translator.block.Duinoedu.HumiPro
DuinoEDU_tempPro=com.ardublock.translator.block.Duinoedu.TempPro
DuinoEDU_Led_Bar=com.ardublock.translator.block.Duinoedu.Led_Bar
DuinoEDU_LCD_I2C_RGB=com.ardublock.translator.block.Duinoedu.LCD_I2C_RGB
DuinoEDU_LCD_I2C_Backlight=com.ardublock.translator.block.Duinoedu.LCD_I2C_Backlight
DuinoEDU_LCD_I2C_RGB_Clear=com.ardublock.translator.block.Duinoedu.LCD_I2C_RGB_Clear
keyboard=com.ardublock.translator.block.KeyboardBlock
keyboard_post=com.ardublock.translator.block.Keyboard_PostBlock
DuinoEDU_Mouse_Init=com.ardublock.translator.block.DuinoEDU.Mouse_Init
DuinoEDU_Mouse_Xmove=com.ardublock.translator.block.DuinoEDU.Mouse_Xmove
DuinoEDU_Mouse_Ymove=com.ardublock.translator.block.DuinoEDU.Mouse_Ymove
DuinoEDU_Keypad_12_Button=com.ardublock.translator.block.DuinoEDU.Keypad_12_Button
DuinoEDU_Keypad_Post=com.ardublock.translator.block.DuinoEDU.Keypad_Post
DuinoEDU_Keypad_Pwd=com.ardublock.translator.block.DuinoEDU.Keypad_Pwd
DuinoEDU_Digital_Tube=com.ardublock.translator.block.DuinoEDU.Digital_Tube
DuinoEDU_Digital_Clear=com.ardublock.translator.block.DuinoEDU.Digital_Clear
DuinoEDU_Display_Digital_Tube=com.ardublock.translator.block.DuinoEDU.Digital_Tube_Display
DuinoEDU_Display_Digital_Tube2=com.ardublock.translator.block.DuinoEDU.Digital_Tube_Display2
DuinoEDU_Oled_I2C=com.ardublock.translator.block.DuinoEDU.Oled_I2C
DuinoEDU_Oled_Clear=com.ardublock.translator.block.DuinoEDU.Oled_Clear
DuinoEDU_Driver_I2C_Forward=com.ardublock.translator.block.DuinoEDU.Driver_I2C_Forward
DuinoEDU_Driver_I2C_Back=com.ardublock.translator.block.DuinoEDU.Driver_I2C_Back
DuinoEDU_Driver_I2C_Pivoter=com.ardublock.translator.block.DuinoEDU.Driver_I2C_Pivoter
DuinoEDU_Driver_I2C_Speed_A_Motor=com.ardublock.translator.block.DuinoEDU.Driver_I2C_Speed_A_Motor
DuinoEDU_Driver_I2C_Speed_B_Motor=com.ardublock.translator.block.DuinoEDU.Driver_I2C_Speed_B_Motor
DuinoEDU_right=com.ardublock.translator.block.DuinoEDU.Driver_Right
DuinoEDU_straight=com.ardublock.translator.block.DuinoEDU.Driver_Straight
DuinoEDU_left=com.ardublock.translator.block.DuinoEDU.Driver_Left
DuinoEDU_Aix_Acc_mesurerX=com.ardublock.translator.block.DuinoEDU.Acc_mesurerX
DuinoEDU_Aix_Acc_mesurerY=com.ardublock.translator.block.DuinoEDU.Acc_mesurerY
DuinoEDU_Aix_Acc_mesurerZ=com.ardublock.translator.block.DuinoEDU.Acc_mesurerZ
DuinoEDU_Aix_Acc_mesurerXYZ=com.ardublock.translator.block.DuinoEDU.Acc_mesurerXYZ
DuinoEDU_Aix_Acc_mesurerVariation=com.ardublock.translator.block.DuinoEDU.Acc_mesurerVariation
DuinoEDU_Ultrasonic=com.ardublock.translator.block.DuinoEDU.Ultrasonic
DuinoEDU_Partie_Emetteur=com.ardublock.translator.block.DuinoEDU.Partie_Emetteur
DuinoEDU_Partie_Recepteur=com.ardublock.translator.block.DuinoEDU.Partie_Recepteur
DuinoEDU_On_digit1=com.ardublock.translator.block.DuinoEDU.OutputPortBlock
DuinoEDU_On_digit2=com.ardublock.translator.block.DuinoEDU.OutputPortBlock
DuinoEDU_On_digit3=com.ardublock.translator.block.DuinoEDU.OutputPortBlock
DuinoEDU_On_digit4=com.ardublock.translator.block.DuinoEDU.OutputPortBlock
DuinoEDU_setSerialInfosOn=com.ardublock.translator.block.DuinoEDU.SetSerialInfosOn
DuinoEDU_setSerialInfosOff=com.ardublock.translator.block.DuinoEDU.SetSerialInfosOff
DuinoEDU_Rfid_Write=com.ardublock.translator.block.DuinoEDU.Rfid_Write
DuinoEDU_Rfid_Test=com.ardublock.translator.block.DuinoEDU.Rfid_Test
DuinoEDU_Rfid_Read=com.ardublock.translator.block.DuinoEDU.Rfid_Read
DuinoEDU_Rfid_Clear=com.ardublock.translator.block.DuinoEDU.Rfid_Clear
DuinoEDU_Rfid_Ram_List=com.ardublock.translator.block.DuinoEDU.Rfid_Ram_List
DuinoEDU_Mouse_Init=com.ardublock.translator.block.Duinoedu.Mouse_Init
DuinoEDU_Mouse_Xmove=com.ardublock.translator.block.Duinoedu.Mouse_Xmove
DuinoEDU_Mouse_Ymove=com.ardublock.translator.block.Duinoedu.Mouse_Ymove
DuinoEDU_Keypad_12_Button=com.ardublock.translator.block.Duinoedu.Keypad_12_Button
DuinoEDU_Keypad_Post=com.ardublock.translator.block.Duinoedu.Keypad_Post
DuinoEDU_Keypad_Pwd=com.ardublock.translator.block.Duinoedu.Keypad_Pwd
DuinoEDU_Digital_Tube=com.ardublock.translator.block.Duinoedu.Digital_Tube
DuinoEDU_Digital_Clear=com.ardublock.translator.block.Duinoedu.Digital_Clear
DuinoEDU_Display_Digital_Tube=com.ardublock.translator.block.Duinoedu.Digital_Tube_Display
DuinoEDU_Display_Digital_Tube2=com.ardublock.translator.block.Duinoedu.Digital_Tube_Display2
DuinoEDU_Oled_I2C=com.ardublock.translator.block.Duinoedu.Oled_I2C
DuinoEDU_Oled_Clear=com.ardublock.translator.block.Duinoedu.Oled_Clear
DuinoEDU_Driver_I2C_Forward=com.ardublock.translator.block.Duinoedu.Driver_I2C_Forward
DuinoEDU_Driver_I2C_Back=com.ardublock.translator.block.Duinoedu.Driver_I2C_Back
DuinoEDU_Driver_I2C_Pivoter=com.ardublock.translator.block.Duinoedu.Driver_I2C_Pivoter
DuinoEDU_Driver_I2C_Speed_A_Motor=com.ardublock.translator.block.Duinoedu.Driver_I2C_Speed_A_Motor
DuinoEDU_Driver_I2C_Speed_B_Motor=com.ardublock.translator.block.Duinoedu.Driver_I2C_Speed_B_Motor
DuinoEDU_right=com.ardublock.translator.block.Duinoedu.Driver_Right
DuinoEDU_straight=com.ardublock.translator.block.Duinoedu.Driver_Straight
DuinoEDU_left=com.ardublock.translator.block.Duinoedu.Driver_Left
DuinoEDU_Aix_Acc_mesurerX=com.ardublock.translator.block.Duinoedu.Acc_mesurerX
DuinoEDU_Aix_Acc_mesurerY=com.ardublock.translator.block.Duinoedu.Acc_mesurerY
DuinoEDU_Aix_Acc_mesurerZ=com.ardublock.translator.block.Duinoedu.Acc_mesurerZ
DuinoEDU_Aix_Acc_mesurerXYZ=com.ardublock.translator.block.Duinoedu.Acc_mesurerXYZ
DuinoEDU_Aix_Acc_mesurerVariation=com.ardublock.translator.block.Duinoedu.Acc_mesurerVariation
DuinoEDU_Ultrasonic=com.ardublock.translator.block.Duinoedu.Ultrasonic
DuinoEDU_Partie_Emetteur=com.ardublock.translator.block.Duinoedu.Partie_Emetteur
DuinoEDU_Partie_Recepteur=com.ardublock.translator.block.Duinoedu.Partie_Recepteur
DuinoEDU_On_digit1=com.ardublock.translator.block.Duinoedu.OutputPortBlock
DuinoEDU_On_digit2=com.ardublock.translator.block.Duinoedu.OutputPortBlock
DuinoEDU_On_digit3=com.ardublock.translator.block.Duinoedu.OutputPortBlock
DuinoEDU_On_digit4=com.ardublock.translator.block.Duinoedu.OutputPortBlock
DuinoEDU_setSerialInfosOn=com.ardublock.translator.block.Duinoedu.SetSerialInfosOn
DuinoEDU_setSerialInfosOff=com.ardublock.translator.block.Duinoedu.SetSerialInfosOff
DuinoEDU_Rfid_Write=com.ardublock.translator.block.Duinoedu.Rfid_Write
DuinoEDU_Rfid_Test=com.ardublock.translator.block.Duinoedu.Rfid_Test
DuinoEDU_Rfid_Read=com.ardublock.translator.block.Duinoedu.Rfid_Read
DuinoEDU_Rfid_Clear=com.ardublock.translator.block.Duinoedu.Rfid_Clear
DuinoEDU_Rfid_Ram_List=com.ardublock.translator.block.Duinoedu.Rfid_Ram_List
#Panda
panda_i0=com.ardublock.translator.block.panda.PandaInputPortBlock
panda_i1=com.ardublock.translator.block.panda.PandaInputPortBlock
Expand Down

0 comments on commit 7f5974b

Please sign in to comment.