diff --git a/compiled/controllino/firmware.hex b/compiled/controllino/firmware.hex index 3a47a9c..546e380 100644 --- a/compiled/controllino/firmware.hex +++ b/compiled/controllino/firmware.hex @@ -131,8 +131,8 @@ :10082000584F46462C544F47474C4500656E756DF2 :1008300000666C6F617400322E312E300024686FB8 :100840006D696500757074696D652C6672656568A3 -:1008500065617000333534326261315F3230313975 -:100860002D30362D3236004C696768744875622029 +:1008500065617000653666386533665F3230313900 +:100860002D30362D3237004C696768744875622028 :1008700000246E616D650072656164790020747298 :100880007920616761696E20696E20352073656328 :100890006F6E6473006661696C65642C2072633DE1 @@ -247,8 +247,8 @@ :100F6000295741544348444F47000A282B29434FEF :100F70004E54524F4C4C494E4F0032303131303389 :100F80004C0020432B2B2076657273696F6E3A00FC -:100F9000333534326261315F323031392D30362DA4 -:100FA0003236000A4C617A79686F6D652E72752051 +:100F9000653666386533665F323031392D30362D2F +:100FA0003237000A4C617A79686F6D652E72752050 :100FB0004C6967687448756220636F6E74726F6CF9 :100FC0006C65722000000020002300260029002C00 :100FD000002F003200000100000301060109013D5D @@ -2173,9 +2173,9 @@ :1087C00078002091790090E03C01722A0115110592 :1087D00009F44FC1F8018085853009F04AC1C8010C :1087E0000E9484696A968FAF6A97843008F460C0EB -:1087F00063E0C8010E94DA64FC0181859285F4E699 +:1087F00063E0C8010E94DA64FC0181859285FAE099 :10880000F89F6001F99FD00C112462E0C8010E941A -:10881000DA64FC0181859285F4E6F89F7001F99F86 +:10881000DA64FC0181859285FAE0F89F7001F99F86 :10882000F00C112447010F2C000CAA08BB0861E0D2 :10883000C8010E94DA646C969FAF8EAF6C9760E0BF :10884000C8010E94DA64FC01218432844384548488 @@ -2185,8 +2185,8 @@ :108880006C96EEADFFAD6C9721853285438554859E :1088900022193309440955090E94F68C820E931E51 :1088A000A41EB51E6A96FFAD6A97F53081F412C01A -:1088B00024E6269D4001279D900C1124092C000CD4 -:1088C000AA08BB08E12CF12CC12C40E9D42E81E090 +:1088B0002AE0269D4001279D900C1124092C000CD4 +:1088C000AA08BB08E12CF12CC12C48E2D42E81E08F :1088D00090E007C064E0C8010E94DA64FC01818571 :1088E0009285A6010D2C000C660B770B841695065D :1088F000A606B70614F4B501A40147010F2C000C1D @@ -2213,7 +2213,7 @@ :108A4000679782819381092E000CAA0BBB0B8815B6 :108A50009905AA05BB0541F1B401CE018F5A9F4F7C :108A60000E94EC226796EEADFFAD679793828282FB -:108A70001BC0E12CF12CC12C80E9D82E81E090E0C4 +:108A70001BC0E12CF12CC12C88E2D82E81E090E0C3 :108A80006796EEADFFAD679722813381A301421B4C :108A9000530B9A0157FF03C0319521953109821775 :108AA00093070CF0CCC011826796EEADFFAD6797CF @@ -2221,7 +2221,7 @@ :108AC0009905AA05BB0551F00D2C000CEE08FF0816 :108AD000C814D904EA04FB0409F0C5CD828193814E :108AE0008615970509F4BFCDC501B4010E94918B8D -:108AF00020E030E048EC52E40E94EA8D1B012C019A +:108AF00020E030E040E251E40E94EA8D1B012C01AD :108B000065961FAD659761EE7FE08DEA9AE00E9461 :108B10001A6B4AE050E0612F8DEA9AE00E94EB6BFD :108B20006FED7FE08DEA9AE00E941A6B22E0B201BD diff --git a/compiled/due-5100/firmware.bin b/compiled/due-5100/firmware.bin index 14de84f..e95f6f1 100644 Binary files a/compiled/due-5100/firmware.bin and b/compiled/due-5100/firmware.bin differ diff --git a/compiled/due-5500/firmware.bin b/compiled/due-5500/firmware.bin index 3f667e2..aea680f 100644 Binary files a/compiled/due-5500/firmware.bin and b/compiled/due-5500/firmware.bin differ diff --git a/compiled/esp32-wifi/firmware.bin b/compiled/esp32-wifi/firmware.bin index 4077990..bef5e49 100644 Binary files a/compiled/esp32-wifi/firmware.bin and b/compiled/esp32-wifi/firmware.bin differ diff --git a/compiled/esp8266-wifi/firmware.bin b/compiled/esp8266-wifi/firmware.bin index b8d41c5..ca4f502 100644 Binary files a/compiled/esp8266-wifi/firmware.bin and b/compiled/esp8266-wifi/firmware.bin differ diff --git a/compiled/lighthub21/firmware.bin b/compiled/lighthub21/firmware.bin index 3083866..0d4fb19 100644 Binary files a/compiled/lighthub21/firmware.bin and b/compiled/lighthub21/firmware.bin differ diff --git a/compiled/m5stack/firmware.bin b/compiled/m5stack/firmware.bin index b514d14..8dab407 100644 Binary files a/compiled/m5stack/firmware.bin and b/compiled/m5stack/firmware.bin differ diff --git a/compiled/mega2560-5100/firmware.hex b/compiled/mega2560-5100/firmware.hex index 4affeae..bbc7a13 100644 --- a/compiled/mega2560-5100/firmware.hex +++ b/compiled/mega2560-5100/firmware.hex @@ -130,8 +130,8 @@ :100810002C524553542C584F4E2C584F46462C546E :100820004F47474C4500656E756D00666C6F61748F :1008300000322E312E300024686F6D6965007570AE -:1008400074696D652C667265656865617000333525 -:1008500034326261315F323031392D30362D3236EB +:1008400074696D652C6672656568656170006536F2 +:1008500066386533665F323031392D30362D3237A8 :10086000004C696768744875622000246E616D658C :100870000072656164790020747279206167616932 :100880006E20696E2035207365636F6E6473006639 @@ -274,8 +274,8 @@ :10111000686F6D652E7275000A436F6E6669672091 :101120007365727665723A000A282B295741544339 :1011300048444F47003230313130334C0020432B8C -:101140002B2076657273696F6E3A003335343262E4 -:1011500061315F323031392D30362D3236000A4C54 +:101140002B2076657273696F6E3A00653666386576 +:1011500033665F323031392D30362D3237000A4C4C :10116000617A79686F6D652E7275204C6967687455 :1011700048756220636F6E74726F6C6C65722000CC :1011800000002100240027002A002D003000330039 @@ -1333,9 +1333,9 @@ :105340003C01722A0115110509F451C1F80180854B :10535000853009F04CC1C8010E94343D6A968FAF78 :105360006A97843008F460C063E0C8010E949B39EA -:10537000FC0181859285F4E6F89F6001F99FD00CCD +:10537000FC0181859285FAE0F89F6001F99FD00CCD :10538000112462E0C8010E949B39FC01818592854D -:10539000F4E6F89F7001F99FF00C112447010F2CDF +:10539000FAE0F89F7001F99FF00C112447010F2CDF :1053A000000CAA08BB0861E0C8010E949B396C96FA :1053B0009FAF8EAF6C9760E0C8010E949B39FC01E3 :1053C0002184328443845484C301072C000CAA0B2B @@ -1344,9 +1344,9 @@ :1053F0008A099B090E949B836C96EEADFFAD6C976A :10540000218532854385548522193309440955097C :105410000E94CD83820E931EA41EB51E6A96FFAD18 -:105420006A97F53081F412C024E6269D4001279D3D +:105420006A97F53081F412C02AE0269D4001279D3D :10543000900C1124092C000CAA08BB08E12CF12CBB -:10544000C12C20E9D22E81E090E007C064E0C801C1 +:10544000C12C28E2D22E81E090E007C064E0C801C0 :105450000E949B39FC018185928516010D2C000C60 :1054600044085508B501A401281439044A045B0412 :1054700014F4B201A10147010F2C000CAA08BB08CB @@ -1373,7 +1373,7 @@ :1055C0009381092E000CAA0BBB0B88159905AA051F :1055D000BB0541F1B401CE018F5A9F4F0E948C222E :1055E0006796EEADFFAD6797938282821BC0E12C78 -:1055F000F12CC12C80E9D82E81E090E06796EEADC9 +:1055F000F12CC12C88E2D82E81E090E06796EEADC8 :10560000FFAD679722813381A301421B530B9A019F :1056100057FF03C0319521953109821793070CF08C :10562000CCC011826796EEADFFAD67978181853062 @@ -1381,7 +1381,7 @@ :10564000BB0551F00D2C000CEE08FF08C814D9045E :10565000EA04FB0409F0EECD82819381861597055B :1056600009F4E8CDC501B4010E94708520E030E066 -:1056700048EC52E40E94C6841B012C0165961FADC4 +:1056700040E251E40E94C6841B012C0165961FADD7 :10568000659768E67AE088EC98E00E94A6604AE0B8 :1056900050E0612F88EC98E00E94776166E67AE03E :1056A00088EC98E00E94A66022E0B201A10188EC9B diff --git a/compiled/mega2560-5500/firmware.hex b/compiled/mega2560-5500/firmware.hex index 9b712ae..5dbfd68 100644 --- a/compiled/mega2560-5500/firmware.hex +++ b/compiled/mega2560-5500/firmware.hex @@ -130,8 +130,8 @@ :100810002C524553542C584F4E2C584F46462C546E :100820004F47474C4500656E756D00666C6F61748F :1008300000322E312E300024686F6D6965007570AE -:1008400074696D652C667265656865617000333525 -:1008500034326261315F323031392D30362D3236EB +:1008400074696D652C6672656568656170006536F2 +:1008500066386533665F323031392D30362D3237A8 :10086000004C696768744875622000246E616D658C :100870000072656164790020747279206167616932 :100880006E20696E2035207365636F6E6473006639 @@ -275,8 +275,8 @@ :101120006F6D652E7275000A436F6E666967207376 :1011300065727665723A000A282B29574154434854 :10114000444F47003230313130334C0020432B2B99 -:101150002076657273696F6E3A003335343262619E -:10116000315F323031392D30362D3236000A4C6144 +:101150002076657273696F6E3A006536663865335E +:10116000665F323031392D30362D3237000A4C610E :101170007A79686F6D652E7275204C69676874485E :10118000756220636F6E74726F6C6C657220000004 :10119000002100240027002A002D00300033000128 @@ -1334,8 +1334,8 @@ :10535000722A0115110509F451C1F80180858530C3 :1053600009F04CC1C8010E943B3D6A968FAF6A9715 :10537000843008F460C063E0C8010E94A239FC01D7 -:1053800081859285F4E6F89F6001F99FD00C112485 -:1053900062E0C8010E94A239FC0181859285F4E691 +:1053800081859285FAE0F89F6001F99FD00C112485 +:1053900062E0C8010E94A239FC0181859285FAE091 :1053A000F89F7001F99FF00C112447010F2C000C9D :1053B000AA08BB0861E0C8010E94A2396C969FAFA1 :1053C0008EAF6C9760E0C8010E94A239FC01218475 @@ -1345,9 +1345,9 @@ :105400009B090E94A8836C96EEADFFAD6C97218539 :1054100032854385548522193309440955090E9470 :10542000DA83820E931EA41EB51E6A96FFAD6A979C -:10543000F53081F412C024E6269D4001279D900C92 +:10543000F53081F412C02AE0269D4001279D900C92 :105440001124092C000CAA08BB08E12CF12CC12C5A -:1054500020E9D22E81E090E007C064E0C8010E94FC +:1054500028E2D22E81E090E007C064E0C8010E94FB :10546000A239FC018185928516010D2C000C44089F :105470005508B501A401281439044A045B0414F446 :10548000B201A10147010F2C000CAA08BB08841629 @@ -1374,15 +1374,15 @@ :1055D000092E000CAA0BBB0B88159905AA05BB0563 :1055E00041F1B401CE018F5A9F4F0E9493226796DA :1055F000EEADFFAD6797938282821BC0E12CF12C48 -:10560000C12C80E9D82E81E090E06796EEADFFAD29 +:10560000C12C88E2D82E81E090E06796EEADFFAD28 :10561000679722813381A301421B530B9A0157FFE5 :1056200003C0319521953109821793070CF0CCC046 :1056300011826796EEADFFAD6797818185309CF052 :10564000C701FF0CAA0BBB0B88159905AA05BB0562 :1056500051F00D2C000CEE08FF08C814D904EA0420 :10566000FB0409F0EECD828193818615970509F43C -:10567000E8CDC501B4010E947D8520E030E048EC12 -:1056800052E40E94D3841B012C0165961FAD6597DF +:10567000E8CDC501B4010E947D8520E030E040E224 +:1056800051E40E94D3841B012C0165961FAD6597E0 :1056900068E67AE088EC98E00E94B3604AE050E067 :1056A000612F88EC98E00E94846166E67AE088ECDD :1056B00098E00E94B36022E0B201A10188EC98E07A diff --git a/compiled/mega2560slim-5100/firmware.hex b/compiled/mega2560slim-5100/firmware.hex index 5bfba7c..1ef2509 100644 --- a/compiled/mega2560slim-5100/firmware.hex +++ b/compiled/mega2560slim-5100/firmware.hex @@ -109,8 +109,8 @@ :1006C0002C584F46462C544F47474C4500656E7595 :1006D0006D00666C6F617400322E312E300024681C :1006E0006F6D696500757074696D652C66726565FE -:1006F0006865617000333534326261315F323031A8 -:10070000392D30362D3236004C6967687448756271 +:1006F0006865617000653666386533665F32303133 +:10070000392D30362D3237004C6967687448756270 :100710002000246E616D650072656164790020744B :10072000727920616761696E20696E20352073657A :10073000636F6E6473006661696C65642C2072631C @@ -193,8 +193,8 @@ :100C0000652E7275000A436F6E66696720736572A0 :100C10007665723A000A282B295741544348444FBD :100C200047003230313130334C0020432B2B2076BB -:100C3000657273696F6E3A00333534326261315FC9 -:100C4000323031392D30362D3236000A4C617A7906 +:100C3000657273696F6E3A00653666386533665F54 +:100C4000323031392D30362D3237000A4C617A7905 :100C5000686F6D652E7275204C696768744875629F :100C600020636F6E74726F6C6C65722000000020E0 :100C7000002300260029002C002F00320000010074 @@ -1424,7 +1424,7 @@ :1058F000382A0115110509F451C1F8018085853058 :1059000009F04CC1C8010E9422446A968FAF6A9781 :10591000843008F460C063E0C8010E948040FC014C -:105920008185928534E6A32EA89E6001A99ED00CA5 +:10592000818592853AE0A32EA89E6001A99ED00CA5 :10593000112462E0C8010E948040FC0181859285AB :10594000A89E7001A99EF00C112427010F2C000CB9 :105950006608770861E0C8010E9480406F969FAF9B @@ -1435,9 +1435,9 @@ :1059A00097090E9454786F96EEADFFAD6F972185F1 :1059B000328543855485281939094A095B090E94B3 :1059C0008678420E531E641E751E6A96FFAD6A9756 -:1059D000F53081F412C084E6829D2001839D500C35 +:1059D000F53081F412C08AE0829D2001839D500C35 :1059E0001124052C000C66087708E12CF12CC12C41 -:1059F00020E9D22E81E090E007C064E0C8010E9457 +:1059F00028E2D22E81E090E007C064E0C8010E9456 :105A00008040FC018185928546010D2C000CAA087E :105A1000BB08B301A20184149504A604B70414F4CE :105A2000B501A40127010F2C000C66087708441665 @@ -1464,15 +1464,15 @@ :105B7000092E000CAA0BBB0B84159505A605B705CD :105B800041F1B201CE018F5A9F4F0E947D2167964D :105B9000EEADFFAD6797538242821BC0E12CF12C22 -:105BA000C12C80E9D82E81E090E06796EEADFFAD84 +:105BA000C12C88E2D82E81E090E06796EEADFFAD83 :105BB000679722813381A101421B530B9A0157FF42 :105BC00003C0319521953109821793070CF041C12B :105BD00011826796EEADFFAD6797818185309CF0AD :105BE000C701FF0CAA0BBB0B84159505A605B705CD :105BF00051F00D2C000CEE08FF08C414D504E60487 :105C0000F70409F0EBCD828193818215930509F4A5 -:105C1000E5CDC301B2010E94017A20E030E048ECFA -:105C200052E40E9457796B017C0165961FAD659720 +:105C1000E5CDC301B2010E94017A20E030E040E20C +:105C200051E40E9457796B017C0165961FAD659721 :105C300069E87CE084EC97E00E94A25C612F84EC30 :105C400097E00E94A84067E87CE084EC97E00E941F :105C5000A25C22E0B701A60184EC97E00E948A28AA diff --git a/compiled/nrf52840-5500/firmware.hex b/compiled/nrf52840-5500/firmware.hex index 9727db1..2ba3c44 100644 --- a/compiled/nrf52840-5500/firmware.hex +++ b/compiled/nrf52840-5500/firmware.hex @@ -182,16 +182,16 @@ :100B500006F083FD032850D900222946504806F0AC :100B600084FD012244694E48294606F07EFD02229A :100B7000D0F814A04A48294606F077FD4369484852 -:100B800064270322294607FB03F906F06EFD43693B +:100B80000A270322294607FB03F906F06EFD436995 :100B90005F43214600974B465246404608F081F994 :100BA000044629463E4806F058FD05282DD104226A :100BB00029463B4806F059FDB0F914A03848BC421C :100BC000A8BF3C464C452946B8BF4C4606F045FDFB :100BD000022826D100222946314806F046FD436905 :100BE000A3422EDC012229462D4806F03EFD436932 -:100BF000A34250DB02B0BDE8F087642418FB04F484 -:100C00004FF000094FF4C837CBE74FF0010AD5E7A2 -:100C10000023537021E04FF000094FF4C8374FF024 +:100BF000A34250DB02B0BDE8F08708EB8804640034 +:100C00004FF000094FF42057CBE74FF0010AD5E72A +:100C10000023537021E04FF000094FF420574FF0AC :100C2000010AB268B2F90230A8EB0303002BB8BF87 :100C30005B425345ECDC92F90130052B0DDC0133AE :100C4000E7E70024B368B3F90230A34205D0214698 @@ -200,7 +200,7 @@ :100C70004345BFD0204609F0A3FE0A4B00220AF0EC :100C800033F80AF0FFF901463046FFF7D7FDB368A5 :100C9000A3F80280AEE70124D4E700BF48EA0000D1 -:100CA000440500200000594008B50246FFF71EFC2D +:100CA000440500200000244008B50246FFF71EFC62 :100CB00010B94FF0FF3008BD012908D00229FAD140 :100CC0001379042BF7D11046FFF7B0FCF3E7137943 :100CD000402B08D005D8032BEDD81046FFF7E4FED3 @@ -3868,8 +3868,8 @@ :10F1B0006464726573733A00454550524F4D206345 :10F1C0006C65617265640A000A4C617A79686F6DDA :10F1D000652E7275204C6967687448756220636F8C -:10F1E0006E74726F6C6C65722000333534326261FC -:10F1F000315F323031392D30362D32360020432BFD +:10F1E0006E74726F6C6C65722000653666386533BC +:10F1F000665F323031392D30362D32370020432BC7 :10F200002B2076657273696F6E3A0032303131307F :10F21000334C000A282D295741544348444F470096 :10F220000A436F6E666967207365727665723A008D @@ -3920,8 +3920,8 @@ :10F4F0007200666C6F61740024686F6D696500242A :10F500006E6F646573007265616479002473746161 :10F510007465002473746174730024666F726D6186 -:10F520007400757074696D65003335343262613111 -:10F530005F323031392D30362D3236004C696768F4 +:10F520007400757074696D6500653666386533669C +:10F530005F323031392D30362D3237004C696768F3 :10F540007448756220004453323438325F313030B1 :10F550005F4932435F544F5F31575F4252494447DE :10F560004520696E6974004453323438322D31308D diff --git a/compiled/stm32-enc2860/firmware.bin b/compiled/stm32-enc2860/firmware.bin index 75fef1d..17719a5 100644 Binary files a/compiled/stm32-enc2860/firmware.bin and b/compiled/stm32-enc2860/firmware.bin differ diff --git a/lighthub/inputs.cpp b/lighthub/inputs.cpp index 346e9a5..dbe4f0a 100644 --- a/lighthub/inputs.cpp +++ b/lighthub/inputs.cpp @@ -450,12 +450,12 @@ void Input::contactPoll() { void Input::analogPoll() { int16_t inputVal; - int32_t mappedInputVal; // 100x inputVal + int32_t mappedInputVal; // 10x inputVal aJsonObject *inputMap = aJson.getObjectItem(inputObj, "map"); int16_t Noize = ANALOG_NOIZE; short simple = 0; uint32_t inputPinMode; - int max=1024*100; + int max=1024*10; int min=0; @@ -474,9 +474,9 @@ void Input::analogPoll() { mappedInputVal = map (inputVal, aJson.getArrayItem(inputMap, 0)->valueint, aJson.getArrayItem(inputMap, 1)->valueint, - min=aJson.getArrayItem(inputMap, 2)->valueint*100, - max=aJson.getArrayItem(inputMap, 3)->valueint*100); - else mappedInputVal = inputVal*100; + min=aJson.getArrayItem(inputMap, 2)->valueint*10, + max=aJson.getArrayItem(inputMap, 3)->valueint*10); + else mappedInputVal = inputVal*10; if (aJson.getArraySize(inputMap)==5) Noize = aJson.getArrayItem(inputMap, 4)->valueint; @@ -506,7 +506,7 @@ void Input::analogPoll() { if ((store->bouncecurrentValue))//confirmed change { - onAnalogChanged(mappedInputVal/100.); + onAnalogChanged(mappedInputVal/10.); // store->currentValue = mappedInputVal; store->currentValue = inputVal; }